aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2003-02-12 09:26:17 +0000
committerJuanma Barranquero2003-02-12 09:26:17 +0000
commitc45bc75309460dc1a0b98104ae3a506316f789da (patch)
tree3d512f17dcd402966410ad1124d239b984daa897 /lisp
parent61bc75ab6ca503e5be3b2736a5ce8e13f40f1722 (diff)
downloademacs-c45bc75309460dc1a0b98104ae3a506316f789da.tar.gz
emacs-c45bc75309460dc1a0b98104ae3a506316f789da.zip
(find-alternate-file): Check whether `dired-directory' is bound.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9be8850740b..b21f2e6c103 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-02-12 Karl Chen <quarl@hkn.eecs.berkeley.edu> (tiny change)
2
3 * files.el (find-alternate-file): Check whether `dired-directory'
4 is bound.
5
12003-02-12 Simon Marshall <simon@gnu.org> 62003-02-12 Simon Marshall <simon@gnu.org>
2 7
3 * progmodes/make-mode.el (makefile-font-lock-keywords): Fontify 8 * progmodes/make-mode.el (makefile-font-lock-keywords): Fontify
diff --git a/lisp/files.el b/lisp/files.el
index 070db9f3be4..5ba163fc671 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -940,7 +940,7 @@ If the current buffer now contains an empty file that you just visited
940 (let ((obuf (current-buffer)) 940 (let ((obuf (current-buffer))
941 (ofile buffer-file-name) 941 (ofile buffer-file-name)
942 (onum buffer-file-number) 942 (onum buffer-file-number)
943 (odir dired-directory) 943 (odir (bound-and-true-p dired-directory))
944 (otrue buffer-file-truename) 944 (otrue buffer-file-truename)
945 (oname (buffer-name))) 945 (oname (buffer-name)))
946 (if (get-buffer " **lose**") 946 (if (get-buffer " **lose**")