Update AUCTeX

[gnu-emacs] / lisp / progmodes / sh-script.el

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 57baecef17d096044f6c93730b34eeb922f7437c..cef86f8f90e651986611f300ea9fd114c67566ba 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,6 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
 ;;; sh-script.el --- shell-script editing commands for Emacs
 

-;; Copyright (C) 1993, 94, 95, 96, 97, 1999, 2001
+;; Copyright (C) 1993, 94, 95, 96, 97, 1999, 2001, 03, 2004

 ;;  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>


@@ -116,7 +116,7 @@
 ;; You can do this automatically like this:
 ;;   (add-hook 'sh-set-shell-hook 'sh-learn-buffer-indent)
 ;;
 ;; You can do this automatically like this:
 ;;   (add-hook 'sh-set-shell-hook 'sh-learn-buffer-indent)
 ;;

-;; However...   `sh-learn-buffer-indent' is extremely slow,
+;; However...  `sh-learn-buffer-indent' is extremely slow,

 ;; especially on large-ish buffer.  Also, if there are conflicts the
 ;; "last one wins" which may not produce the desired setting.
 ;;
 ;; especially on large-ish buffer.  Also, if there are conflicts the
 ;; "last one wins" which may not produce the desired setting.
 ;;


@@ -195,6 +195,7 @@
 
 (eval-when-compile
   (require 'skeleton)
 
 (eval-when-compile
   (require 'skeleton)

+  (require 'cl)

   (require 'comint))
 (require 'executable)
 
   (require 'comint))
 (require 'executable)
 


@@ -258,7 +259,7 @@ sh          Bourne Shell
 
 
 (defcustom sh-alias-alist
 
 
 (defcustom sh-alias-alist

-  (nconc (if (eq system-type 'gnu/linux)
+  (append (if (eq system-type 'gnu/linux)

             '((csh . tcsh)
               (ksh . pdksh)))
         ;; for the time being
             '((csh . tcsh)
               (ksh . pdksh)))
         ;; for the time being


@@ -314,9 +315,7 @@ shell it really is."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (const :tag "No Arguments" nil)
                               (string :tag "Arguments")
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (const :tag "No Arguments" nil)
                               (string :tag "Arguments")

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 (defcustom sh-imenu-generic-expression
   :group 'sh-script)
 
 (defcustom sh-imenu-generic-expression


@@ -354,24 +353,29 @@ the car and cdr are the same symbol.")
 (defvar sh-shell (sh-canonicalize-shell (file-name-nondirectory sh-shell-file))
   "The shell being programmed.  This is set by \\[sh-set-shell].")
 
 (defvar sh-shell (sh-canonicalize-shell (file-name-nondirectory sh-shell-file))
   "The shell being programmed.  This is set by \\[sh-set-shell].")
 

+(defvar sh-mode-abbrev-table nil)
+
+(define-abbrev-table 'sh-mode-abbrev-table ())
+
+

 ;; I turned off this feature because it doesn't permit typing commands
 ;; in the usual way without help.
 ;;(defvar sh-abbrevs
 ;; I turned off this feature because it doesn't permit typing commands
 ;; in the usual way without help.
 ;;(defvar sh-abbrevs

-;;  '((csh eval sh-abbrevs shell
+;;  '((csh sh-abbrevs shell

 ;;      "switch" 'sh-case
 ;;      "getopts" 'sh-while-getopts)
 
 ;;      "switch" 'sh-case
 ;;      "getopts" 'sh-while-getopts)
 

-;;    (es eval sh-abbrevs shell
+;;    (es sh-abbrevs shell

 ;;     "function" 'sh-function)
 
 ;;     "function" 'sh-function)
 

-;;    (ksh88 eval sh-abbrevs sh
+;;    (ksh88 sh-abbrevs sh

 ;;        "select" 'sh-select)
 
 ;;        "select" 'sh-select)
 

-;;    (rc eval sh-abbrevs shell
+;;    (rc sh-abbrevs shell

 ;;     "case" 'sh-case
 ;;     "function" 'sh-function)
 
 ;;     "case" 'sh-case
 ;;     "function" 'sh-function)
 

-;;    (sh eval sh-abbrevs shell
+;;    (sh sh-abbrevs shell

 ;;     "case" 'sh-case
 ;;     "function" 'sh-function
 ;;     "until" 'sh-until
 ;;     "case" 'sh-case
 ;;     "function" 'sh-function
 ;;     "until" 'sh-until


@@ -384,7 +388,7 @@ the car and cdr are the same symbol.")
 ;;        "tmpfile" sh-tmp-file
 ;;        "while" sh-while)
 
 ;;        "tmpfile" sh-tmp-file
 ;;        "while" sh-while)
 

-;;    (zsh eval sh-abbrevs ksh88
+;;    (zsh sh-abbrevs ksh88

 ;;      "repeat" 'sh-repeat))
 ;;  "Abbrev-table used in Shell-Script mode.  See `sh-feature'.
 ;;;Due to the internal workings of abbrev tables, the shell name symbol is
 ;;      "repeat" 'sh-repeat))
 ;;  "Abbrev-table used in Shell-Script mode.  See `sh-feature'.
 ;;;Due to the internal workings of abbrev tables, the shell name symbol is


@@ -392,10 +396,20 @@ the car and cdr are the same symbol.")
 
 
 
 
 
 

-(defvar sh-mode-syntax-table
-  '((sh eval sh-mode-syntax-table ()
+(defun sh-mode-syntax-table (table &rest list)
+  "Copy TABLE and set syntax for successive CHARs according to strings S."
+  (setq table (copy-syntax-table table))
+  (while list
+    (modify-syntax-entry (pop list) (pop list) table))
+  table)
+
+(defvar sh-mode-syntax-table nil
+  "The syntax table to use for Shell-Script mode.
+This is buffer-local in every such buffer.")
+
+(defvar sh-mode-default-syntax-table
+  (sh-mode-syntax-table ()

        ?\# "<"
        ?\# "<"

-       ?\^l ">#"

        ?\n ">#"
        ?\" "\"\""
        ?\' "\"'"
        ?\n ">#"
        ?\" "\"\""
        ?\' "\"'"


@@ -406,11 +420,13 @@ the car and cdr are the same symbol.")
        ?. "_"
        ?^ "_"
        ?~ "_"
        ?. "_"
        ?^ "_"
        ?~ "_"

+       ?, "_"

        ?< "."
        ?> ".")
        ?< "."
        ?> ".")

-    (csh eval identity sh)
-    (rc eval identity sh))
+  "Default syntax table for shell mode.")

 
 

+(defvar sh-mode-syntax-table-input
+  '((sh . nil))

   "Syntax-table used in Shell-Script mode.  See `sh-feature'.")
 
 (defvar sh-mode-map
   "Syntax-table used in Shell-Script mode.  See `sh-feature'.")
 
 (defvar sh-mode-map


@@ -444,21 +460,13 @@ the car and cdr are the same symbol.")
     (define-key map "`" 'skeleton-pair-insert-maybe)
     (define-key map "\"" 'skeleton-pair-insert-maybe)
 
     (define-key map "`" 'skeleton-pair-insert-maybe)
     (define-key map "\"" 'skeleton-pair-insert-maybe)
 

-    (substitute-key-definition 'complete-tag 'comint-dynamic-complete
-                              map (current-global-map))
-    (substitute-key-definition 'newline-and-indent 'sh-newline-and-indent
-                              map (current-global-map))
-    (substitute-key-definition 'delete-backward-char
-                              'backward-delete-char-untabify
-                              map (current-global-map))
+    (define-key map [remap complete-tag] 'comint-dynamic-complete)
+    (define-key map [remap newline-and-indent] 'sh-newline-and-indent)
+    (define-key map [remap delete-backward-char]
+      'backward-delete-char-untabify)

     (define-key map "\C-c:" 'sh-set-shell)
     (define-key map "\C-c:" 'sh-set-shell)

-    (substitute-key-definition 'beginning-of-defun
-                              'sh-beginning-of-compound-command
-                              map (current-global-map))
-    (substitute-key-definition 'backward-sentence 'sh-beginning-of-command
-                              map (current-global-map))
-    (substitute-key-definition 'forward-sentence 'sh-end-of-command
-                              map (current-global-map))
+    (define-key map [remap backward-sentence] 'sh-beginning-of-command)
+    (define-key map [remap forward-sentence] 'sh-end-of-command)

     (define-key map [menu-bar insert] (cons "Insert" menu-map))
     (define-key menu-map [sh-while]    '("While Loop" . sh-while))
     (define-key menu-map [sh-until]    '("Until Loop" . sh-until))
     (define-key map [menu-bar insert] (cons "Insert" menu-map))
     (define-key menu-map [sh-while]    '("While Loop" . sh-while))
     (define-key menu-map [sh-until]    '("Until Loop" . sh-until))


@@ -487,15 +495,13 @@ the car and cdr are the same symbol.")
 (defcustom sh-require-final-newline
   '((csh . t)
     (pdksh . t)
 (defcustom sh-require-final-newline
   '((csh . t)
     (pdksh . t)

-    (rc eval . require-final-newline)
-    (sh eval . require-final-newline))
+    (rc . require-final-newline)
+    (sh . require-final-newline))

   "*Value of `require-final-newline' in Shell-Script mode buffers.
 See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (const :tag "require" t)
   "*Value of `require-final-newline' in Shell-Script mode buffers.
 See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (const :tag "require" t)

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 
   :group 'sh-script)
 
 


@@ -510,9 +516,7 @@ First grouping matches the variable name.  This is upto and including the `='
 sign.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice regexp
 sign.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice regexp

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 
   :group 'sh-script)
 
 


@@ -551,7 +555,13 @@ The actual command ends at the end of the first \\(grouping\\)."
 
 
 (defvar sh-here-document-word "EOF"
 
 
 (defvar sh-here-document-word "EOF"

-  "Word to delimit here documents.")
+  "Word to delimit here documents.
+If the first character of this string is \"-\", this character will
+be removed from the string when it is used to close the here document.
+This convention is used by the Bash shell, for example, to indicate
+that leading tabs inside the here document should be ignored.
+Note that Emacs currently has no support for indenting inside here
+documents - you must insert literal tabs by hand.")

 
 (defvar sh-test
   '((sh "[  ]" . 3)
 
 (defvar sh-test
   '((sh "[  ]" . 3)


@@ -562,60 +572,61 @@ The actual command ends at the end of the first \\(grouping\\)."
 ;; customized this out of sheer bravado.  not for the faint of heart.
 ;; but it *did* have an asterisk in the docstring!
 (defcustom sh-builtins
 ;; customized this out of sheer bravado.  not for the faint of heart.
 ;; 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")
+  '((bash sh-append posix
+         "." "alias" "bg" "bind" "builtin" "compgen" "complete"
+          "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
+          "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
+          "source" "suspend" "typeset" "unalias")

 
     ;; The next entry is only used for defining the others
 
     ;; The next entry is only used for defining the others

-    (bourne eval sh-append shell
+    (bourne sh-append shell

            "eval" "export" "getopts" "newgrp" "pwd" "read" "readonly"
            "times" "ulimit")
 
            "eval" "export" "getopts" "newgrp" "pwd" "read" "readonly"
            "times" "ulimit")
 

-    (csh eval sh-append shell
+    (csh sh-append shell

         "alias" "chdir" "glob" "history" "limit" "nice" "nohup" "rehash"
         "setenv" "source" "time" "unalias" "unhash")
 
         "alias" "chdir" "glob" "history" "limit" "nice" "nohup" "rehash"
         "setenv" "source" "time" "unalias" "unhash")
 

-    (dtksh eval identity wksh)
+    (dtksh sh-append wksh)

 
     (es "access" "apids" "cd" "echo" "eval" "false" "let" "limit" "local"
        "newpgrp" "result" "time" "umask" "var" "vars" "wait" "whatis")
 
 
     (es "access" "apids" "cd" "echo" "eval" "false" "let" "limit" "local"
        "newpgrp" "result" "time" "umask" "var" "vars" "wait" "whatis")
 

-    (jsh eval sh-append sh
+    (jsh sh-append sh

         "bg" "fg" "jobs" "kill" "stop" "suspend")
 
         "bg" "fg" "jobs" "kill" "stop" "suspend")
 

-    (jcsh eval sh-append csh
+    (jcsh sh-append csh

          "bg" "fg" "jobs" "kill" "notify" "stop" "suspend")
 
          "bg" "fg" "jobs" "kill" "notify" "stop" "suspend")
 

-    (ksh88 eval sh-append bourne
+    (ksh88 sh-append bourne

           "alias" "bg" "false" "fc" "fg" "jobs" "kill" "let" "print" "time"
           "typeset" "unalias" "whence")
 
           "alias" "bg" "false" "fc" "fg" "jobs" "kill" "let" "print" "time"
           "typeset" "unalias" "whence")
 

-    (oash eval sh-append sh
+    (oash sh-append sh

          "checkwin" "dateline" "error" "form" "menu" "newwin" "oadeinit"
          "oaed" "oahelp" "oainit" "pp" "ppfile" "scan" "scrollok" "wattr"
          "wclear" "werase" "win" "wmclose" "wmmessage" "wmopen" "wmove"
          "wmtitle" "wrefresh")
 
          "checkwin" "dateline" "error" "form" "menu" "newwin" "oadeinit"
          "oaed" "oahelp" "oainit" "pp" "ppfile" "scan" "scrollok" "wattr"
          "wclear" "werase" "win" "wmclose" "wmmessage" "wmopen" "wmove"
          "wmtitle" "wrefresh")
 

-    (pdksh eval sh-append ksh88
+    (pdksh sh-append ksh88

           "bind")
 
           "bind")
 

-    (posix eval sh-append sh
+    (posix sh-append sh

           "command")
 
     (rc "builtin" "cd" "echo" "eval" "limit" "newpgrp" "shift" "umask" "wait"
        "whatis")
 
           "command")
 
     (rc "builtin" "cd" "echo" "eval" "limit" "newpgrp" "shift" "umask" "wait"
        "whatis")
 

-    (sh eval sh-append bourne
+    (sh sh-append bourne

        "hash" "test" "type")
 
     ;; The next entry is only used for defining the others
     (shell "cd" "echo" "eval" "set" "shift" "umask" "unset" "wait")
 
        "hash" "test" "type")
 
     ;; The next entry is only used for defining the others
     (shell "cd" "echo" "eval" "set" "shift" "umask" "unset" "wait")
 

-    (wksh eval sh-append ksh88
+    (wksh sh-append ksh88

          "Xt[A-Z][A-Za-z]*")
 
          "Xt[A-Z][A-Za-z]*")
 

-    (zsh eval sh-append ksh88
+    (zsh sh-append ksh88

         "autoload" "bindkey" "builtin" "chdir" "compctl" "declare" "dirs"
         "disable" "disown" "echotc" "enable" "functions" "getln" "hash"
         "history" "integer" "limit" "local" "log" "popd" "pushd" "r"
         "autoload" "bindkey" "builtin" "chdir" "compctl" "declare" "dirs"
         "disable" "disown" "echotc" "enable" "functions" "getln" "hash"
         "history" "integer" "limit" "local" "log" "popd" "pushd" "r"


@@ -627,109 +638,112 @@ Note that on some systems not all builtins are available or some are
 implemented as aliases.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)
 implemented as aliases.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 
 
 (defcustom sh-leading-keywords
   :group 'sh-script)
 
 
 
 (defcustom sh-leading-keywords

-  '((csh "else")
+  '((bash sh-append sh
+          "time")
+
+    (csh "else")

 
     (es "true" "unwind-protect" "whatis")
 
     (rc "else")
 
 
     (es "true" "unwind-protect" "whatis")
 
     (rc "else")
 

-    (sh "do" "elif" "else" "if" "then" "trap" "type" "until" "while"))
+    (sh "!" "do" "elif" "else" "if" "then" "trap" "type" "until" "while"))

   "*List of keywords that may be immediately followed by a builtin or keyword.
 Given some confusion between keywords and builtins depending on shell and
 system, the distinction here has been based on whether they influence the
 flow of control or syntax.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)
   "*List of keywords that may be immediately followed by a builtin or keyword.
 Given some confusion between keywords and builtins depending on shell and
 system, the distinction here has been based on whether they influence the
 flow of control or syntax.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 
 (defcustom sh-other-keywords
   :group 'sh-script)
 
 
 (defcustom sh-other-keywords

-  '((bash eval sh-append bourne
-         "bye" "logout")
+  '((bash sh-append bourne
+         "bye" "logout" "select")

 
     ;; The next entry is only used for defining the others
 
     ;; The next entry is only used for defining the others

-    (bourne eval sh-append sh
+    (bourne sh-append sh

            "function")
 
            "function")
 

-    (csh eval sh-append shell
+    (csh sh-append shell

         "breaksw" "default" "end" "endif" "endsw" "foreach" "goto"
         "if" "logout" "onintr" "repeat" "switch" "then" "while")
 
     (es "break" "catch" "exec" "exit" "fn" "for" "forever" "fork" "if"
        "return" "throw" "while")
 
         "breaksw" "default" "end" "endif" "endsw" "foreach" "goto"
         "if" "logout" "onintr" "repeat" "switch" "then" "while")
 
     (es "break" "catch" "exec" "exit" "fn" "for" "forever" "fork" "if"
        "return" "throw" "while")
 

-    (ksh88 eval sh-append bourne
+    (ksh88 sh-append bourne

           "select")
 
     (rc "break" "case" "exec" "exit" "fn" "for" "if" "in" "return" "switch"
        "while")
 
           "select")
 
     (rc "break" "case" "exec" "exit" "fn" "for" "if" "in" "return" "switch"
        "while")
 

-    (sh eval sh-append shell
+    (sh sh-append shell

        "done" "esac" "fi" "for" "in" "return")
 
     ;; The next entry is only used for defining the others
     (shell "break" "case" "continue" "exec" "exit")
 
        "done" "esac" "fi" "for" "in" "return")
 
     ;; The next entry is only used for defining the others
     (shell "break" "case" "continue" "exec" "exit")
 

-    (zsh eval sh-append bash
+    (zsh sh-append bash

         "select"))
   "*List of keywords not in `sh-leading-keywords'.
 See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)
         "select"))
   "*List of keywords not in `sh-leading-keywords'.
 See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                       (choice (repeat string)

-                              (cons :format "Evaluate: %v"
-                                    (const :format "" eval)
-                                    sexp))))
+                              (sexp :format "Evaluate: %v"))))

   :group 'sh-script)
 
 
 
 (defvar sh-variables
   :group 'sh-script)
 
 
 
 (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
+  '((bash 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 sh-append shell

         "argv" "cdpath" "child" "echo" "histchars" "history" "home"
         "ignoreeof" "mail" "noclobber" "noglob" "nonomatch" "path" "prompt"
         "shell" "status" "time" "verbose")
 
         "argv" "cdpath" "child" "echo" "histchars" "history" "home"
         "ignoreeof" "mail" "noclobber" "noglob" "nonomatch" "path" "prompt"
         "shell" "status" "time" "verbose")
 

-    (es eval sh-append shell
+    (es sh-append shell

        "apid" "cdpath" "CDPATH" "history" "home" "ifs" "noexport" "path"
        "pid" "prompt" "signals")
 
        "apid" "cdpath" "CDPATH" "history" "home" "ifs" "noexport" "path"
        "pid" "prompt" "signals")
 

-    (jcsh eval sh-append csh
+    (jcsh sh-append csh

          "notify")
 
          "notify")
 

-    (ksh88 eval sh-append sh
+    (ksh88 sh-append sh

           "ENV" "ERRNO" "FCEDIT" "FPATH" "HISTFILE" "HISTSIZE" "LINENO"
           "OLDPWD" "PPID" "PS3" "PS4" "PWD" "RANDOM" "REPLY" "SECONDS"
           "TMOUT")
 
           "ENV" "ERRNO" "FCEDIT" "FPATH" "HISTFILE" "HISTSIZE" "LINENO"
           "OLDPWD" "PPID" "PS3" "PS4" "PWD" "RANDOM" "REPLY" "SECONDS"
           "TMOUT")
 

-    (oash eval sh-append sh
+    (oash sh-append sh

          "FIELD" "FIELD_MAX" "LAST_KEY" "OALIB" "PP_ITEM" "PP_NUM")
 
          "FIELD" "FIELD_MAX" "LAST_KEY" "OALIB" "PP_ITEM" "PP_NUM")
 

-    (rc eval sh-append shell
+    (rc sh-append shell

        "apid" "apids" "cdpath" "CDPATH" "history" "home" "ifs" "path" "pid"
        "prompt" "status")
 
        "apid" "apids" "cdpath" "CDPATH" "history" "home" "ifs" "path" "pid"
        "prompt" "status")
 

-    (sh eval sh-append shell
+    (sh sh-append shell

        "CDPATH" "IFS" "OPTARG" "OPTIND" "PS1" "PS2")
 
     ;; The next entry is only used for defining the others
        "CDPATH" "IFS" "OPTARG" "OPTIND" "PS1" "PS2")
 
     ;; The next entry is only used for defining the others


@@ -738,7 +752,7 @@ See `sh-feature'."
           "LINES" "LOGNAME" "MAIL" "MAILCHECK" "MAILPATH" "PAGER" "PATH"
           "SHELL" "TERM" "TERMCAP" "TERMINFO" "VISUAL")
 
           "LINES" "LOGNAME" "MAIL" "MAILCHECK" "MAILPATH" "PAGER" "PATH"
           "SHELL" "TERM" "TERMCAP" "TERMINFO" "VISUAL")
 

-    (tcsh eval sh-append csh
+    (tcsh sh-append csh

          "addsuffix" "ampm" "autocorrect" "autoexpand" "autolist"
          "autologout" "chase_symlinks" "correct" "dextract" "edit" "el"
          "fignore" "gid" "histlit" "HOST" "HOSTTYPE" "HPATH"
          "addsuffix" "ampm" "autocorrect" "autoexpand" "autolist"
          "autologout" "chase_symlinks" "correct" "dextract" "edit" "el"
          "fignore" "gid" "histlit" "HOST" "HOSTTYPE" "HPATH"


@@ -749,7 +763,7 @@ See `sh-feature'."
          "tperiod" "tty" "uid" "version" "visiblebell" "watch" "who"
          "wordchars")
 
          "tperiod" "tty" "uid" "version" "visiblebell" "watch" "who"
          "wordchars")
 

-    (zsh eval sh-append ksh88
+    (zsh sh-append ksh88

         "BAUD" "bindcmds" "cdpath" "DIRSTACKSIZE" "fignore" "FIGNORE" "fpath"
         "HISTCHARS" "hostcmds" "hosts" "HOSTS" "LISTMAX" "LITHISTSIZE"
         "LOGCHECK" "mailpath" "manpath" "NULLCMD" "optcmds" "path" "POSTEDIT"
         "BAUD" "bindcmds" "cdpath" "DIRSTACKSIZE" "fignore" "FIGNORE" "fpath"
         "HISTCHARS" "hostcmds" "hosts" "HOSTS" "LISTMAX" "LITHISTSIZE"
         "LOGCHECK" "mailpath" "manpath" "NULLCMD" "optcmds" "path" "POSTEDIT"


@@ -778,34 +792,36 @@ See `sh-feature'.")
 
 
 (defvar sh-font-lock-keywords
 
 
 (defvar sh-font-lock-keywords

-  '((csh eval sh-append shell
-        '("\\${?[#?]?\\([A-Za-z_][A-Za-z0-9_]*\\|0\\)" 1
-          font-lock-variable-name-face))
+  '((csh sh-append shell
+        ("\\${?[#?]?\\([A-Za-z_][A-Za-z0-9_]*\\|0\\)" 1
+          font-lock-variable-name-face))

 
 

-    (es eval sh-append executable-font-lock-keywords
-       '("\\$#?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\)" 1
-         font-lock-variable-name-face))
+    (es sh-append executable-font-lock-keywords
+       ("\\$#?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\)" 1
+         font-lock-variable-name-face))

 
 

-    (rc eval identity es)
+    (rc sh-append es)

 
 

-    (sh eval sh-append shell
+    (sh sh-append shell

        ;; Variable names.
        ;; Variable names.

-       '("\\$\\({#?\\)?\\([A-Za-z_][A-Za-z0-9_]*\\|[-#?@!]\\)" 2
+       ("\\$\\({#?\\)?\\([A-Za-z_][A-Za-z0-9_]*\\|[-#?@!]\\)" 2

          font-lock-variable-name-face)
        ;; Function names.
          font-lock-variable-name-face)
        ;; Function names.

-       '("^\\(\\sw+\\)[ \t]*(" 1 font-lock-function-name-face)
-       '("\\<\\(function\\)\\>[ \t]*\\(\\sw+\\)?"
+       ("^\\(\\sw+\\)[ \t]*(" 1 font-lock-function-name-face)
+       ("\\<\\(function\\)\\>[ \t]*\\(\\sw+\\)?"

          (1 font-lock-keyword-face) (2 font-lock-function-name-face nil t)))
 
     ;; The next entry is only used for defining the others
          (1 font-lock-keyword-face) (2 font-lock-function-name-face nil t)))
 
     ;; The next entry is only used for defining the others

-    (shell eval sh-append executable-font-lock-keywords
-          '("\\\\[^A-Za-z0-9]" 0 font-lock-string-face)
-          '("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1
+    (shell sh-append executable-font-lock-keywords
+           ;; Using font-lock-string-face here confuses sh-get-indent-info.
+           ("\\\\$" 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))
             font-lock-variable-name-face))

-    (rpm eval sh-append rpm2
-        '("%{?\\(\\sw+\\)"  1 font-lock-keyword-face))
-    (rpm2 eval sh-append shell
-         '("^\\(\\sw+\\):"  1 font-lock-variable-name-face)))
+    (rpm sh-append rpm2
+        ("%{?\\(\\sw+\\)"  1 font-lock-keyword-face))
+    (rpm2 sh-append shell
+         ("^\\(\\sw+\\):"  1 font-lock-variable-name-face)))

   "Default expressions to highlight in Shell Script modes.  See `sh-feature'.")
 
 (defvar sh-font-lock-keywords-1
   "Default expressions to highlight in Shell Script modes.  See `sh-feature'.")
 
 (defvar sh-font-lock-keywords-1


@@ -892,6 +908,10 @@ be indented (i.e. a <<- was used rather than just <<)."
   ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
   (re-search-forward sh-here-doc-re limit t))
 
   ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
   (re-search-forward sh-here-doc-re limit t))
 

+(defun sh-is-quoted-p (pos)
+  (and (eq (char-before pos) ?\\)
+       (not (sh-is-quoted-p (1- pos)))))
+

 (defun sh-font-lock-paren (start)
   (save-excursion
     (goto-char start)
 (defun sh-font-lock-paren (start)
   (save-excursion
     (goto-char start)


@@ -902,7 +922,9 @@ be indented (i.e. a <<- was used rather than just <<)."
          ;; Skip through one pattern
          (while
              (or (/= 0 (skip-syntax-backward "w_"))
          ;; Skip through one pattern
          (while
              (or (/= 0 (skip-syntax-backward "w_"))

-                 (/= 0 (skip-chars-backward "?*/"))
+                 (/= 0 (skip-chars-backward "?[]*@/\\"))
+                 (and (sh-is-quoted-p (1- (point)))
+                      (goto-char (- (point) 2)))

                  (when (memq (char-before) '(?\" ?\'))
                    (condition-case nil (progn (backward-sexp 1) t)
                      (error nil)))))
                  (when (memq (char-before) '(?\" ?\'))
                    (condition-case nil (progn (backward-sexp 1) t)
                      (error nil)))))


@@ -1058,12 +1080,12 @@ a number means align to that column, e.g. 0 means fist column."
          sh-symbol-list))
 
 (defcustom sh-indent-for-fi 0
          sh-symbol-list))
 
 (defcustom sh-indent-for-fi 0

-  "*How much to indent a fi relative to an if.   Usually 0."
+  "*How much to indent a fi relative to an if.  Usually 0."

   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-done '0
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-done '0

-  "*How much to indent a done relative to its matching stmt.   Usually 0."
+  "*How much to indent a done relative to its matching stmt.  Usually 0."

   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 


@@ -1080,7 +1102,7 @@ does not affect then else elif or fi statements themselves."
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-then '+
   :group 'sh-indentation)
 
 (defcustom sh-indent-for-then '+

-  "*How much to indent an then relative to an if."
+  "*How much to indent a then relative to an if."

   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 
   :type `(choice ,@ sh-number-or-symbol-list )
   :group 'sh-indentation)
 


@@ -1222,9 +1244,6 @@ frequently editing existing scripts with different styles.")
 \f
 ;; mode-command and utility functions
 
 \f
 ;; mode-command and utility functions
 

-;;;###autoload
-(put 'sh-mode 'mode-class 'special)
-

 ;;;###autoload
 (defun sh-mode ()
   "Major mode for editing shell scripts.
 ;;;###autoload
 (defun sh-mode ()
   "Major mode for editing shell scripts.


@@ -1448,9 +1467,11 @@ the visited file executable, and NO-QUERY-FLAG (the second argument)
 controls whether to query about making the visited file executable.
 
 Calls the value of `sh-set-shell-hook' if set."
 controls whether to query about making the visited file executable.
 
 Calls the value of `sh-set-shell-hook' if set."

-  (interactive (list (completing-read "Name or path of shell: "
-                                     interpreter-mode-alist
-                                     (lambda (x) (eq (cdr x) 'sh-mode)))
+  (interactive (list (completing-read (format "Shell \(default %s\): "
+                                             sh-shell-file)
+                                     interpreter-mode-alist
+                                     (lambda (x) (eq (cdr x) 'sh-mode))
+                                     nil nil nil sh-shell-file)

                     (eq executable-query 'function)
                     t))
   (if (string-match "\\.exe\\'" shell)
                     (eq executable-query 'function)
                     t))
   (if (string-match "\\.exe\\'" shell)


@@ -1462,16 +1483,23 @@ Calls the value of `sh-set-shell-hook' if set."
       (setq sh-shell-file
            (executable-set-magic shell (sh-feature sh-shell-arg)
                                  no-query-flag insert-flag)))
       (setq sh-shell-file
            (executable-set-magic shell (sh-feature sh-shell-arg)
                                  no-query-flag insert-flag)))

-  (setq require-final-newline (sh-feature sh-require-final-newline)
-;;;    local-abbrev-table (sh-feature sh-abbrevs)
+  (let ((tem (sh-feature sh-require-final-newline)))
+    (unless (eq tem 'require-final-newline)
+      (setq require-final-newline tem)))
+  (setq

        comment-start-skip "#+[\t ]*"
        comment-start-skip "#+[\t ]*"

+       local-abbrev-table sh-mode-abbrev-table

        mode-line-process (format "[%s]" sh-shell)
        sh-shell-variables nil
        sh-shell-variables-initialized nil
        imenu-generic-expression (sh-feature sh-imenu-generic-expression)
        imenu-case-fold-search nil)
        mode-line-process (format "[%s]" sh-shell)
        sh-shell-variables nil
        sh-shell-variables-initialized nil
        imenu-generic-expression (sh-feature sh-imenu-generic-expression)
        imenu-case-fold-search nil)

-  (set-syntax-table (or (sh-feature sh-mode-syntax-table)
-                       (standard-syntax-table)))
+  (make-local-variable 'sh-mode-syntax-table)
+  (let ((tem (sh-feature sh-mode-syntax-table-input)))
+    (setq sh-mode-syntax-table
+         (if tem (apply 'sh-mode-syntax-table tem)
+           sh-mode-default-syntax-table)))
+  (set-syntax-table sh-mode-syntax-table)

   (dolist (var (sh-feature sh-variables))
     (sh-remember-variable var))
   (make-local-variable 'indent-line-function)
   (dolist (var (sh-feature sh-variables))
     (sh-remember-variable var))
   (make-local-variable 'indent-line-function)


@@ -1497,7 +1525,7 @@ Calls the value of `sh-set-shell-hook' if set."
 
 
 
 
 
 

-(defun sh-feature (list &optional function)
+(defun sh-feature (alist &optional function)

   "Index ALIST by the current shell.
 If ALIST isn't a list where every element is a cons, it is returned as is.
 Else indexing follows an inheritance logic which works in two ways:
   "Index ALIST by the current shell.
 If ALIST isn't a list where every element is a cons, it is returned as is.
 Else indexing follows an inheritance logic which works in two ways:


@@ -1506,46 +1534,43 @@ Else indexing follows an inheritance logic which works in two ways:
     the alist contains no value for the current shell.
     The ultimate default is always `sh'.
 
     the alist contains no value for the current shell.
     The ultimate default is always `sh'.
 

-  - If the value thus looked up is a list starting with `eval' its `cdr' is
-    first evaluated.  If that is also a list and the first argument is a
-    symbol in ALIST it is not evaluated, but rather recursively looked up in
-    ALIST to allow the function called to define the value for one shell to be
-    derived from another shell.  While calling the function, is the car of the
-    alist element is the current shell.
+  - If the value thus looked up is a list starting with `sh-append',
+    we call the function `sh-append' with the rest of the list as
+    arguments, and use the value.  However, the next element of the
+    list is not used as-is; instead, we look it up recursively
+    in ALIST to allow the function called to define the value for
+    one shell to be derived from another shell.

     The value thus determined is physically replaced into the alist.
 
 Optional FUNCTION is applied to the determined value and the result is cached
 in ALIST."
     The value thus determined is physically replaced into the alist.
 
 Optional FUNCTION is applied to the determined value and the result is cached
 in ALIST."

-  (or (if (consp list)
-         (let ((l list))
+  (or (if (consp alist)
+         (let ((l alist))

            (while (and l (consp (car l)))
              (setq l (cdr l)))
            (while (and l (consp (car l)))
              (setq l (cdr l)))

-           (if l list)))
+           (if l alist)))

       (if function
       (if function

-         (cdr (assoc (setq function (cons sh-shell function)) list)))
+         (cdr (assoc (setq function (cons sh-shell function)) alist)))

       (let ((sh-shell sh-shell)
            elt val)
        (while (and sh-shell
       (let ((sh-shell sh-shell)
            elt val)
        (while (and sh-shell

-                   (not (setq elt (assq sh-shell list))))
+                   (not (setq elt (assq sh-shell alist))))

          (setq sh-shell (cdr (assq sh-shell sh-ancestor-alist))))
        ;; If the shell is not known, treat it as sh.
        (unless elt
          (setq sh-shell (cdr (assq sh-shell sh-ancestor-alist))))
        ;; If the shell is not known, treat it as sh.
        (unless elt

-         (setq elt (assq 'sh list)))
+         (setq elt (assq 'sh alist)))

        (if (and (consp (setq val (cdr elt)))
        (if (and (consp (setq val (cdr elt)))

-                (eq (car val) 'eval))
+                (memq (car val) '(sh-append sh-modify)))

            (setcdr elt
                    (setq val
            (setcdr elt
                    (setq val

-                         (eval (if (consp (setq val (cdr val)))
-                                   (let ((sh-shell (car (cdr val)))
-                                         function)
-                                     (if (assq sh-shell list)
-                                         (setcar (cdr val)
-                                                 (list 'quote
-                                                       (sh-feature list))))
-                                     val)
-                                 val)))))
+                         (apply (car val)
+                                (let ((sh-shell (car (cdr val))))
+                                   (if (assq sh-shell alist)
+                                       (sh-feature alist)
+                                     (eval sh-shell)))
+                                (cddr val)))))

        (if function
        (if function

-           (nconc list
+           (nconc alist

                   (list (cons function
                               (setq sh-shell (car function)
                                     val (funcall (cdr function) val))))))
                   (list (cons function
                               (setq sh-shell (car function)
                                     val (funcall (cdr function) val))))))


@@ -1586,13 +1611,6 @@ in ALIST."
 ;;      (symbol-value sh-shell)))
 
 
 ;;      (symbol-value sh-shell)))
 
 

-(defun sh-mode-syntax-table (table &rest list)
-  "Copy TABLE and set syntax for successive CHARs according to strings S."
-  (setq table (copy-syntax-table table))
-  (while list
-    (modify-syntax-entry (pop list) (pop list) table))
-  table)
-

 (defun sh-append (ancestor &rest list)
   "Return list composed of first argument (a list) physically appended to rest."
   (nconc list ancestor))
 (defun sh-append (ancestor &rest list)
   "Return list composed of first argument (a list) physically appended to rest."
   (nconc list ancestor))


@@ -1947,28 +1965,20 @@ STRING       This is ignored for the purposes of calculating
             what the indentation is based on."
   ;; See comments before `sh-kw'.
   (save-excursion
             what the indentation is based on."
   ;; See comments before `sh-kw'.
   (save-excursion

-    (let ((prev-kw nil)
-         (prev-stmt nil)
-         (have-result nil)
-         depth-bol depth-eol
+    (let ((have-result nil)

          this-kw
          this-kw

-         (state nil)
-         state-bol
-         (depth-prev-bol nil)

          start
          start

-         func val
+         val

          (result nil)
          (result nil)

-         prev-lines-indent
-         (prev-list nil)
-         (this-list nil)

          (align-point nil)
          prev-line-end x)
       (beginning-of-line)
       ;; Note: setting result to t means we are done and will return nil.
       ;;(This function never returns just t.)
       (cond
          (align-point nil)
          prev-line-end x)
       (beginning-of-line)
       ;; Note: setting result to t means we are done and will return nil.
       ;;(This function never returns just t.)
       (cond

-       ((or (and (boundp 'font-lock-string-face)
-                (eq (get-text-property (point) 'face) font-lock-string-face))
+       ((or (and (boundp 'font-lock-string-face) (not (bobp))
+                (eq (get-text-property (1- (point)) 'face)
+                    font-lock-string-face))

            (eq (get-text-property (point) 'face) sh-heredoc-face))
        (setq result t)
        (setq have-result t))
            (eq (get-text-property (point) 'face) sh-heredoc-face))
        (setq result t)
        (setq have-result t))


@@ -2035,7 +2045,8 @@ STRING         This is ignored for the purposes of calculating
                    (progn
                      (setq result (append result val))
                      (setq align-point (point))))
                    (progn
                      (setq result (append result val))
                      (setq align-point (point))))

-               (forward-char -1)
+               (or (bobp)
+                   (forward-char -1))

                (skip-chars-forward "[a-z0-9]*?")
                )
               ((string-match "[])}]" x)
                (skip-chars-forward "[a-z0-9]*?")
                )
               ((string-match "[])}]" x)


@@ -2265,11 +2276,8 @@ we go to the end of the previous line and do not check for continuations."
   ;;
   (if (bolp)
       nil
   ;;
   (if (bolp)
       nil

-    (let ((going t)
-         c n
-         min-point
-         (start (point))
-         (found nil))
+    (let (c min-point
+         (start (point)))

       (save-restriction
        (narrow-to-region
        (if (sh-this-is-a-continuation)
       (save-restriction
        (narrow-to-region
        (if (sh-this-is-a-continuation)


@@ -2490,16 +2498,12 @@ If INFO is supplied it is used, else it is calculated from current line."
 (defun sh-indent-line ()
   "Indent the current line."
   (interactive)
 (defun sh-indent-line ()
   "Indent the current line."
   (interactive)

-  (let ((indent (sh-calculate-indent)) shift-amt beg end
+  (let ((indent (sh-calculate-indent))

        (pos (- (point-max) (point))))
     (when indent
       (beginning-of-line)
        (pos (- (point-max) (point))))
     (when indent
       (beginning-of-line)

-      (setq beg (point))

       (skip-chars-forward " \t")
       (skip-chars-forward " \t")

-      (setq shift-amt (- indent (current-column)))
-      (unless (zerop shift-amt)
-       (delete-region beg (point))
-       (indent-to indent))
+      (indent-line-to indent)

       ;; If initial point was within line's indentation,
       ;; position after the indentation.  Else stay at same point in text.
       (if (> (- (point-max) pos) (point))
       ;; If initial point was within line's indentation,
       ;; position after the indentation.  Else stay at same point in text.
       (if (> (- (point-max) pos) (point))


@@ -2562,7 +2566,7 @@ for a new value for it."
   (sh-must-support-indent)
   (let* ((info (sh-get-indent-info))
         (var (sh-get-indent-var-for-line info))
   (sh-must-support-indent)
   (let* ((info (sh-get-indent-info))
         (var (sh-get-indent-var-for-line info))

-        val val0 new-val old-val indent-val)
+        val old-val indent-val)

     (if (stringp var)
        (message (format "Cannot set indent - %s" var))
       (setq old-val (symbol-value var))
     (if (stringp var)
        (message (format "Cannot set indent - %s" var))
       (setq old-val (symbol-value var))


@@ -2655,13 +2659,11 @@ unless optional argument ARG (the prefix when interactive) is non-nil."
 
 (defun sh-mark-init (buffer)
   "Initialize a BUFFER to be used by `sh-mark-line'."
 
 (defun sh-mark-init (buffer)
   "Initialize a BUFFER to be used by `sh-mark-line'."

-  (let ((main-buffer (current-buffer)))
-    (save-excursion
-      (set-buffer (get-buffer-create buffer))
-      (erase-buffer)
-      (occur-mode)
-      (setq occur-buffer main-buffer)
-      )))
+  (save-excursion
+    (set-buffer (get-buffer-create buffer))
+    (erase-buffer)
+    (occur-mode)
+    ))

 
 
 (defun sh-mark-line (message point buffer &optional add-linenum occur-point)
 
 
 (defun sh-mark-line (message point buffer &optional add-linenum occur-point)


@@ -2671,7 +2673,6 @@ If ADD-LINENUM is non-nil the message is preceded by the line number.
 If OCCUR-POINT is non-nil then the line is marked as a new occurrence
 so that `occur-next' and `occur-prev' will work."
   (let ((m1 (make-marker))
 If OCCUR-POINT is non-nil then the line is marked as a new occurrence
 so that `occur-next' and `occur-prev' will work."
   (let ((m1 (make-marker))

-       (main-buffer (current-buffer))

        start
        (line ""))
     (when point
        start
        (line ""))
     (when point


@@ -2683,7 +2684,6 @@ so that `occur-next' and `occur-prev' will work."
          (set-buffer (get-buffer buffer))
        (set-buffer (get-buffer-create buffer))
        (occur-mode)
          (set-buffer (get-buffer buffer))
        (set-buffer (get-buffer-create buffer))
        (occur-mode)

-       (setq occur-buffer main-buffer)

        )
       (goto-char (point-max))
       (setq start (point))
        )
       (goto-char (point-max))
       (setq start (point))


@@ -2699,10 +2699,10 @@ so that `occur-next' and `occur-prev' will work."
       (insert "\n")
       (if point
          (progn
       (insert "\n")
       (if point
          (progn

-           (put-text-property start (point) 'occur m1)
+           (put-text-property start (point) 'occur-target m1)

            (if occur-point
            (if occur-point

-               (put-text-property occur-point (1+ occur-point)
-                                  'occur-point t))
+               (put-text-property start occur-point
+                                  'occur-match t))

            ))
       )))
 
            ))
       )))
 


@@ -2761,7 +2761,6 @@ This command can often take a long time to run."
     (let ((learned-var-list nil)
          (out-buffer "*indent*")
          (num-diffs 0)
     (let ((learned-var-list nil)
          (out-buffer "*indent*")
          (num-diffs 0)

-         last-pos

          previous-set-info
          (max 17)
          vec
          previous-set-info
          (max 17)
          vec


@@ -2922,14 +2921,7 @@ This command can often take a long time to run."
            (append (list (list 'sh-indent-comment comment-col (point-max)))
                    learned-var-list))
       (setq sh-indent-comment comment-col)
            (append (list (list 'sh-indent-comment comment-col (point-max)))
                    learned-var-list))
       (setq sh-indent-comment comment-col)

-      (let ((name (buffer-name))
-           (lines (if (and (eq (point-min) 1)
-                           (eq (point-max) (1+ (buffer-size))))
-                      ""
-                    (format "lines %d to %d of "
-                            (1+ (count-lines 1 (point-min)))
-                            (1+ (count-lines 1 (point-max))))))
-           )
+      (let ((name (buffer-name)))

        (sh-mark-line  "\nLearned variable settings:" nil out-buffer)
        (if arg
            ;; Set learned variables to symbolic rather than numeric
        (sh-mark-line  "\nLearned variable settings:" nil out-buffer)
        (if arg
            ;; Set learned variables to symbolic rather than numeric


@@ -2974,12 +2966,9 @@ Return values:
   nil            - we couldn't find a reasonable one."
   (let* ((max (1- (length vec)))
         (i 1)
   nil            - we couldn't find a reasonable one."
   (let* ((max (1- (length vec)))
         (i 1)

-        (totals (make-vector max 0))
-        (return nil)
-        j)
+        (totals (make-vector max 0)))

     (while (< i max)
       (aset totals i (+ (aref totals i) (* 4 (aref vec i))))
     (while (< i max)
       (aset totals i (+ (aref totals i) (* 4 (aref vec i))))

-      (setq j (/ i 2))

       (if (zerop (% i 2))
          (aset totals i (+ (aref totals i) (aref vec (/ i 2)))))
       (if (< (* i 2) max)
       (if (zerop (% i 2))
          (aset totals i (+ (aref totals i) (aref vec (/ i 2)))))
       (if (< (* i 2) max)


@@ -3088,6 +3077,11 @@ This is always added to the end of the buffer."
 ;; You are welcome to add the syntax or even completely new statements as
 ;; appropriate for your favorite shell.
 
 ;; You are welcome to add the syntax or even completely new statements as
 ;; appropriate for your favorite shell.
 

+(defconst sh-non-closing-paren
+  ;; If we leave it rear-sticky, calling `newline' ends up inserting a \n
+  ;; that inherits this property, which then confuses the indentation.
+  (propertize ")" 'syntax-table sh-st-punc 'rear-nonsticky t))
+

 (define-skeleton sh-case
   "Insert a case/switch statement.  See `sh-feature'."
   (csh "expression: "
 (define-skeleton sh-case
   "Insert a case/switch statement.  See `sh-feature'."
   (csh "expression: "


@@ -3117,32 +3111,27 @@ This is always added to the end of the buffer."
       ?\} > \n)
   (sh "expression: "
       > "case " str " in" \n
       ?\} > \n)
   (sh "expression: "
       > "case " str " in" \n

-      > (read-string "pattern: ")
-      (propertize ")" 'syntax-table sh-st-punc)
-      \n
-      > _ \n
-      ";;" \n
-      ( "other pattern, %s: "
-       > str (propertize ")" 'syntax-table sh-st-punc) \n
+      ( "pattern, %s: "
+       > str sh-non-closing-paren \n

        > _ \n
        ";;" \n)
        > _ \n
        ";;" \n)

-      > "*" (propertize ")" 'syntax-table sh-st-punc) \n
+      > "*" sh-non-closing-paren \n

       > _ \n
       resume:
       "esac" > \n))
 
 (define-skeleton sh-for
   "Insert a for loop.  See `sh-feature'."
       > _ \n
       resume:
       "esac" > \n))
 
 (define-skeleton sh-for
   "Insert a for loop.  See `sh-feature'."

-  (csh eval sh-modify sh
+  (csh sh-modify sh

        1 ""
        2 "foreach "
        4 " ( "
        6 " )"
        15 '<
        16 "end")
        1 ""
        2 "foreach "
        4 " ( "
        6 " )"
        15 '<
        16 "end")

-  (es eval sh-modify rc
+  (es sh-modify rc

       4 " = ")
       4 " = ")

-  (rc eval sh-modify sh
+  (rc sh-modify sh

       2 "for( "
       6 " ) {"
       15 ?\} )
       2 "for( "
       6 " ) {"
       15 ?\} )


@@ -3155,14 +3144,14 @@ This is always added to the end of the buffer."
 
 (define-skeleton sh-indexed-loop
   "Insert an indexed loop from 1 to n.  See `sh-feature'."
 
 (define-skeleton sh-indexed-loop
   "Insert an indexed loop from 1 to n.  See `sh-feature'."

-  (bash eval identity posix)
+  (bash sh-modify posix)

   (csh "Index variable: "
        "@ " str " = 1" \n
        "while( $" str " <= " (read-string "upper limit: ") " )" \n
        > _ ?$ str \n
        "@ " str "++" \n
        < "end" \n)
   (csh "Index variable: "
        "@ " str " = 1" \n
        "while( $" str " <= " (read-string "upper limit: ") " )" \n
        > _ ?$ str \n
        "@ " str "++" \n
        < "end" \n)

-  (es eval sh-modify rc
+  (es sh-modify rc

       4 " =")
   (ksh88 "Index variable: "
         > "integer " str "=0" \n
       4 " =")
   (ksh88 "Index variable: "
         > "integer " str "=0" \n


@@ -3229,12 +3218,10 @@ t means to return a list of all possible completions of STRING.
                              (cons name name)))
                          process-environment)
                  sh-shell-variables))))
                              (cons name name)))
                          process-environment)
                  sh-shell-variables))))

-    (cond ((null code)
-          (try-completion string sh-shell-variables predicate))
-         ((eq code t)
-          (all-completions string sh-shell-variables predicate))
-         ((eq code 'lambda)
-          (assoc string 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)))))

 
 (defun sh-add (var delta)
   "Insert an addition of VAR and prefix DELTA for Bourne (type) shell."
 
 (defun sh-add (var delta)
   "Insert an addition of VAR and prefix DELTA for Bourne (type) shell."


@@ -3262,13 +3249,13 @@ t means to return a list of all possible completions of STRING.
 
 (define-skeleton sh-function
   "Insert a function definition.  See `sh-feature'."
 
 (define-skeleton sh-function
   "Insert a function definition.  See `sh-feature'."

-  (bash eval sh-modify ksh88
+  (bash sh-modify ksh88

        3 "() {")
   (ksh88 "name: "
         "function " str " {" \n
         > _ \n
         < "}" \n)
        3 "() {")
   (ksh88 "name: "
         "function " str " {" \n
         > _ \n
         < "}" \n)

-  (rc eval sh-modify ksh88
+  (rc sh-modify ksh88

       1 "fn ")
   (sh ()
       "() {" \n
       1 "fn ")
   (sh ()
       "() {" \n


@@ -3344,14 +3331,14 @@ t means to return a list of all possible completions of STRING.
         > "select " str " in " _ "; do" \n
         > ?$ str \n
         "done" > \n)
         > "select " str " in " _ "; do" \n
         > ?$ str \n
         "done" > \n)

-  (bash eval sh-append ksh88))
+  (bash sh-append ksh88))

 ;;;(put 'sh-select 'menu-enable '(sh-feature sh-select))
 
 
 
 (define-skeleton sh-tmp-file
   "Insert code to setup temporary file handling.  See `sh-feature'."
 ;;;(put 'sh-select 'menu-enable '(sh-feature sh-select))
 
 
 
 (define-skeleton sh-tmp-file
   "Insert code to setup temporary file handling.  See `sh-feature'."

-  (bash eval identity ksh88)
+  (bash sh-append ksh88)

   (csh (file-name-nondirectory (buffer-file-name))
        "set tmp = /tmp/" str ".$$" \n
        "onintr exit" \n _
   (csh (file-name-nondirectory (buffer-file-name))
        "set tmp = /tmp/" str ".$$" \n
        "onintr exit" \n _


@@ -3370,7 +3357,7 @@ t means to return a list of all possible completions of STRING.
       _ \n
       ?\} > \n
       ?\} > \n)
       _ \n
       ?\} > \n
       ?\} > \n)

-  (ksh88 eval sh-modify sh
+  (ksh88 sh-modify sh

         7 "EXIT")
   (rc (file-name-nondirectory (buffer-file-name))
       > "tmp = /tmp/" str ".$pid" \n
         7 "EXIT")
   (rc (file-name-nondirectory (buffer-file-name))
       > "tmp = /tmp/" str ".$pid" \n


@@ -3394,17 +3381,17 @@ t means to return a list of all possible completions of STRING.
 
 (define-skeleton sh-while
   "Insert a while loop.  See `sh-feature'."
 
 (define-skeleton sh-while
   "Insert a while loop.  See `sh-feature'."

-  (csh eval sh-modify sh
+  (csh sh-modify sh

        2 ""
        3 "while( "
        5 " )"
        10 '<
        11 "end")
        2 ""
        3 "while( "
        5 " )"
        10 '<
        11 "end")

-  (es eval sh-modify sh
+  (es sh-modify sh

       3 "while { "
       5 " } {"
       10 ?\} )
       3 "while { "
       5 " } {"
       10 ?\} )

-  (rc eval sh-modify sh
+  (rc sh-modify sh

       3 "while( "
       5 " ) {"
       10 ?\} )
       3 "while( "
       5 " ) {"
       10 ?\} )


@@ -3420,7 +3407,7 @@ t means to return a list of all possible completions of STRING.
   "Insert a while getopts loop.  See `sh-feature'.
 Prompts for an options string which consists of letters for each recognized
 option followed by a colon `:' if the option accepts an argument."
   "Insert a while getopts loop.  See `sh-feature'.
 Prompts for an options string which consists of letters for each recognized
 option followed by a colon `:' if the option accepts an argument."

-  (bash eval sh-modify sh
+  (bash sh-modify sh

        18 "${0##*/}")
   (csh nil
        "while( 1 )" \n
        18 "${0##*/}")
   (csh nil
        "while( 1 )" \n


@@ -3445,11 +3432,11 @@ option followed by a colon `:' if the option accepts an argument."
        < < "endsw" \n
        "shift" \n
        < "end" \n)
        < < "endsw" \n
        "shift" \n
        < "end" \n)

-  (ksh88 eval sh-modify sh
+  (ksh88 sh-modify sh

         16 "print"
         18 "${0##*/}"
         16 "print"
         18 "${0##*/}"

-        36 "OPTIND-1")
-  (posix eval sh-modify sh
+        37 "OPTIND-1")
+  (posix sh-modify sh

         18 "$(basename $0)")
   (sh "optstring: "
       > "while getopts :" str " OPT; do" \n
         18 "$(basename $0)")
   (sh "optstring: "
       > "while getopts :" str " OPT; do" \n


@@ -3461,10 +3448,10 @@ option followed by a colon `:' if the option accepts an argument."
                    v2 "\"$OPTARG\"")
            (setq v1 (cdr v1)
                  v2 nil)))
                    v2 "\"$OPTARG\"")
            (setq v1 (cdr v1)
                  v2 nil)))

-       > str "|+" str (propertize ")" 'syntax-table sh-st-punc) \n
+       > str "|+" str sh-non-closing-paren \n

        > _ v2 \n
        > ";;" \n)
        > _ v2 \n
        > ";;" \n)

-      > "*" (propertize ")" 'syntax-table sh-st-punc) \n
+      > "*" sh-non-closing-paren \n

       > "echo" " \"usage: " "`basename $0`"
       " [+-" '(setq v1 (point)) str
       '(save-excursion
       > "echo" " \"usage: " "`basename $0`"
       " [+-" '(setq v1 (point)) str
       '(save-excursion


@@ -3514,7 +3501,10 @@ The document is bounded by `sh-here-document-word'."
            (sh-quoted-p)
          (end-of-line 2))
        (newline)
            (sh-quoted-p)
          (end-of-line 2))
        (newline)

-       (save-excursion (insert ?\n sh-here-document-word)))))
+       (save-excursion
+          (insert ?\n (substring
+                       sh-here-document-word
+                       (if (string-match "^-" sh-here-document-word) 1 0)))))))

 
 \f
 ;; various other commands
 
 \f
 ;; various other commands


@@ -3559,4 +3549,5 @@ The document is bounded by `sh-here-document-word'."
 
 (provide 'sh-script)
 
 
 (provide 'sh-script)
 

+;;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937

 ;;; sh-script.el ends here
 ;;; sh-script.el ends here