diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-05-25 09:39:32 +0200 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-05-25 09:39:32 +0200 |
| commit | 2a88ee23dbe4182c8671b2fa6a1b091ce512cb99 (patch) | |
| tree | 49dd2c5829d4d1fea479512cfdcb58cbdac16983 /lisp/org/org.el | |
| parent | 2f9b9adb4652f52c12b6388b1fd3d03fa4f99b32 (diff) | |
| download | emacs-2a88ee23dbe4182c8671b2fa6a1b091ce512cb99.tar.gz | |
Merge Org 7.8.11 -- important bug fixes.
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 4710bd5bd86..fd5250a24be 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -6,7 +6,7 @@ ;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.8.10 +;; Version: 7.8.11 ;; ;; This file is part of GNU Emacs. ;; @@ -206,7 +206,7 @@ identifier." ;;; Version -(defconst org-version "7.8.10" +(defconst org-version "7.8.11" "The version number of the file org.el.") ;;;###autoload @@ -12828,10 +12828,7 @@ headlines matching this string." org-outline-regexp) " *\\(\\<\\(" (mapconcat 'regexp-quote org-todo-keywords-1 "\\|") - (org-re - (if todo-only - "\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$" - "\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))) + (org-re "\\)\\>\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))) (props (list 'face 'default 'done-face 'org-agenda-done 'undone-face 'default |