Add sh-script changes.

diff --git a/etc/NEWS b/etc/NEWS
index 843d2cc476cbb881fb6490034fa9fc66a7b8bbb0..e02e10b285c2ac3ea2206bf6c2e997b754538cc9 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -419,6 +419,12 @@ selection into the search string rather than giving an error.
 names cleanly.  It is appended to the host name, separated by a hash
 sign, e.g. `/foo@bar.org#666:mumble'.  (This syntax comes from EFS.)
 
+** Shell script mode changes.
+
+Shell script mode (sh-script) can now indent scripts for shells
+derived from sh and rc.  The indentation style is customizeable, and
+sh-script can attempt to "learn" the current buffer's style.
+
 ** New modes and packages
 
 *** 5x5.el is a simple puzzle game.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdb1f3c6bf38bc84ffb4054303e07d44065ac318..035f3783ec76614f789c8803b7d286c31e1dc146 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+1999-10-12  Richard Sharman  <rsharman@pobox.com>
+
+       * sh-script.el: Added support for indenting existing scripts.
+       (sh-mode-map): Added new bindings.
+       (sh-mode): Updated mode doc-string for new commands, added
+       make-local-variable calls, initialize mode-specific variables.
+       (sh-indent-line):  Renamed to sh-basic-indent-line;  sh-indent-line
+       is now a different function.
+       (sh-header-marker):  Changed docstring.
+       (sh-set-shell): Initialize mode-specific variables.
+       (sh-case, sh-for, sh-if, sh-indexed-loop, sh-repeat, sh-select)
+       (sh-tmp-file, sh-until, sh-until, sh-while, sh-while-getopts):
+       Changed these define-skeleton calls to work with user-specified
+       indentation settings.
+       (sh-basic-indent-line, sh-blink, sh-calculate-indent)
+       (sh-check-paren-in-case, sh-check-rule, sh-do-nothing)
+       (sh-electric-hash, sh-electric-less, sh-electric-rparen)
+       (sh-find-prev-matching, sh-find-prev-switch, sh-get-indent-info)
+       (sh-get-indent-var-for-line, sh-get-kw, sh-get-word)
+       (sh-goto-match-for-done, sh-goto-matching-case, sh-goto-matching-if)
+       (sh-guess-basic-offset, sh-handle-after-case-label)
+       (sh-handle-prev-case, sh-handle-prev-case-alt-end, sh-handle-prev-do)
+       (sh-handle-prev-done, sh-handle-prev-else, sh-handle-prev-esac)
+       (sh-handle-prev-fi, sh-handle-prev-if, sh-handle-prev-open)
+       (sh-handle-prev-rc-case, sh-handle-prev-then, sh-handle-this-close)
+       (sh-handle-this-do, sh-handle-this-done, sh-handle-this-else)
+       (sh-handle-this-esac, sh-handle-this-fi, sh-handle-this-rc-case)
+       (sh-handle-this-then, sh-help-string-for-variable)
+       (sh-in-comment-or-string, sh-indent-line, sh-learn-buffer-indent)
+       (sh-learn-line-indent, sh-load-style, sh-make-vars-local, sh-mark-init)
+       (sh-mark-line, sh-mkword-regexpr, sh-mkword-regexp)
+       (sh-must-be-shell-mode, sh-must-support-indent, sh-name-style)
+       (sh-prev-line, sh-prev-stmt, sh-prev-thing, sh-read-variable)
+       (sh-remove-our-text-properties, sh-rescan-buffer)
+       (sh-reset-indent-vars-to-global-values, sh-safe-backward-sexp)
+       (sh-safe-forward-sexp, sh-save-styles-to-buffer, sh-scan-buffer)
+       (sh-scan-case, sh-search-word, sh-set-char-syntax)
+       (sh-set-here-doc-region, sh-set-indent, sh-set-var-value)
+       (sh-show-indent, sh-this-is-a-continuation, sh-var-value): New 
+       functions.
+       (sh-debug, sh-electric-rparen-needed, sh-here-doc-syntax)
+       (sh-indent-supported, sh-kw, sh-kw-alist, sh-kws-for-done)
+       (sh-learned-buffer-hook, sh-make-vars-local, sh-regexp-for-done)
+       (sh-special-keywords, sh-special-syntax, sh-st-punc, sh-styles-alist)
+       (sh-var-list): New variables.
+       
 1999-10-12  Dave Pearson  <davep@hagbard.demon.co.uk>
 
         * quickurl.el (quickurl-list-insert): `count-lines' was returning