aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorMichael Albinus2016-11-20 16:29:47 +0100
committerMichael Albinus2016-11-20 16:29:47 +0100
commit22946702b4296c0e42e4baf6221e205b52d05cbf (patch)
treea81e506e5176351677c8f677e32cde6236d1b070 /lisp/shell.el
parent26c45889259682af0fbf05bccf7f084408860125 (diff)
downloademacs-22946702b4296c0e42e4baf6221e205b52d05cbf.tar.gz
emacs-22946702b4296c0e42e4baf6221e205b52d05cbf.zip
Add file-local-name
* doc/lispref/files.texi (Magic File Names): Add `file-local-name'. (Unique File Names): Use it. * etc/NEWS: Mention `file-local-name'. * lisp/files.el (file-local-name): New defun. (file-expand-wildcards): * lisp/eshell/em-tramp.el (eshell/su, eshell/sudo): * lisp/eshell/esh-ext.el (eshell-remote-command): * lisp/eshell/esh-proc.el (eshell-gather-process-output): * lisp/org/ob-core.el (org-babel-local-file-name): * lisp/progmodes/gud.el (gud-common-init, gud-format-command): * lisp/progmodes/python.el (python-shell-send-file): * lisp/shell.el (shell): * lisp/vc/ediff-diff.el (ediff-same-file-contents): * lisp/vc/vc-git.el (vc-git-checkin): Use it.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 34bd77282ab..d1b2e875746 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -714,12 +714,11 @@ Otherwise, one argument `-i' is passed to the shell.
714 (null (getenv "ESHELL"))) 714 (null (getenv "ESHELL")))
715 (with-current-buffer buffer 715 (with-current-buffer buffer
716 (set (make-local-variable 'explicit-shell-file-name) 716 (set (make-local-variable 'explicit-shell-file-name)
717 (file-remote-p 717 (expand-file-name
718 (expand-file-name 718 (file-local-name
719 (read-file-name 719 (read-file-name
720 "Remote shell path: " default-directory shell-file-name 720 "Remote shell path: " default-directory shell-file-name
721 t shell-file-name)) 721 t shell-file-name))))))
722 'localname))))
723 722
724 ;; The buffer's window must be correctly set when we call comint (so 723 ;; The buffer's window must be correctly set when we call comint (so
725 ;; that comint sets the COLUMNS env var properly). 724 ;; that comint sets the COLUMNS env var properly).