mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Refine the previous change

Browse source 
* lisp/simple.el (blink-matching-open): Use minibuffer-message
outside of save-excursion (bug#21286).
This commit is contained in:
Dmitry Gutov 2015-08-18 18:56:00 +03:00
parent c29a51df2d
commit 9c1e7d5a26
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/simple.el
View file

@ -7004,12 +7004,9 @@ The function should return non-nil if the two tokens do not match.")
(sit-for blink-matching-delay))
(delete-overlay blink-matching--overlay)))))
(t
(save-excursion
(let* ((orig-pos (prog1
(point)
(goto-char blinkpos)))
(open-paren-line-string
(let ((open-paren-line-string
(save-excursion
(goto-char blinkpos)
;; Show what precedes the open in its line, if anything.
(cond
((save-excursion (skip-chars-backward " \t") (not (bolp)))
@ -7036,13 +7033,10 @@ The function should return non-nil if the two tokens do not match.")
"..."
(buffer-substring blinkpos (1+ blinkpos))))
;; There is nothing to show except the char itself.
(t (buffer-substring blinkpos (1+ blinkpos))))))
;; Because minibuffer-message causes a full redisplay, go back
;; to the original point before that happens.
(goto-char orig-pos)
(minibuffer-message
"Matches %s"
(substring-no-properties open-paren-line-string)))))))))
(t (buffer-substring blinkpos (1+ blinkpos)))))))
(minibuffer-message
"Matches %s"
(substring-no-properties open-paren-line-string))))))))
(defvar blink-paren-function 'blink-matching-open
"Function called, if non-nil, whenever a close parenthesis is inserted.