[Emacs-diffs] master b1d7e58 3/3: Replace some obsolete uses of filter-buffer-substring-functions

[Glenn Morris]

branch: master
commit b1d7e58520dc42a4eda902aa934a250fda6a04ca
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Replace some obsolete uses of filter-buffer-substring-functions
    
    * lisp/org/org-agenda.el (org-agenda-mode):
    * lisp/org/org-indent.el (org-indent-mode):
    Replace filter-buffer-substring-functions, obsolete since 24.4.
---
 lisp/org/org-agenda.el | 12 ++++++++----
 lisp/org/org-indent.el | 25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 9aaec33..3d4379b 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -2201,10 +2201,14 @@ 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
-  (add-hook 'filter-buffer-substring-functions
-           (lambda (fun start end delete)
-             (substring-no-properties (funcall fun start end delete)))
-           nil t)
+  (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))
   (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/org-indent.el b/lisp/org/org-indent.el
index ef68c3c..f2cd6a6 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -183,11 +183,15 @@ during idle time."
                  org-hide-leading-stars)
       (setq-local org-hide-leading-stars t))
     (org-indent--compute-prefixes)
-    (add-hook 'filter-buffer-substring-functions
-             (lambda (fun start end delete)
-               (org-indent-remove-properties-from-string
-                (funcall fun start end delete)))
-             nil t)
+    (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-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local)
     (add-hook 'before-change-functions
              'org-indent-notify-modified-headline nil 'local)
@@ -211,10 +215,13 @@ during idle time."
     (when (boundp 'org-hide-leading-stars-before-indent-mode)
       (setq-local org-hide-leading-stars
                  org-hide-leading-stars-before-indent-mode))
-    (remove-hook 'filter-buffer-substring-functions
-                (lambda (fun start end delete)
-                  (org-indent-remove-properties-from-string
-                   (funcall fun start end delete))))
+    (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-hook 'after-change-functions 'org-indent-refresh-maybe 'local)
     (remove-hook 'before-change-functions
                 'org-indent-notify-modified-headline 'local)