[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org e2d41c84e1 2/2: Merge branch 'km/from-emacs-master'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org e2d41c84e1 2/2: Merge branch 'km/from-emacs-master' |
Date: |
Mon, 10 Oct 2022 15:58:01 -0400 (EDT) |
branch: externals/org
commit e2d41c84e1f69b2551154f0b0518ed084deab312
Merge: 8901fd2261 616fc20445
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'km/from-emacs-master'
---
lisp/org.el | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 6f4e043061..080ef13983 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5966,10 +5966,7 @@ If TAG is a number, get the corresponding match group."
(defun org-unfontify-region (beg end &optional _maybe_loudly)
"Remove fontification and activation overlays from links."
(font-lock-default-unfontify-region beg end)
- (let* ((buffer-undo-list t)
- (inhibit-read-only t) (inhibit-point-motion-hooks t)
- (inhibit-modification-hooks t)
- deactivate-mark buffer-file-name buffer-file-truename)
+ (with-silent-modifications
(decompose-region beg end)
(remove-text-properties beg end
'(mouse-face t keymap t org-linked-text t
@@ -16323,10 +16320,9 @@ buffer boundaries with possible narrowing."
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
"Remove inline-display overlay if a corresponding region is modified."
- (let ((inhibit-modification-hooks t))
- (when (and ov after)
- (delete ov org-inline-image-overlays)
- (delete-overlay ov))))
+ (when (and ov after)
+ (delete ov org-inline-image-overlays)
+ (delete-overlay ov)))
(defun org-remove-inline-images ()
"Remove inline display of images."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/org e2d41c84e1 2/2: Merge branch 'km/from-emacs-master',
ELPA Syncer <=