diff options
author | Stefan Monnier <[email protected]> | 2009-08-28 16:29:25 +0000 |
---|---|---|
committer | Stefan Monnier <[email protected]> | 2009-08-28 16:29:25 +0000 |
commit | 72f16325c1807f5e822c2eb76e10392630842d39 (patch) | |
tree | 7b876e51d1f7abfe2fe5ec202d5d1361561a013e /lisp/dired.el | |
parent | b59329e062ff932753112bee77771083cfd4770a (diff) |
* textmodes/ispell.el (ispell-check-version, ispell-send-string):
* international/mule.el (load-with-code-conversion):
* emacs-lisp/debug.el (debug):
* ediff-vers.el (ediff-rcs-get-output-buffer):
* dired.el (dired-internal-noselect): Don't let-bind
default-major-mode around code that doesn't use it.
E.g. buffer creation via get-buffer-create doesn't use it.
Diffstat (limited to 'lisp/dired.el')
-rw-r--r-- | lisp/dired.el | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 55c1245b1f..21734f6ae7 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -765,23 +765,14 @@ for a remote directory. This feature is used by Auto Revert Mode." ;; like find-file does. ;; Optional argument MODE is passed to dired-find-buffer-nocreate, ;; see there. - (let* (dirname - buffer - ;; note that buffer already is in dired-mode, if found - new-buffer-p - (old-buf (current-buffer))) - (if (consp dir-or-list) - (setq dirname (car dir-or-list)) - (setq dirname dir-or-list)) - ;; Look for an existing buffer. - (setq buffer (dired-find-buffer-nocreate dirname mode) - new-buffer-p (null buffer)) + (let* ((old-buf (current-buffer)) + (dirname (if (consp dir-or-list) (car dir-or-list) dir-or-list)) + ;; Look for an existing buffer. + (buffer (dired-find-buffer-nocreate dirname mode)) + ;; Note that buffer already is in dired-mode, if found. + (new-buffer-p (null buffer))) (or buffer - (let ((default-major-mode 'fundamental-mode)) - ;; We don't want default-major-mode to run hooks and set auto-fill - ;; or whatever, now that dired-mode does not - ;; kill-all-local-variables any longer. - (setq buffer (create-file-buffer (directory-file-name dirname))))) + (setq buffer (create-file-buffer (directory-file-name dirname)))) (set-buffer buffer) (if (not new-buffer-p) ; existing buffer ... (cond (switches ; ... but new switches |