aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-07-20 03:46:24 +0000
committerRichard M. Stallman1997-07-20 03:46:24 +0000
commit8a2d9406904828f4fc3d285739771bc335153824 (patch)
treeaff59192dbedbf7b09141c112f92d9cbc69d0202
parentcc2837184401cfcd8323eff8317827ee01ef8168 (diff)
downloademacs-8a2d9406904828f4fc3d285739771bc335153824.tar.gz
emacs-8a2d9406904828f4fc3d285739771bc335153824.zip
(uniquify-buffer-file-name): Minor change.
-rw-r--r--lisp/uniquify.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 1eb2dfeb418..33d31987979 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -210,21 +210,21 @@ but no others."
210 (and (featurep 'dired) 210 (and (featurep 'dired)
211 (save-excursion 211 (save-excursion
212 (set-buffer buffer) 212 (set-buffer buffer)
213 (and 213 (when (eq major-mode 'dired-mode) ; do nothing if not a dired buffer
214 (eq major-mode 'dired-mode) ; do nothing if not a dired buffer 214 (if (boundp 'list-buffers-directory) ; XEmacs mightn't define this
215 (if (boundp 'list-buffers-directory) ; XEmacs mightn't define this 215 list-buffers-directory
216 list-buffers-directory 216 ;; don't use default-directory if dired-directory is nil
217 ;; don't use default-directory if dired-directory is nil 217 (and dired-directory
218 (and dired-directory 218 (expand-file-name
219 (expand-file-name 219 (directory-file-name
220 (directory-file-name 220 (if (consp dired-directory)
221 (if (consp dired-directory) 221 (car dired-directory)
222 (car dired-directory) 222 dired-directory))))))))))
223 dired-directory))))))))))
224 223
225(defun uniquify-fix-list-filename-lessp (fixlist1 fixlist2) 224(defun uniquify-fix-list-filename-lessp (fixlist1 fixlist2)
226 (uniquify-filename-lessp 225 (uniquify-filename-lessp
227 (uniquify-fix-list-filename fixlist1) (uniquify-fix-list-filename fixlist2))) 226 (uniquify-fix-list-filename fixlist1
227 ) (uniquify-fix-list-filename fixlist2)))
228 228
229;; This examines the filename components in reverse order. 229;; This examines the filename components in reverse order.
230(defun uniquify-filename-lessp (s1 s2) 230(defun uniquify-filename-lessp (s1 s2)