(sh-mode): Set shell type based on file name if no other specific basis.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32f4d243fcef1cb9d21bc3ea9e8b8ee509b5f2ee..f5d87562709bbbed94d1bc5a8f2ebaaa7eafe114 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2006-02-21  Richard M. Stallman  <rms@gnu.org>
+
+       * progmodes/sh-script.el (sh-mode): Set shell type based on file name
+       if there's no other specific basis.
+
+       * emacs-lisp/unsafep.el (unsafep): Don't treat &rest or &optional
+       as variables at all.
+       (unsafep-variable): Rename arg; doc fix.
+
+       * abbrevlist.el (list-one-abbrev-table): Add autoload.
+
+       * calendar/appt.el (diary-selective-display): Add defvar.
+
+       * sort.el (sort-columns): Use Posix arg syntax for `sort'.
+
+       * isearch.el (search-whitespace-regexp): Fix custom type.
+
+       * help.el (describe-key-briefly): Compute interactive args
+       in same was as before previous change.
+
+       * files.el (enable-local-variables): Doc fix.
+
 2006-02-21  Kim F. Storm  <storm@cua.dk>
 
        * fringe.el: Cleanup as file is now pre-loaded.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e331268391a354145b037f725b2f8563c2347712..02ce4a21c97abf162b6d03b83568accec6e02d6a 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1438,6 +1438,16 @@ with your script for an edit-interpret-debug cycle."
                 ((and buffer-file-name
                       (string-match "\\.m?spec\\'" buffer-file-name))
                  "rpm")))))
+    (unless interpreter
+      (setq interpreter
+           (cond ((string-match "[.]sh\\>" buffer-file-name)
+                  "sh")
+                 ((string-match "[.]bash\\>" buffer-file-name)
+                  "bash")
+                 ((string-match "[.]ksh\\>" buffer-file-name)
+                  "ksh")
+                 ((string-match "[.]csh\\>" buffer-file-name)
+                  "csh"))))
     (sh-set-shell (or interpreter sh-shell-file) nil nil))
   (run-mode-hooks 'sh-mode-hook))