summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-06-23 15:55:39 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-06-23 15:55:39 +0200
commitba4831bba8b3e4ac5b74ac51e4f89ce5ba43e118 (patch)
treeb833b536d97614e6b2fd3bfc478a0479086fde7b
parent89d2006e84678fa65fb84e8645f05b3eb5a70fff (diff)
downloadorg-mode-ba4831bba8b3e4ac5b74ac51e4f89ce5ba43e118.tar.gz
Fix `org-no-properties' called with an optional argument
* lisp/org-macs.el (org-no-properties): Fix function so that optional argument `restricted' is not ignored.
-rw-r--r--lisp/org-macs.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 899bec1..f987428 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -135,11 +135,8 @@ Otherwise return nil."
"Remove all text properties from string S.
When RESTRICTED is non-nil, only remove the properties listed
in `org-rm-props'."
- (if (fboundp 'set-text-properties)
- (set-text-properties 0 (length s) nil s)
- (if restricted
- (remove-text-properties 0 (length s) org-rm-props s)
- (set-text-properties 0 (length s) nil s)))
+ (if restricted (remove-text-properties 0 (length s) org-rm-props s)
+ (set-text-properties 0 (length s) nil s))
s)
(defsubst org-get-alist-option (option key)