[Emacs-diffs] emacs/lisp ChangeLog progmodes/sh-script.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/19 19:35:18

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : sh-script.el 

Log message:
        * progmodes/sh-script.el (sh-learn-buffer-indent): Pop to the
        indent buffer only if called interactively (Bug#4452).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16210&r2=1.16211
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/sh-script.el?cvsroot=emacs&r1=1.225&r2=1.226

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16210
retrieving revision 1.16211
diff -u -b -r1.16210 -r1.16211
--- ChangeLog   19 Sep 2009 14:56:04 -0000      1.16210
+++ ChangeLog   19 Sep 2009 19:35:15 -0000      1.16211
@@ -1,3 +1,8 @@
+2009-09-19  Chong Yidong  <address@hidden>
+
+       * progmodes/sh-script.el (sh-learn-buffer-indent): Pop to the
+       indent buffer only if called interactively (Bug#4452).
+
 2009-09-19  Juanma Barranquero  <address@hidden>
            Eli Zaretskii  <address@hidden>
 

Index: progmodes/sh-script.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- progmodes/sh-script.el      1 Sep 2009 07:24:21 -0000       1.225
+++ progmodes/sh-script.el      19 Sep 2009 19:35:18 -0000      1.226
@@ -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'.