diff options
author | John Paul Wallington <jpw@pobox.com> | 2003-03-24 08:53:46 +0000 |
---|---|---|
committer | John Paul Wallington <jpw@pobox.com> | 2003-03-24 08:53:46 +0000 |
commit | 784fda4fefbb4a7a271c9e6cfc3478a39de483fa (patch) | |
tree | bf2d43b3a553ad71db293f9fcbd4ab61bb666e95 /lisp/emerge.el | |
parent | f560e69cee46267a26c0cb1635ccea9c5c997723 (diff) | |
download | emacs-784fda4fefbb4a7a271c9e6cfc3478a39de483fa.tar.gz |
(emerge-show-file-name): Read event irrespective of whether minibuffer
window is resized. Clear minibuffer when done.
Diffstat (limited to 'lisp/emerge.el')
-rw-r--r-- | lisp/emerge.el | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index 170a907afae..b3e411735e3 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -3106,18 +3106,21 @@ SPC, it is ignored; if it is anything else, it is processed as a command." (setq name "Buffer has no file name.")) (save-window-excursion (select-window (minibuffer-window)) - (erase-buffer) - (insert name) - (if (not (pos-visible-in-window-p)) - (let ((echo-keystrokes 0)) - (while (and (not (pos-visible-in-window-p)) - (> (1- (frame-height)) (window-height))) - (enlarge-window 1)) - (let ((c (read-event))) + (unwind-protect + (progn + (erase-buffer) + (insert name) + (if (not (pos-visible-in-window-p)) + (while (and (not (pos-visible-in-window-p)) + (> (1- (frame-height)) (window-height))) + (enlarge-window 1))) + (let* ((echo-keystrokes 0) + (c (read-event))) (if (not (eq c 32)) - (setq unread-command-events (list c))))))))) + (setq unread-command-events (list c))))) + (erase-buffer))))) -;; Improved auto-save file names. +;; Improved auto-save gfile names. ;; This function fixes many problems with the standard auto-save file names: ;; Auto-save files for non-file buffers get put in the default directory ;; for the buffer, whether that makes sense or not. |