procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes: debbugs:19433

(sh-set-shell): Don't change the global value of indent-line-function.
This commit is contained in:
Stefan Monnier 2014-12-22 23:22:20 -05:00
parent 75e114fa3b
commit 012479a7a6
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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> 2014-12-23 Fabián Ezequiel Gallina <fgallina@gnu.org>
Fix line numbers on Python shell. Fix line numbers on Python shell.

2
lisp/progmodes/sh-script.el
View file

@ -2350,7 +2350,7 @@ Calls the value of `sh-set-shell-hook' if set."
(sh-make-vars-local)) (sh-make-vars-local))
(message "Indentation setup for shell type %s" sh-shell)) (message "Indentation setup for shell type %s" sh-shell))
(message "No indentation for this shell type.") (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 (when font-lock-mode
(setq font-lock-set-defaults nil) (setq font-lock-set-defaults nil)
(font-lock-set-defaults) (font-lock-set-defaults)