summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-06-16 10:29:24 -0700
committerEric Schulte <schulte.eric@gmail.com>2011-06-16 10:29:24 -0700
commitfa59060617f2bfb4fa9672a1c698c346e92ecec3 (patch)
tree24669d02ac5c6e877708dff1f5d439427e1b2d71
parent12d51dad7bde7e8907e3d4048b0510b666399a26 (diff)
downloadorg-mode-fa59060617f2bfb4fa9672a1c698c346e92ecec3.tar.gz
Revert "Globally replace buffer-substring-filters with filter-buffer-substring-functions."
This reverts commit 66e8a4b09af6a467fe2da891cf5bb814e8869106.
-rw-r--r--lisp/org-agenda.el6
-rw-r--r--lisp/org-indent.el8
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 06f66ff..a9be175 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1759,11 +1759,11 @@ The following commands are available:
(org-add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local)
(org-add-hook 'pre-command-hook 'org-unhighlight nil 'local)
;; Make sure properties are removed when copying text
- (when (boundp 'filter-buffer-substring-functions)
- (org-set-local 'filter-buffer-substring-functions
+ (when (boundp 'buffer-substring-filters)
+ (org-set-local 'buffer-substring-filters
(cons (lambda (x)
(set-text-properties 0 (length x) nil x) x)
- filter-buffer-substring-functions)))
+ buffer-substring-filters)))
(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 7fa8e16..095e9ca 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -157,8 +157,8 @@ FIXME: How to update when broken?"
(org-set-local 'org-hide-leading-stars-before-indent-mode
org-hide-leading-stars)
(org-set-local 'org-hide-leading-stars t))
- (make-local-variable 'filter-buffer-substring-functions)
- (add-to-list 'filter-buffer-substring-functions
+ (make-local-variable 'buffer-substring-filters)
+ (add-to-list 'buffer-substring-filters
'org-indent-remove-properties-from-string)
(org-add-hook 'org-after-demote-entry-hook
'org-indent-refresh-section nil 'local)
@@ -177,9 +177,9 @@ FIXME: How to update when broken?"
(when (boundp 'org-hide-leading-stars-before-indent-mode)
(org-set-local 'org-hide-leading-stars
org-hide-leading-stars-before-indent-mode))
- (setq filter-buffer-substring-functions
+ (setq buffer-substring-filters
(delq 'org-indent-remove-properties-from-string
- filter-buffer-substring-functions))
+ buffer-substring-filters))
(remove-hook 'org-after-promote-entry-hook
'org-indent-refresh-section 'local)
(remove-hook 'org-after-demote-entry-hook