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

Fix 80bccca4e2 

* lisp/org.el (org-refresh-category-properties): Extract default
  category before entering `with-silent-modifications', as
  `buffer-file-name' is then bound to nil.

Reported-by: John Hendy <jw.hendy@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/96620>
This commit is contained in:
Nicolas Goaziou 2015-04-01 22:41:41 +02:00
parent 237d423d6c
commit 22bf1b8ae3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org.el
View File

@ -9541,7 +9541,15 @@ The refresh happens only for the current tree (not subtree)."
(defun org-refresh-category-properties ()
"Refresh category text properties in the buffer."
(let ((case-fold-search t)
(inhibit-read-only t))
(inhibit-read-only t)
(default-category
(cond ((null org-category)
(if buffer-file-name
(file-name-sans-extension
(file-name-nondirectory buffer-file-name))
"???"))
((symbolp org-category) (symbol-name org-category))
(t org-category))))
(org-with-silent-modifications
(org-with-wide-buffer
;; Set buffer-wide category. Search last #+CATEGORY keyword.
@ -9557,13 +9565,7 @@ The refresh happens only for the current tree (not subtree)."
(when (eq (org-element-type element) 'keyword)
(throw 'buffer-category
(org-element-property :value element)))))
(cond ((null org-category)
(if buffer-file-name
(file-name-sans-extension
(file-name-nondirectory buffer-file-name))
"???"))
((symbolp org-category) (symbol-name org-category))
(t org-category))))
default-category))
;; Set sub-tree specific categories.
(goto-char (point-min))
(let ((regexp (org-re-property "CATEGORY")))