branch: externals/org
commit b702412f1f2b7c335d7622503cf62216daace9a0
Author: Stefan Kangas <stefankan...@gmail.com>
Commit: Kyle Meyer <k...@kyleam.com>
Backport commit d1bde7b5c from Emacs
Don't use obsolete filter-buffer-substring-functions in Org
d1bde7b5cb727d6b0559d99669719d5eb832c186
Stefan Kangas
Fri Dec 13 00:05:08 2024 +0100
[ km: This was independently covered on the main branch with
b9637ef14. It's applied here for bookkeeping/traceability
purposes. ]
---
lisp/org-agenda.el | 10 ++--------
lisp/org-indent.el | 20 ++++----------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index fb75c36169..87eda4700b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2375,14 +2375,8 @@ The following commands are available:
(add-hook 'post-command-hook #'org-agenda-update-agenda-type nil 'local)
(add-hook 'pre-command-hook #'org-unhighlight nil 'local)
;; Make sure properties are removed when copying text
- (if (boundp 'filter-buffer-substring-functions)
- (add-hook 'filter-buffer-substring-functions
- (lambda (fun start end delete)
- (substring-no-properties (funcall fun start end delete)))
- nil t)
- ;; Emacs >= 24.4.
- (add-function :filter-return (local 'filter-buffer-substring-function)
- #'substring-no-properties))
+ (add-function :filter-return (local 'filter-buffer-substring-function)
+ #'substring-no-properties)
(unless org-agenda-keep-modes
(setq org-agenda-follow-mode org-agenda-start-with-follow-mode
org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index e0d99c646d..dea2f69ce9 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -193,15 +193,8 @@ during idle time."
(when org-indent-mode-turns-on-hiding-stars
(setq-local org-hide-leading-stars t))
(org-indent--compute-prefixes)
- (if (boundp 'filter-buffer-substring-functions)
- (add-hook 'filter-buffer-substring-functions
- (lambda (fun start end delete)
- (org-indent-remove-properties-from-string
- (funcall fun start end delete)))
- nil t)
- ;; Emacs >= 24.4.
- (add-function :filter-return (local 'filter-buffer-substring-function)
- #'org-indent-remove-properties-from-string))
+ (add-function :filter-return (local 'filter-buffer-substring-function)
+ #'org-indent-remove-properties-from-string)
(add-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local)
(add-hook 'before-change-functions
'org-indent-notify-modified-headline nil 'local)
@@ -224,13 +217,8 @@ during idle time."
(set-marker org-indent--initial-marker nil))
(when (local-variable-p 'org-hide-leading-stars)
(kill-local-variable 'org-hide-leading-stars))
- (if (boundp 'filter-buffer-substring-functions)
- (remove-hook 'filter-buffer-substring-functions
- (lambda (fun start end delete)
- (org-indent-remove-properties-from-string
- (funcall fun start end delete))))
- (remove-function (local 'filter-buffer-substring-function)
- #'org-indent-remove-properties-from-string))
+ (remove-function (local 'filter-buffer-substring-function)
+ #'org-indent-remove-properties-from-string)
(remove-hook 'after-change-functions 'org-indent-refresh-maybe 'local)
(remove-hook 'before-change-functions
'org-indent-notify-modified-headline 'local)
