diff options
| -rw-r--r-- | lisp/shell.el | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 867c2919342..d0a55b393b1 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -130,16 +130,27 @@ This is a fine thing to set in your `.emacs' file.") (defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;) "List of characters to recognise as separate arguments. This variable is used to initialize `comint-delimiter-argument-list' in the -shell buffer. The default is (?\\| ?& ?< ?> ?\\( ?\\) ?\\;). +shell buffer. The value may depend on the operating system or shell. + +This is a fine thing to set in your `.emacs' file.") + +(defvar shell-file-name-regexp + (if (memq system-type '(ms-dos windows-nt)) + "~/A-Za-z0-9_^$!#%&{}@`'.()-" + "~/A-Za-z0-9+@:_.$#%,={}-") + "Regexp of characters valid in a file name. +This variable is used to initialize `comint-file-name-regexp' in the +shell buffer. The value may depend on the operating system or shell. This is a fine thing to set in your `.emacs' file.") (defvar shell-file-name-quote-list - (append shell-delimiter-argument-list '(?\ ?\* ?\! ?\" ?\' ?\`)) + (if (memq system-type '(ms-dos windows-nt)) + nil + (append shell-delimiter-argument-list '(?\ ?\* ?\! ?\" ?\' ?\`))) "List of characters to quote when in a file name. This variable is used to initialize `comint-file-name-quote-list' in the -shell buffer. The default is (?\ ?\* ?\! ?\" ?\' ?\`) plus characters -in `shell-delimiter-argument-list'. +shell buffer. The value may depend on the operating system or shell. This is a fine thing to set in your `.emacs' file.") @@ -321,6 +332,7 @@ buffer." (setq comint-prompt-regexp shell-prompt-pattern) (setq comint-completion-fignore shell-completion-fignore) (setq comint-delimiter-argument-list shell-delimiter-argument-list) + (setq comint-file-name-regexp shell-file-name-regexp) (setq comint-file-name-quote-list shell-file-name-quote-list) (setq comint-dynamic-complete-functions shell-dynamic-complete-functions) (make-local-variable 'paragraph-start) |