[Emacs-diffs] Changes to emacs/lisp/progmodes/sh-script.el

[Glenn Morris]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.127 
emacs/lisp/progmodes/sh-script.el:1.128
*** emacs/lisp/progmodes/sh-script.el:1.127     Sat Aug  2 16:08:49 2003
--- emacs/lisp/progmodes/sh-script.el   Sun Aug 24 11:24:19 2003
***************
*** 562,569 ****
  ;; but it *did* have an asterisk in the docstring!
  (defcustom sh-builtins
    '((bash eval sh-append posix
!         "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
--- 562,570 ----
  ;; 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"
          "suspend" "typeset" "unalias")
  
      ;; The next entry is only used for defining the others
***************
*** 634,640 ****
  
  
  (defcustom sh-leading-keywords
!   '((csh "else")
  
      (es "true" "unwind-protect" "whatis")
  
--- 635,644 ----
  
  
  (defcustom sh-leading-keywords
!   '((bash eval sh-append sh
!           "time")
! 
!     (csh "else")
  
      (es "true" "unwind-protect" "whatis")
  
***************
*** 695,708 ****
  
  (defvar sh-variables
    '((bash eval sh-append sh
!         "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"
--- 699,718 ----
  
  (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")
  
      (csh eval sh-append shell
         "argv" "cdpath" "child" "echo" "histchars" "history" "home"
***************
*** 3203,3209 ****
                          process-environment)
                  sh-shell-variables))))
      (case code
!       (nil (try-completion string sh-shell-variables predicate))
        (lambda (test-completion string sh-shell-variables predicate))
        (t (all-completions string sh-shell-variables predicate)))))
  
--- 3213,3219 ----
                          process-environment)
                  sh-shell-variables))))
      (case code
!       ((nil) (try-completion string sh-shell-variables predicate))
        (lambda (test-completion string sh-shell-variables predicate))
        (t (all-completions string sh-shell-variables predicate)))))