comparison lisp/dired-x.el @ 8792:d85424a6fb85

(dired-clean-up-after-deletion): Expand fn. (dired-find-buffer-nocreate): Expand dir at beginning.

8791:555762c754a6

               (funcall (function y-or-n-p)
                        (format "Kill buffer of %s, too? "
                                (file-name-nondirectory fn)))
               (save-excursion ; you never know where kill-buffer leaves you
                 (kill-buffer buf))))
        (let ((buf-list (dired-buffers-for-dir fn))
              (buf nil))
          (and buf-list
               (y-or-n-p (format "Kill dired buffer%s of %s, too? "
                                 (dired-plural-s (length buf-list))
                                 (file-name-nondirectory fn)))

;;; REDEFINE.
;;; Redefines dired.el's version of `dired-find-buffer-nocreate'
(defun dired-find-buffer-nocreate (dirname)
  (if dired-find-subdir
      (let* ((cur-buf (current-buffer))
             (buffers (nreverse (dired-buffers-for-dir dirname)))
             (cur-buf-matches (and (memq cur-buf buffers)
                                   ;; wildcards must match, too:
                                   (equal dired-directory dirname))))
        ;; We don't want to switch to the same buffer---
        (setq buffers (delq cur-buf buffers));;need setq with delq

8792:d85424a6fb85

               (funcall (function y-or-n-p)
                        (format "Kill buffer of %s, too? "
                                (file-name-nondirectory fn)))
               (save-excursion ; you never know where kill-buffer leaves you
                 (kill-buffer buf))))
        (let ((buf-list (dired-buffers-for-dir (expand-file-name fn)))
              (buf nil))
          (and buf-list
               (y-or-n-p (format "Kill dired buffer%s of %s, too? "
                                 (dired-plural-s (length buf-list))
                                 (file-name-nondirectory fn)))

;;; REDEFINE.
;;; Redefines dired.el's version of `dired-find-buffer-nocreate'
(defun dired-find-buffer-nocreate (dirname)
  (if dired-find-subdir
      (let* ((cur-buf (current-buffer))
             (buffers (nreverse
		       (dired-buffers-for-dir (expand-file-name dirname))))
             (cur-buf-matches (and (memq cur-buf buffers)
                                   ;; wildcards must match, too:
                                   (equal dired-directory dirname))))
        ;; We don't want to switch to the same buffer---
        (setq buffers (delq cur-buf buffers));;need setq with delq