From 012479a7a6a9a2e49ba0218285b2b65b3c70b293 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 22 Dec 2014 23:22:20 -0500 Subject: [PATCH] * 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 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6307657687..7f1346d8b5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-23 Stefan Monnier + + * 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 Fix line numbers on Python shell. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 1165144d05..476c7961be 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) -- 2.39.2