mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

(hack-local-variables-confirm): Don't keep trying to read an event

Browse Source 
from an empty kbd macro.
This commit is contained in:
Chong Yidong 2007-01-27 19:27:53 +00:00
parent 7d8efa7342
commit 5340648dac
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/files.el
View File

@ -2505,6 +2505,7 @@ n -- to ignore the local variables list.")
", or C-v to scroll")))
(goto-char (point-min))
(let ((cursor-in-echo-area t)
(executing-kbd-macro executing-kbd-macro)
(exit-chars
(if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g)))
done)
@ -2512,11 +2513,17 @@ n -- to ignore the local variables list.")
(message prompt)
(setq char (read-event))
(if (numberp char)
(if (eq char ?\C-v)
(condition-case nil
(scroll-up)
(error (goto-char (point-min))))
(setq done (memq (downcase char) exit-chars))))))
(cond ((eq char ?\C-v)
(condition-case nil
(scroll-up)
(error (goto-char (point-min)))))
;; read-event returns -1 if we are in a kbd
;; macro and there are no more events in the
;; macro. In that case, attempt to get an
;; event interactively.
((and executing-kbd-macro (= char -1))
(setq executing-kbd-macro nil))
(t (setq done (memq (downcase char) exit-chars)))))))
(setq char (downcase char))
(when (and offer-save (= char ?!) unsafe-vars)
(dolist (elt unsafe-vars)