From 22bf1b8ae3c2842945b9b9d9ab2ca203eae17946 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Apr 2015 22:41:41 +0200 Subject: [PATCH] Fix 80bccca4e249cbb5812963863ccffbdcf4b25edd * 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 --- lisp/org.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b94b18061..6bb0ddf05 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -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")))