[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emerge.el
From: |
John Paul Wallington |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emerge.el |
Date: |
Mon, 24 Mar 2003 03:52:21 -0500 |
Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.47 emacs/lisp/emerge.el:1.48
*** emacs/lisp/emerge.el:1.47 Tue Feb 4 06:16:05 2003
--- emacs/lisp/emerge.el Mon Mar 24 03:52:20 2003
***************
*** 3106,3123 ****
(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)))
(if (not (eq c 32))
! (setq unread-command-events (list c)))))))))
! ;; Improved auto-save file 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.
--- 3106,3126 ----
(setq name "Buffer has no file name."))
(save-window-excursion
(select-window (minibuffer-window))
! (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)))))
! (erase-buffer)))))
! ;; 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emerge.el,
John Paul Wallington <=