Mercurial > emacs
changeset 105109:178c9761642e
* progmodes/sh-script.el (sh-learn-buffer-indent): Pop to the
indent buffer only if called interactively (Bug#4452).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 19 Sep 2009 19:35:15 +0000 |
| parents | 84836b2f2c93 |
| children | ae2f5001d865 |
| files | lisp/ChangeLog lisp/progmodes/sh-script.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 19 14:56:04 2009 +0000 +++ b/lisp/ChangeLog Sat Sep 19 19:35:15 2009 +0000 @@ -1,3 +1,8 @@ +2009-09-19 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/sh-script.el (sh-learn-buffer-indent): Pop to the + indent buffer only if called interactively (Bug#4452). + 2009-09-19 Juanma Barranquero <lekktu@gmail.com> Eli Zaretskii <eliz@gnu.org>
--- a/lisp/progmodes/sh-script.el Sat Sep 19 14:56:04 2009 +0000 +++ b/lisp/progmodes/sh-script.el Sat Sep 19 19:35:15 2009 +0000 @@ -2997,7 +2997,8 @@ Output in buffer \"*indent*\" shows any lines which have conflicting values of a variable, and the final value of all variables learned. -This buffer is popped to automatically if there are any discrepancies. +When called interactively, pop to this buffer automatically if +there are any discrepancies. If no prefix ARG is given, then variables are set to numbers. If a prefix arg is given, then variables are set to symbols when @@ -3209,9 +3210,9 @@ ))) ;; Are abnormal hooks considered bad form? (run-hook-with-args 'sh-learned-buffer-hook learned-var-list) - (if (or sh-popup-occur-buffer (> num-diffs 0)) - (pop-to-buffer out-buffer)) - ))) + (and (called-interactively-p) + (or sh-popup-occur-buffer (> num-diffs 0)) + (pop-to-buffer out-buffer))))) (defun sh-guess-basic-offset (vec) "See if we can determine a reasonable value for `sh-basic-offset'.