* lisp/progmodes/sh-script.el: Don't set global indent-line-function

Fixes: debbugs:19433
(sh-set-shell): Don't change the global value of indent-line-function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 630765768716d1a2947a1865d61c97788ca185af..7f1346d8b5a29f7984593fb724f1c37f97ddf6e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/sh-script.el (sh-set-shell): Don't change the global value
+       of indent-line-function (bug#19433).
+
 2014-12-23  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
        Fix line numbers on Python shell.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 1165144d05c8c2739f1975aaa691c7c969e85faa..476c7961be7f0547caaf326ac186e7e002dffd66 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2350,7 +2350,7 @@ Calls the value of `sh-set-shell-hook' if set."
            (sh-make-vars-local))
        (message "Indentation setup for shell type %s" sh-shell))
     (message "No indentation for this shell type.")
-    (setq indent-line-function 'sh-basic-indent-line))
+    (setq-local indent-line-function 'sh-basic-indent-line))
   (when font-lock-mode
     (setq font-lock-set-defaults nil)
     (font-lock-set-defaults)