summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-15 20:23:09 -0400
committerKyle Meyer <kyle@kyleam.com>2019-01-13 12:43:04 -0500
commit6a5082fccfeb539a990a0771db7dbbb5afbd72e5 (patch)
treed49912d19789d07953783652b64a0018ac0f152e
parent16c8187db1df91086a188f1e21ff4e251f38b695 (diff)
downloadorg-mode-6a5082fccfeb539a990a0771db7dbbb5afbd72e5.tar.gz
Backport commit b1d7e5852 from Emacs
* lisp/org-agenda.el (org-agenda-mode): * lisp/org-indent.el (org-indent-mode): Replace filter-buffer-substring-functions, obsolete since 24.4. Replace some obsolete uses of filter-buffer-substring-functions b1d7e58520dc42a4eda902aa934a250fda6a04ca Glenn Morris Thu Mar 15 20:23:09 2018 -0400
-rw-r--r--lisp/org-agenda.el12
-rw-r--r--lisp/org-indent.el25
2 files changed, 24 insertions, 13 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3e6ab5d..4400646 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2229,10 +2229,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-indent.el b/lisp/org-indent.el
index a62fcbb..650a62f 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -184,11 +184,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)
@@ -212,10 +216,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)