ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Always return refreshed category" 

This reverts commit f5bb1b7dbf.
This commit is contained in:
Carsten Dominik 2010-12-24 17:32:22 +01:00
parent a33a4003a1
commit 55d664e6d3
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org-archive.el
View File

@ -226,6 +226,7 @@ this heading."
(save-excursion (save-excursion
(org-back-to-heading t) (org-back-to-heading t)
;; Get context information that will be lost by moving the tree ;; Get context information that will be lost by moving the tree
(org-refresh-category-properties)
(setq category (org-get-category) (setq category (org-get-category)
todo (and (looking-at org-todo-line-regexp) todo (and (looking-at org-todo-line-regexp)
(match-string 2)) (match-string 2))

4
lisp/org-clock.el
View File

@ -442,7 +442,9 @@ pointing to it."
(ignore-errors (ignore-errors
(goto-char marker) (goto-char marker)
(setq file (buffer-file-name (marker-buffer marker)) (setq file (buffer-file-name (marker-buffer marker))
cat (org-get-category) cat (or (org-get-category)
(progn (org-refresh-category-properties)
(org-get-category)))
heading (org-get-heading 'notags) heading (org-get-heading 'notags)
prefix (save-excursion prefix (save-excursion
(org-back-to-heading t) (org-back-to-heading t)

1
lisp/org-icalendar.el
View File

@ -302,6 +302,7 @@ When COMBINE is non nil, add the category to each line."
scheduledp deadlinep todo prefix due start scheduledp deadlinep todo prefix due start
tmp pri categories location summary desc uid alarm tmp pri categories location summary desc uid alarm
(sexp-buffer (get-buffer-create "*ical-tmp*"))) (sexp-buffer (get-buffer-create "*ical-tmp*")))
(org-refresh-category-properties)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward re1 nil t) (while (re-search-forward re1 nil t)

12
lisp/org.el
View File

@ -8142,11 +8142,7 @@ call CMD."
(defun org-get-category (&optional pos) (defun org-get-category (&optional pos)
"Get the category applying to position POS." "Get the category applying to position POS."
(let ((pos (or pos (point)))) (get-text-property (or pos (point)) 'org-category))
(or (get-text-property pos 'org-category)
(progn
(org-refresh-category-properties)
(get-text-property pos 'org-category)))))
(defun org-refresh-category-properties () (defun org-refresh-category-properties ()
"Refresh category text properties in the buffer." "Refresh category text properties in the buffer."
@ -13486,7 +13482,10 @@ things up because then unnecessary parsing is avoided."
'add_times)) 'add_times))
props)) props))
(unless (assoc "CATEGORY" props) (unless (assoc "CATEGORY" props)
(push (cons "CATEGORY" (org-get-category)) props)) (setq value (or (org-get-category)
(progn (org-refresh-category-properties)
(org-get-category))))
(push (cons "CATEGORY" value) props))
(append sum-props (nreverse props))))))) (append sum-props (nreverse props)))))))
(defun org-entry-get (pom property &optional inherit literal-nil) (defun org-entry-get (pom property &optional inherit literal-nil)
@ -15703,6 +15702,7 @@ When a buffer is unmodified, it is just killed. When modified, it is saved
(set-buffer (org-get-agenda-file-buffer file))) (set-buffer (org-get-agenda-file-buffer file)))
(widen) (widen)
(setq bmp (buffer-modified-p)) (setq bmp (buffer-modified-p))
(org-refresh-category-properties)
(setq org-todo-keywords-for-agenda (setq org-todo-keywords-for-agenda
(append org-todo-keywords-for-agenda org-todo-keywords-1)) (append org-todo-keywords-for-agenda org-todo-keywords-1))
(setq org-done-keywords-for-agenda (setq org-done-keywords-for-agenda