tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-indent.el: Deprecate `org-hide-leading-stars-before-indent-mode' 

* lisp/org-indent.el (org-indent-mode): Make `org-hide-leading-stars'
buffer local and revert it back to it's global value when exiting the
mode without storing it's global value manually.
(org-hide-leading-stars-before-indent-mode): Remove declaration.

This commit implements my suggestion from the mailing list
(https://lists.gnu.org/archive/html/emacs-orgmode/2020-02/msg00759.html)
to rely on Emacs' native mechanisms for restoring a buffer-local
variable to it's global default value instead of storing the global
value in a temporary variable (in this case:
`org-hide-leading-stars-before-indent-mode').

TINYCHANGE
This commit is contained in:
D. Williams 2020-02-19 23:50:48 +01:00 committed by Bastien
parent 5d2075abad
commit 1b2de14d84
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-indent.el
View File

@ -71,8 +71,6 @@ Delay used when the buffer to initialize isn't current.")
(defvar org-indent--initial-marker nil (defvar org-indent--initial-marker nil
"Position of initialization before interrupt. "Position of initialization before interrupt.
This is used locally in each buffer being initialized.") This is used locally in each buffer being initialized.")
(defvar org-hide-leading-stars-before-indent-mode nil
"Used locally.")
(defvar org-indent-modified-headline-flag nil (defvar org-indent-modified-headline-flag nil
"Non-nil means the last deletion operated on a headline. "Non-nil means the last deletion operated on a headline.
It is modified by `org-indent-notify-modified-headline'.") It is modified by `org-indent-notify-modified-headline'.")
@ -183,8 +181,6 @@ during idle time."
(or (eq org-adapt-indentation 'headline-data) (or (eq org-adapt-indentation 'headline-data)
(setq-local org-adapt-indentation nil))) (setq-local org-adapt-indentation nil)))
(when org-indent-mode-turns-on-hiding-stars (when org-indent-mode-turns-on-hiding-stars
(setq-local org-hide-leading-stars-before-indent-mode
org-hide-leading-stars)
(setq-local org-hide-leading-stars t)) (setq-local org-hide-leading-stars t))
(org-indent--compute-prefixes) (org-indent--compute-prefixes)
(if (boundp 'filter-buffer-substring-functions) (if (boundp 'filter-buffer-substring-functions)
@ -216,9 +212,8 @@ during idle time."
(delq (current-buffer) org-indent-agentized-buffers)) (delq (current-buffer) org-indent-agentized-buffers))
(when (markerp org-indent--initial-marker) (when (markerp org-indent--initial-marker)
(set-marker org-indent--initial-marker nil)) (set-marker org-indent--initial-marker nil))
(when (boundp 'org-hide-leading-stars-before-indent-mode) (when (local-variable-p 'org-hide-leading-stars)
(setq-local org-hide-leading-stars (kill-local-variable 'org-hide-leading-stars))
org-hide-leading-stars-before-indent-mode))
(if (boundp 'filter-buffer-substring-functions) (if (boundp 'filter-buffer-substring-functions)
(remove-hook 'filter-buffer-substring-functions (remove-hook 'filter-buffer-substring-functions
(lambda (fun start end delete) (lambda (fun start end delete)