Mercurial > emacs

comparison lisp/dired-x.el @ 11933:9b53ce243465

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(dired-find-buffer-nocreate): Don't try to find a wildcard as a subdirectory.
author Karl Heuer <kwzh@gnu.org>
date Fri, 26 May 1995 04:23:21 +0000
parents 3ddbf9b31cf0
children 216edf9576ea
comparison
equal deleted inserted replaced
11932:f3fb1e5dfde1 11933:9b53ce243465
1364 (symbol-function 'dired-find-buffer-nocreate))) 1364 (symbol-function 'dired-find-buffer-nocreate)))
1365 1365
1366 ;;; REDEFINE. 1366 ;;; REDEFINE.
1367 ;;; Redefines dired.el's version of `dired-find-buffer-nocreate' 1367 ;;; Redefines dired.el's version of `dired-find-buffer-nocreate'
1368 (defun dired-find-buffer-nocreate (dirname) 1368 (defun dired-find-buffer-nocreate (dirname)
1369 (if dired-find-subdir 1369 (if (and dired-find-subdir
1370 ;; don't try to find a wildcard as a subdirectory
1371 (string-equal dirname (file-name-directory dirname)))
1370 (let* ((cur-buf (current-buffer)) 1372 (let* ((cur-buf (current-buffer))
1371 (buffers (nreverse 1373 (buffers (nreverse
1372 (dired-buffers-for-dir (expand-file-name dirname)))) 1374 (dired-buffers-for-dir (expand-file-name dirname))))
1373 (cur-buf-matches (and (memq cur-buf buffers) 1375 (cur-buf-matches (and (memq cur-buf buffers)
1374 ;; wildcards must match, too: 1376 ;; wildcards must match, too:
1375 (equal dired-directory dirname)))) 1377 (equal dired-directory dirname))))
1376 ;; We don't want to switch to the same buffer--- 1378 ;; We don't want to switch to the same buffer---
1377 (setq buffers (delq cur-buf buffers));;need setq with delq 1379 (setq buffers (delq cur-buf buffers));;need setq with delq
1378 (or (car (sort buffers (function dired-buffer-more-recently-used-p))) 1380 (or (car (sort buffers (function dired-buffer-more-recently-used-p)))
1379 ;; ---unless it's the only possibility: 1381 ;; ---unless it's the only possibility:
1380 (and cur-buf-matches cur-buf))) 1382 (and cur-buf-matches cur-buf)))
1381 (dired-old-find-buffer-nocreate dirname))) 1383 (dired-old-find-buffer-nocreate dirname)))
1382 1384
1383 ;; This should be a builtin 1385 ;; This should be a builtin
1384 (defun dired-buffer-more-recently-used-p (buffer1 buffer2) 1386 (defun dired-buffer-more-recently-used-p (buffer1 buffer2)
1385 "Return t if BUFFER1 is more recently used than BUFFER2." 1387 "Return t if BUFFER1 is more recently used than BUFFER2."