Commit d079ee5f authored by Chong Yidong's avatar Chong Yidong
Browse files

Convert several shell.el defvars to defcustoms.

* shell.el (shell-file-name-chars, shell-file-name-quote-list)
(shell-dynamic-complete-functions): Convert to defcustom.
(shell-prompt-pattern, shell-completion-fignore): Doc fix.
parent 9e9da873
2012-09-17 Chong Yidong <cyd@gnu.org>
* shell.el (shell-file-name-chars, shell-file-name-quote-list)
(shell-dynamic-complete-functions): Convert to defcustom.
(shell-prompt-pattern, shell-completion-fignore): Doc fix.
2012-09-16 Katsumi Yamaoka <yamaoka@jpl.org> 2012-09-16 Katsumi Yamaoka <yamaoka@jpl.org>
   
* mail/mailabbrev.el (mail-abbrev-expand-hook): Work for a mail aliasee * mail/mailabbrev.el (mail-abbrev-expand-hook): Work for a mail aliasee
......
...@@ -136,9 +136,7 @@ how Shell mode treats paragraphs. ...@@ -136,9 +136,7 @@ how Shell mode treats paragraphs.
The pattern should probably not match more than one line. If it does, The pattern should probably not match more than one line. If it does,
Shell mode may become confused trying to distinguish prompt from input Shell mode may become confused trying to distinguish prompt from input
on lines which don't start with a prompt. on lines which don't start with a prompt."
This is a fine thing to set in your `.emacs' file."
:type 'regexp :type 'regexp
:group 'shell) :group 'shell)
...@@ -146,9 +144,7 @@ This is a fine thing to set in your `.emacs' file." ...@@ -146,9 +144,7 @@ This is a fine thing to set in your `.emacs' file."
"List of suffixes to be disregarded during file/command completion. "List of suffixes to be disregarded during file/command completion.
This variable is used to initialize `comint-completion-fignore' in the shell This variable is used to initialize `comint-completion-fignore' in the shell
buffer. The default is nil, for compatibility with most shells. buffer. The default is nil, for compatibility with most shells.
Some people like (\"~\" \"#\" \"%\"). Some people like (\"~\" \"#\" \"%\")."
This is a fine thing to set in your `.emacs' file."
:type '(repeat (string :tag "Suffix")) :type '(repeat (string :tag "Suffix"))
:group 'shell) :group 'shell)
...@@ -158,31 +154,29 @@ This variable is used to initialize `comint-delimiter-argument-list' in the ...@@ -158,31 +154,29 @@ This variable is used to initialize `comint-delimiter-argument-list' in the
shell buffer. The value may depend on the operating system or shell." shell buffer. The value may depend on the operating system or shell."
:type '(choice (const nil) :type '(choice (const nil)
(repeat :tag "List of characters" character)) (repeat :tag "List of characters" character))
;; Reverted.
;; :version "24.1" ; changed to nil (bug#8027)
:group 'shell) :group 'shell)
(defvar shell-file-name-chars (defcustom shell-file-name-chars
(if (memq system-type '(ms-dos windows-nt cygwin)) (if (memq system-type '(ms-dos windows-nt cygwin))
"~/A-Za-z0-9_^$!#%&{}@`'.,:()-" "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
"[]~/A-Za-z0-9+@:_.$#%,={}-") "[]~/A-Za-z0-9+@:_.$#%,={}-")
"String of characters valid in a file name. "String of characters valid in a file name.
This variable is used to initialize `comint-file-name-chars' in the This variable is used to initialize `comint-file-name-chars' in the
shell buffer. The value may depend on the operating system or shell. shell buffer. The value may depend on the operating system or shell."
:type 'string
This is a fine thing to set in your `.emacs' file.") :group 'shell)
(defvar shell-file-name-quote-list (defcustom shell-file-name-quote-list
(if (memq system-type '(ms-dos windows-nt)) (if (memq system-type '(ms-dos windows-nt))
nil nil
(append shell-delimiter-argument-list '(?\s ?$ ?\* ?\! ?\" ?\' ?\` ?\# ?\\))) (append shell-delimiter-argument-list '(?\s ?$ ?\* ?\! ?\" ?\' ?\` ?\# ?\\)))
"List of characters to quote when in a file name. "List of characters to quote when in a file name.
This variable is used to initialize `comint-file-name-quote-list' in the This variable is used to initialize `comint-file-name-quote-list' in the
shell buffer. The value may depend on the operating system or shell. shell buffer. The value may depend on the operating system or shell."
:type '(repeat character)
This is a fine thing to set in your `.emacs' file.") :group 'shell)
(defvar shell-dynamic-complete-functions (defcustom shell-dynamic-complete-functions
'(comint-c-a-p-replace-by-expanded-history '(comint-c-a-p-replace-by-expanded-history
shell-environment-variable-completion shell-environment-variable-completion
shell-command-completion shell-command-completion
...@@ -192,9 +186,9 @@ This is a fine thing to set in your `.emacs' file.") ...@@ -192,9 +186,9 @@ This is a fine thing to set in your `.emacs' file.")
comint-filename-completion) comint-filename-completion)
"List of functions called to perform completion. "List of functions called to perform completion.
This variable is used to initialize `comint-dynamic-complete-functions' in the This variable is used to initialize `comint-dynamic-complete-functions' in the
shell buffer. shell buffer."
:type '(repeat function)
This is a fine thing to set in your `.emacs' file.") :group 'shell)
(defcustom shell-command-regexp "[^;&|\n]+" (defcustom shell-command-regexp "[^;&|\n]+"
"Regexp to match a single command within a pipeline. "Regexp to match a single command within a pipeline.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment