diff options
author | Bastien Guerry <bzg@altern.org> | 2011-10-23 23:03:03 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-10-23 23:03:03 +0200 |
commit | ba2d84b5f9ea489f7e21817d1e4e4f5598dedfe3 (patch) | |
tree | 05c0d43f6b0b66f126b91354a4ce9376fe1a27d3 | |
parent | bc29a5c7ab686cb4130439a6a84c9707d9333a49 (diff) | |
parent | dc62cdcdf11f305149281d16ef2200e18c7abd43 (diff) | |
download | org-mode-ba2d84b5f9ea489f7e21817d1e4e4f5598dedfe3.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/org-agenda.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index c54d329..3523770 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3887,7 +3887,7 @@ in `org-agenda-text-search-extra-files'." (if (not regexps+) (setq regexp org-outline-regexp-bol) (setq regexp (pop regexps+)) - (if hdl-only (setq regexp (concat org-outline-regexp-bol " .*?" + (if hdl-only (setq regexp (concat org-outline-regexp-bol ".*?" regexp)))) (setq files (org-agenda-files nil 'ifmode)) (when (eq (car org-agenda-text-search-extra-files) 'agenda-archives) @@ -4623,7 +4623,7 @@ the documentation of `org-diary'." (setq marker (org-agenda-new-marker (match-beginning 0)) category (org-get-category) org-category-pos (get-text-property (point) 'org-category-position) - txt (match-string 2) + txt (buffer-substring (match-beginning 2) (match-end 3)) tags (org-get-tags-at (point)) txt (org-agenda-format-item "" txt category tags) priority (1+ (org-get-priority txt)) |