[Emacs-diffs] emacs-24 012479a: * lisp/progmodes/sh-script.el: Don't set global indent-line-function

[Stefan Monnier]

branch: emacs-24
commit 012479a7a6a9a2e49ba0218285b2b65b3c70b293
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * 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.
---
 lisp/ChangeLog              |    5 +++++
 lisp/progmodes/sh-script.el |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6307657..7f1346d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix line numbers on Python shell.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 1165144..476c796 100644
--- 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)