(sh-mode): Set `comment-start-skip' always.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 99869db0bdd9208b32fcd34135daa1317d62e938..c0cfdfa86581d085407848d7bb28eff205695560 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -731,9 +731,12 @@ with your script for an edit-interpret-debug cycle."
               (match-string 2)))))
     (if interpreter
        (sh-set-shell interpreter nil nil)
-      ;; If we don't know the shell for this file,
-      ;; set the syntax table anyway, for the user's normal choice of shell.
-      (set-syntax-table (sh-feature sh-mode-syntax-table))))
+      (progn
+        ;; If we don't know the shell for this file, set the syntax
+        ;; table anyway, for the user's normal choice of shell.
+        (set-syntax-table (sh-feature sh-mode-syntax-table))
+        ;; And avoid indent-new-comment-line (at least) losing.
+        (setq comment-start-skip "#+[\t ]*"))))
   (run-hooks 'sh-mode-hook))
 ;;;###autoload
 (defalias 'shell-script-mode 'sh-mode)