diff options
| author | Glenn Morris | 2015-05-26 23:42:59 -0700 |
|---|---|---|
| committer | Glenn Morris | 2015-05-26 23:42:59 -0700 |
| commit | 1b3fd89b1c19cdd3203f16584abba38f1c1c722f (patch) | |
| tree | fb01e970a4925fb6186c929cf7aec30af83ee50f | |
| parent | b38bc40d692f39d00477d5691acaa1046c74623c (diff) | |
| download | emacs-1b3fd89b1c19cdd3203f16584abba38f1c1c722f.tar.gz emacs-1b3fd89b1c19cdd3203f16584abba38f1c1c722f.zip | |
No longer set dired-directory in eshell. (Bug#16477)
* lisp/eshell/esh-mode.el (eshell-mode):
* lisp/eshell/em-dirs.el (eshell/cd): No longer set dired-directory.
| -rw-r--r-- | lisp/eshell/em-dirs.el | 10 | ||||
| -rw-r--r-- | lisp/eshell/esh-mode.el | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 84d46dcfeeb..e9458ccd85f 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el | |||
| @@ -348,8 +348,6 @@ in the minibuffer: | |||
| 348 | index (1+ index))))) | 348 | index (1+ index))))) |
| 349 | oldpath)) | 349 | oldpath)) |
| 350 | 350 | ||
| 351 | (defvar dired-directory) | ||
| 352 | |||
| 353 | (defun eshell/cd (&rest args) ; all but first ignored | 351 | (defun eshell/cd (&rest args) ; all but first ignored |
| 354 | "Alias to extend the behavior of `cd'." | 352 | "Alias to extend the behavior of `cd'." |
| 355 | (setq args (eshell-flatten-list args)) | 353 | (setq args (eshell-flatten-list args)) |
| @@ -394,11 +392,11 @@ in the minibuffer: | |||
| 394 | (path | 392 | (path |
| 395 | (setq path (eshell-expand-multiple-dots path)))) | 393 | (setq path (eshell-expand-multiple-dots path)))) |
| 396 | (unless handled | 394 | (unless handled |
| 397 | (setq dired-directory (or path "~")) | 395 | (let ((curdir (eshell/pwd)) |
| 398 | (let ((curdir (eshell/pwd))) | 396 | (newdir (or path "~"))) |
| 399 | (unless (equal curdir dired-directory) | 397 | (unless (equal curdir newdir) |
| 400 | (eshell-add-to-dir-ring curdir)) | 398 | (eshell-add-to-dir-ring curdir)) |
| 401 | (let ((result (cd dired-directory))) | 399 | (let ((result (cd newdir))) |
| 402 | (and eshell-cd-shows-directory | 400 | (and eshell-cd-shows-directory |
| 403 | (eshell-printn result))) | 401 | (eshell-printn result))) |
| 404 | (run-hooks 'eshell-directory-change-hook) | 402 | (run-hooks 'eshell-directory-change-hook) |
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 0dac4780690..22ccf4e91f9 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el | |||
| @@ -344,7 +344,6 @@ and the hook `eshell-exit-hook'." | |||
| 344 | 344 | ||
| 345 | (setq local-abbrev-table eshell-mode-abbrev-table) | 345 | (setq local-abbrev-table eshell-mode-abbrev-table) |
| 346 | 346 | ||
| 347 | (set (make-local-variable 'dired-directory) default-directory) | ||
| 348 | (set (make-local-variable 'list-buffers-directory) | 347 | (set (make-local-variable 'list-buffers-directory) |
| 349 | (expand-file-name default-directory)) | 348 | (expand-file-name default-directory)) |
| 350 | 349 | ||