diff options
| author | Eli Zaretskii | 2019-09-18 15:15:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-09-18 15:15:33 +0300 |
| commit | 98586c2fe62fd26bc9105a06b78d93446bd2a269 (patch) | |
| tree | 050613d5124dbff9c0962108826f0e90a6c3f12d /lisp | |
| parent | 7ff2eef926f933c79c3913c18f9403a4a987756b (diff) | |
| parent | ffcec7cd4be83d03c21e7378efc55911b33696b1 (diff) | |
| download | emacs-98586c2fe62fd26bc9105a06b78d93446bd2a269.tar.gz emacs-98586c2fe62fd26bc9105a06b78d93446bd2a269.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 4bc37f01694..8092f6a5cf1 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -525,7 +525,9 @@ based on the Tramp and Emacs versions, and should not be set here." | |||
| 525 | :type '(repeat string)) | 525 | :type '(repeat string)) |
| 526 | 526 | ||
| 527 | ;;;###tramp-autoload | 527 | ;;;###tramp-autoload |
| 528 | (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) | 528 | (defcustom tramp-sh-extra-args |
| 529 | '(("/bash\\'" . "-norc -noprofile") | ||
| 530 | ("/zsh\\'" . "-f +Z")) | ||
| 529 | "Alist specifying extra arguments to pass to the remote shell. | 531 | "Alist specifying extra arguments to pass to the remote shell. |
| 530 | Entries are (REGEXP . ARGS) where REGEXP is a regular expression | 532 | Entries are (REGEXP . ARGS) where REGEXP is a regular expression |
| 531 | matching the shell file name and ARGS is a string specifying the | 533 | matching the shell file name and ARGS is a string specifying the |