diff options
Diffstat (limited to 'lisp/progmodes/sh-script.el')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 28bc2eaf3e0..341a0d179e7 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -562,9 +562,8 @@ documents - you must insert literal tabs by hand.") ;; but it *did* have an asterisk in the docstring! (defcustom sh-builtins '((bash eval sh-append posix - "." "alias" "bg" "bind" "builtin" "compgen" "complete" - "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history" - "jobs" "kill" "let" "local" "popd" "printf" "pushd" "source" + "alias" "bg" "bind" "builtin" "declare" "dirs" "enable" "fc" "fg" + "help" "history" "jobs" "kill" "let" "local" "popd" "pushd" "source" "suspend" "typeset" "unalias") ;; The next entry is only used for defining the others @@ -635,10 +634,7 @@ implemented as aliases. See `sh-feature'." (defcustom sh-leading-keywords - '((bash eval sh-append sh - "time") - - (csh "else") + '((csh "else") (es "true" "unwind-protect" "whatis") @@ -699,20 +695,14 @@ See `sh-feature'." (defvar sh-variables '((bash eval sh-append sh - "allow_null_glob_expansion" "auto_resume" "BASH" "BASH_ENV" - "BASH_VERSINFO" "BASH_VERSION" "cdable_vars" "COMP_CWORD" - "COMP_LINE" "COMP_POINT" "COMP_WORDS" "COMPREPLY" "DIRSTACK" - "ENV" "EUID" "FCEDIT" "FIGNORE" "FUNCNAME" - "glob_dot_filenames" "GLOBIGNORE" "GROUPS" "histchars" - "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE" - "HISTIGNORE" "history_control" "HISTSIZE" - "hostname_completion_file" "HOSTFILE" "HOSTTYPE" "IGNOREEOF" - "ignoreeof" "INPUTRC" "LINENO" "MACHTYPE" "MAIL_WARNING" - "noclobber" "nolinks" "notify" "no_exit_on_failed_exec" - "NO_PROMPT_VARS" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS" - "PPID" "POSIXLY_CORRECT" "PROMPT_COMMAND" "PS3" "PS4" - "pushd_silent" "PWD" "RANDOM" "REPLY" "SECONDS" "SHELLOPTS" - "SHLVL" "TIMEFORMAT" "TMOUT" "UID") + "allow_null_glob_expansion" "auto_resume" "BASH" "BASH_VERSION" + "cdable_vars" "ENV" "EUID" "FCEDIT" "FIGNORE" "glob_dot_filenames" + "histchars" "HISTFILE" "HISTFILESIZE" "history_control" "HISTSIZE" + "hostname_completion_file" "HOSTTYPE" "IGNOREEOF" "ignoreeof" + "LINENO" "MAIL_WARNING" "noclobber" "nolinks" "notify" + "no_exit_on_failed_exec" "NO_PROMPT_VARS" "OLDPWD" "OPTERR" "PPID" + "PROMPT_COMMAND" "PS4" "pushd_silent" "PWD" "RANDOM" "REPLY" + "SECONDS" "SHLVL" "TMOUT" "UID") (csh eval sh-append shell "argv" "cdpath" "child" "echo" "histchars" "history" "home" @@ -808,8 +798,7 @@ See `sh-feature'.") ;; The next entry is only used for defining the others (shell eval sh-append executable-font-lock-keywords - ;; Using font-lock-string-face here confuses sh-get-indent-info. - '("\\\\[^A-Za-z0-9]" 0 font-lock-warning-face) + '("\\\\[^A-Za-z0-9]" 0 font-lock-string-face) '("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1 font-lock-variable-name-face)) (rpm eval sh-append rpm2 @@ -3214,7 +3203,7 @@ t means to return a list of all possible completions of STRING. process-environment) sh-shell-variables)))) (case code - ((nil) (try-completion string sh-shell-variables predicate)) + (nil (try-completion string sh-shell-variables predicate)) (lambda (test-completion string sh-shell-variables predicate)) (t (all-completions string sh-shell-variables predicate))))) @@ -3544,5 +3533,4 @@ The document is bounded by `sh-here-document-word'." (provide 'sh-script) -;;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937 ;;; sh-script.el ends here |