[Emacs-diffs] emacs/lisp ChangeLog image-mode.el emacs-lisp/a...

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/10/02 00:02:06

Modified files:
        lisp           : ChangeLog image-mode.el 
        lisp/emacs-lisp: advice.el easy-mmode.el elp.el 
        lisp/net       : browse-url.el 
        lisp/progmodes : sh-script.el 

Log message:
        * image-mode.el (image-toggle-display):
        * emacs-lisp/elp.el (elp-instrument-function):
        * emacs-lisp/advice.el (ad-make-advised-definition):
        * emacs-lisp/easy-mmode.el (define-minor-mode):
        * net/browse-url.el (browse-url-maybe-new-window):
        * progmodes/sh-script.el (sh-learn-buffer-indent):
          Pass new argument 'any to `called-interactively-p'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16320&r2=1.16321
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/image-mode.el?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/advice.el?cvsroot=emacs&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/easy-mmode.el?cvsroot=emacs&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/elp.el?cvsroot=emacs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/browse-url.el?cvsroot=emacs&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/sh-script.el?cvsroot=emacs&r1=1.226&r2=1.227

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16320
retrieving revision 1.16321
diff -u -b -r1.16320 -r1.16321
--- ChangeLog   1 Oct 2009 23:42:39 -0000       1.16320
+++ ChangeLog   2 Oct 2009 00:02:02 -0000       1.16321
@@ -1,3 +1,13 @@
+2009-10-02  Juanma Barranquero  <address@hidden>
+
+       * image-mode.el (image-toggle-display):
+       * emacs-lisp/elp.el (elp-instrument-function):
+       * emacs-lisp/advice.el (ad-make-advised-definition):
+       * emacs-lisp/easy-mmode.el (define-minor-mode):
+       * net/browse-url.el (browse-url-maybe-new-window):
+       * progmodes/sh-script.el (sh-learn-buffer-indent):
+       Pass new argument 'any to `called-interactively-p'.
+
 2009-10-01  Juanma Barranquero  <address@hidden>
 
        * international/uni-bidi.el:

Index: image-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- image-mode.el       12 Feb 2009 21:48:55 -0000      1.56
+++ image-mode.el       2 Oct 2009 00:02:05 -0000       1.57
@@ -429,7 +429,7 @@
        (setq image-type "text")
        (if (eq major-mode 'image-mode)
            (setq mode-name "Image[text]"))
-       (if (called-interactively-p)
+       (if (called-interactively-p 'any)
            (message "Repeat this command to go back to displaying the image")))
     ;; Turn the image data into a real image, but only if the whole file
     ;; was inserted
@@ -472,7 +472,7 @@
       (setq image-type type)
       (if (eq major-mode 'image-mode)
          (setq mode-name (format "Image[%s]" type)))
-      (if (called-interactively-p)
+      (if (called-interactively-p 'any)
          (message "Repeat this command to go back to displaying the file as 
text")))))
 
 ;;; Support for bookmark.el

Index: emacs-lisp/advice.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/advice.el,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- emacs-lisp/advice.el        19 Sep 2009 20:06:57 -0000      1.66
+++ emacs-lisp/advice.el        2 Oct 2009 00:02:05 -0000       1.67
@@ -3087,7 +3087,7 @@
                          (not advised-interactive-form))
                     ;; Check whether we were called interactively
                     ;; in order to do proper prompting:
-                    `(if (called-interactively-p)
+                    `(if (called-interactively-p 'any)
                          (call-interactively ',origname)
                        ,(ad-make-mapped-call advised-arglist
                                              orig-arglist

Index: emacs-lisp/easy-mmode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/easy-mmode.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- emacs-lisp/easy-mmode.el    10 Sep 2009 06:20:51 -0000      1.96
+++ emacs-lisp/easy-mmode.el    2 Oct 2009 00:02:05 -0000       1.97
@@ -234,7 +234,7 @@
            ,@body
            ;; The on/off hooks are here for backward compatibility only.
            (run-hooks ',hook (if ,mode ',hook-on ',hook-off))
-           (if (called-interactively-p)
+           (if (called-interactively-p 'any)
                (progn
                  ,(if globalp `(customize-mark-as-set ',mode))
                  ;; Avoid overwriting a message shown by the body,

Index: emacs-lisp/elp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/elp.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- emacs-lisp/elp.el   12 Sep 2009 01:40:16 -0000      1.51
+++ emacs-lisp/elp.el   2 Oct 2009 00:02:05 -0000       1.52
@@ -269,7 +269,7 @@
     (setq newguts (append newguts `((elp-wrapper
                                     (quote ,funsym)
                                     ,(when (commandp funsym)
-                                       '(called-interactively-p))
+                                       '(called-interactively-p 'any))
                                     args))))
     ;; to record profiling times, we set the symbol's function
     ;; definition so that it runs the elp-wrapper function with the

Index: net/browse-url.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- net/browse-url.el   1 Sep 2009 03:17:03 -0000       1.80
+++ net/browse-url.el   2 Oct 2009 00:02:06 -0000       1.81
@@ -669,7 +669,7 @@
 ;; this macro.  We use that rather than interactive-p because
 ;; use in a keyboard macro should not change this behavior.
 (defmacro browse-url-maybe-new-window (arg)
-  `(if (or noninteractive (not (called-interactively-p)))
+  `(if (or noninteractive (not (called-interactively-p 'any)))
        ,arg
      browse-url-new-window-flag))
 

Index: progmodes/sh-script.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- progmodes/sh-script.el      19 Sep 2009 19:35:18 -0000      1.226
+++ progmodes/sh-script.el      2 Oct 2009 00:02:06 -0000       1.227
@@ -3210,7 +3210,7 @@
           )))
       ;; Are abnormal hooks considered bad form?
       (run-hook-with-args 'sh-learned-buffer-hook learned-var-list)
-      (and (called-interactively-p)
+      (and (called-interactively-p 'any)
           (or sh-popup-occur-buffer (> num-diffs 0))
           (pop-to-buffer out-buffer)))))