summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2019-08-01 15:59:46 +0300
committerKyle Meyer <kyle@kyleam.com>2019-08-17 09:45:22 -0400
commit765577d9b3c4c6867b49458134dd050c4c2d82a2 (patch)
tree65b3d17e06cf40aaa383ab975f444ccb6135fc6b
parent4cb3a375331f6f53a1da38bf87b9410ef09784ef (diff)
downloadorg-mode-765577d9b3c4c6867b49458134dd050c4c2d82a2.tar.gz
Backport commit 2267110b6 from Emacs
* lisp/ob-exp.el (org-babel-exp-process-buffer): * lisp/org-agenda.el (org-agenda-show-new-time): Always pass an explicit plist to remove-text-properties. Fix usage of remove-text-properties 2267110b6f00bbb0ad87f4621e6ecd9dc1bd8581 Basil L. Contovounesios Thu Aug 1 17:04:53 2019 +0300
-rw-r--r--lisp/ob-exp.el3
-rw-r--r--lisp/org-agenda.el2
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 1a4c494..177104b 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -281,7 +281,8 @@ this template."
(set-marker begin nil)
(set-marker end nil)))))
(kill-buffer org-babel-exp-reference-buffer)
- (remove-text-properties (point-min) (point-max) '(org-reference)))))))
+ (remove-text-properties (point-min) (point-max)
+ '(org-reference nil)))))))
(defun org-babel-exp-do-export (info type &optional hash)
"Return a string with the exported content of a code block.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index d54a6ba..9b69c3e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -9268,7 +9268,7 @@ Called with a universal prefix arg, show the priority instead of setting it."
(goto-char (point-max))
(while (not (bobp))
(when (equal marker (org-get-at-bol 'org-marker))
- (remove-text-properties (point-at-bol) (point-at-eol) '(display))
+ (remove-text-properties (point-at-bol) (point-at-eol) '(display nil))
(org-move-to-column (- (window-width) (length stamp)) t)
(add-text-properties
(1- (point)) (point-at-eol)