[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el |
Date: |
Tue, 04 Feb 2003 05:40:14 -0500 |
Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.632 emacs/lisp/files.el:1.633
*** emacs/lisp/files.el:1.632 Fri Jan 31 10:16:47 2003
--- emacs/lisp/files.el Tue Feb 4 05:40:14 2003
***************
*** 940,945 ****
--- 940,946 ----
(let ((obuf (current-buffer))
(ofile buffer-file-name)
(onum buffer-file-number)
+ (odir dired-directory)
(otrue buffer-file-truename)
(oname (buffer-name)))
(if (get-buffer " **lose**")
***************
*** 948,956 ****
--- 949,961 ----
(unwind-protect
(progn
(unlock-buffer)
+ ;; This prevents us from finding the same buffer
+ ;; if we specified the same file again.
(setq buffer-file-name nil)
(setq buffer-file-number nil)
(setq buffer-file-truename nil)
+ ;; Likewise for dired buffers.
+ (setq dired-directory nil)
(find-file filename))
(when (eq obuf (current-buffer))
;; This executes if find-file gets an error
***************
*** 960,965 ****
--- 965,971 ----
(setq buffer-file-name ofile)
(setq buffer-file-number onum)
(setq buffer-file-truename otrue)
+ (setq dired-directory odir)
(lock-buffer)
(rename-buffer oname)))
(unless (eq (current-buffer) obuf)
- [Emacs-diffs] Changes to emacs/lisp/files.el,
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/lisp/files.el, Juanma Barranquero, 2003/02/12
- [Emacs-diffs] Changes to emacs/lisp/files.el, Juanma Barranquero, 2003/02/12
- [Emacs-diffs] Changes to emacs/lisp/files.el, Markus Rost, 2003/02/13
- [Emacs-diffs] Changes to emacs/lisp/files.el, Kenichi Handa, 2003/02/17
- [Emacs-diffs] Changes to emacs/lisp/files.el, Kai Großjohann, 2003/02/21
- [Emacs-diffs] Changes to emacs/lisp/files.el, Kai Großjohann, 2003/02/22
- [Emacs-diffs] Changes to emacs/lisp/files.el, Richard M. Stallman, 2003/02/23