[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el bookm...
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el bookm... |
|
Date: |
Fri, 02 Oct 2009 03:48:49 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 09/10/02 03:48:47
Modified files:
lisp : ChangeLog allout.el apropos.el bookmark.el
comint.el completion.el descr-text.el
desktop.el dired-x.el dired.el ediff.el
elide-head.el emerge.el env.el face-remap.el
faces.el ffap.el files.el font-lock.el
help-fns.el help.el hexl.el hi-lock.el info.el
log-edit.el menu-bar.el mouse.el newcomment.el
pgg.el recentf.el savehist.el shadowfile.el
simple.el strokes.el time.el tutorial.el
type-break.el vc.el version.el vt-control.el
winner.el
lisp/calendar : timeclock.el todo-mode.el
lisp/emacs-lisp: advice.el autoload.el checkdoc.el debug.el
easy-mmode.el eieio-opt.el lisp-mnt.el
shadow.el
lisp/emulation : cua-base.el edt.el tpu-edt.el tpu-extras.el
viper-cmd.el viper.el
lisp/eshell : esh-mode.el
lisp/international: mule-cmds.el mule-diag.el
lisp/mail : sendmail.el
lisp/net : ange-ftp.el browse-url.el eudc.el quickurl.el
rcirc.el xesam.el
lisp/play : 5x5.el yow.el
lisp/progmodes : ada-mode.el f90.el fortran.el js.el python.el
lisp/term : ns-win.el
lisp/textmodes : bibtex.el flyspell.el page-ext.el table.el
tex-mode.el texinfmt.el
Log message:
Use `called-interactively-p' instead of `interactive-p'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16321&r2=1.16322
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/allout.el?cvsroot=emacs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/apropos.el?cvsroot=emacs&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/bookmark.el?cvsroot=emacs&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/comint.el?cvsroot=emacs&r1=1.393&r2=1.394
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/completion.el?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/descr-text.el?cvsroot=emacs&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/desktop.el?cvsroot=emacs&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired-x.el?cvsroot=emacs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.432&r2=1.433
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff.el?cvsroot=emacs&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/elide-head.el?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emerge.el?cvsroot=emacs&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/env.el?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/face-remap.el?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.447&r2=1.448
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ffap.el?cvsroot=emacs&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1089&r2=1.1090
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/font-lock.el?cvsroot=emacs&r1=1.353&r2=1.354
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-fns.el?cvsroot=emacs&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help.el?cvsroot=emacs&r1=1.349&r2=1.350
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/hexl.el?cvsroot=emacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/hi-lock.el?cvsroot=emacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.565&r2=1.566
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/log-edit.el?cvsroot=emacs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.359&r2=1.360
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mouse.el?cvsroot=emacs&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/newcomment.el?cvsroot=emacs&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pgg.el?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/recentf.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/savehist.el?cvsroot=emacs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/shadowfile.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.1013&r2=1.1014
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/strokes.el?cvsroot=emacs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/time.el?cvsroot=emacs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/tutorial.el?cvsroot=emacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/type-break.el?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.730&r2=1.731
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/version.el?cvsroot=emacs&r1=2.77&r2=2.78
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vt-control.el?cvsroot=emacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/winner.el?cvsroot=emacs&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/timeclock.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/todo-mode.el?cvsroot=emacs&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/advice.el?cvsroot=emacs&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/autoload.el?cvsroot=emacs&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/checkdoc.el?cvsroot=emacs&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/debug.el?cvsroot=emacs&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/easy-mmode.el?cvsroot=emacs&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/eieio-opt.el?cvsroot=emacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp-mnt.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/shadow.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/cua-base.el?cvsroot=emacs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/edt.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/tpu-edt.el?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/tpu-extras.el?cvsroot=emacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-cmd.el?cvsroot=emacs&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper.el?cvsroot=emacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/esh-mode.el?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.370&r2=1.371
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-diag.el?cvsroot=emacs&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/sendmail.el?cvsroot=emacs&r1=1.331&r2=1.332
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/ange-ftp.el?cvsroot=emacs&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/browse-url.el?cvsroot=emacs&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/eudc.el?cvsroot=emacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/quickurl.el?cvsroot=emacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/rcirc.el?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/xesam.el?cvsroot=emacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/5x5.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/yow.el?cvsroot=emacs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/ada-mode.el?cvsroot=emacs&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/f90.el?cvsroot=emacs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/fortran.el?cvsroot=emacs&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/js.el?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/python.el?cvsroot=emacs&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/bibtex.el?cvsroot=emacs&r1=1.149&r2=1.150
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/flyspell.el?cvsroot=emacs&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/page-ext.el?cvsroot=emacs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/table.el?cvsroot=emacs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/tex-mode.el?cvsroot=emacs&r1=1.225&r2=1.226
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/texinfmt.el?cvsroot=emacs&r1=1.97&r2=1.98
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16321
retrieving revision 1.16322
diff -u -b -r1.16321 -r1.16322
--- ChangeLog 2 Oct 2009 00:02:02 -0000 1.16321
+++ ChangeLog 2 Oct 2009 03:48:36 -0000 1.16322
@@ -1,5 +1,127 @@
2009-10-02 Juanma Barranquero <address@hidden>
+ * allout.el (allout-init, allout-back-to-current-heading)
+ (allout-beginning-of-current-entry, allout-ascend-to-depth)
+ (allout-ascend, allout-up-current-level, allout-end-of-level)
+ (allout-previous-visible-heading, allout-forward-current-level)
+ (allout-backward-current-level, allout-show-children):
+ * apropos.el (apropos-describe-plist):
+ * bookmark.el (bookmark-maybe-historicize-string, bookmark-bmenu-list):
+ * comint.el (comint-strip-ctrl-m, comint-goto-process-mark):
+ * completion.el (add-completion, add-permanent-completion):
+ * descr-text.el (describe-text-category, describe-char):
+ * desktop.el (desktop-lazy-abort):
+ * dired-x.el (dired-omit-expunge, dired-x-bind-find-file):
+ * dired.el (dired-build-subdir-alist):
+ * ediff.el (ediff-version):
+ * elide-head.el (elide-head, elide-head-show):
+ * emerge.el (emerge-version):
+ * env.el (getenv):
+ * face-remap.el (variable-pitch-mode):
+ * faces.el (describe-face):
+ * ffap.el (ffap-next-url, find-file-at-point, ffap-at-mouse)
+ (dired-at-point):
+ * files.el (find-file-existing, auto-save-mode):
+ * font-lock.el (font-lock-fontify-buffer):
+ * help-fns.el (describe-function, describe-variable)
+ (describe-syntax, describe-categories):
+ * help.el (view-lossage, describe-bindings, describe-key)
+ (describe-mode):
+ * hexl.el (hexl-current-address):
+ * hi-lock.el (hi-lock-mode, hi-lock-find-patterns):
+ * info.el (Info-goto-emacs-key-command-node):
+ * log-edit.el (log-edit-insert-cvs-template)
+ (log-edit-insert-cvs-rcstemplate):
+ * menu-bar.el (menu-bar-mode):
+ * mouse.el (mouse-appearance-menu):
+ * newcomment.el (comment-indent-new-line):
+ * pgg.el (pgg-save-coding-system, pgg-encrypt-region)
+ (pgg-encrypt-symmetric-region, pgg-encrypt-symmetric)
+ (pgg-encrypt, pgg-decrypt-region, pgg-decrypt, )
+ (pgg-sign-region, pgg-sign, pgg-verify-region, pgg-verify):
+ * recentf.el (recentf-mode):
+ * savehist.el (savehist-mode, savehist-save):
+ * shadowfile.el (shadow-copy-files):
+ * simple.el (kill-ring-save, next-line, previous-line)
+ (normal-erase-is-backspace-mode):
+ * strokes.el (strokes-update-window-configuration)
+ (strokes-load-user-strokes, strokes-prompt-user-save-strokes)
+ (strokes-xpm-for-stroke):
+ * time.el (emacs-uptime, emacs-init-time):
+ * tutorial.el (tutorial--describe-nonstandard-key)
+ (tutorial--detailed-help):
+ * type-break.el (type-break-mode)
+ (type-break-mode-line-message-mode, type-break-query-mode)
+ (type-break-guesstimate-keystroke-threshold):
+ * vc.el (vc-version-diff, vc-diff, vc-root-diff):
+ * version.el (emacs-version):
+ * vt-control.el (vt-keypad-on, vt-keypad-off, vt-numlock):
+ * winner.el (winner-mode):
+ * calendar/timeclock.el (timeclock-in, timeclock-out)
+ (timeclock-status-string, timeclock-change)
+ (timeclock-workday-remaining-string)
+ (timeclock-workday-elapsed-string)
+ (timeclock-when-to-leave-string):
+ * calendar/todo-mode.el (todo-add-category):
+ * emacs-lisp/advice.el (ad-enable-regexp, ad-disable-regexp):
+ * emacs-lisp/autoload.el (update-file-autoloads):
+ * emacs-lisp/checkdoc.el (checkdoc-current-buffer)
+ (checkdoc-start, checkdoc-continue, checkdoc-rogue-spaces)
+ (checkdoc-message-text, checkdoc-defun):
+ * emacs-lisp/debug.el (debugger-list-functions):
+ * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
+ * emacs-lisp/eieio-opt.el (eieio-describe-class)
+ (eieio-describe-generic):
+ * emacs-lisp/lisp-mnt.el (lm-synopsis):
+ * emacs-lisp/shadow.el (list-load-path-shadows):
+ * emulation/cua-base.el (cua-mode):
+ * emulation/edt.el (edt-set-scroll-margins):
+ * emulation/tpu-edt.el (tpu-toggle-newline-and-indent)
+ (tpu-toggle-regexp, tpu-toggle-search-direction)
+ (tpu-toggle-rectangle, tpu-toggle-control-keys):
+ * emulation/tpu-extras.el (tpu-set-scroll-margins):
+ * emulation/viper-cmd.el (viper-set-searchstyle-toggling-macros)
+ (viper-set-parsing-style-toggling-macro)
+ (viper-set-emacs-state-searchstyle-macros):
+ * emulation/viper.el (viper-set-hooks):
+ * eshell/esh-mode.el (eshell-truncate-buffer):
+ * international/mule-cmds.el (prefer-coding-system)
+ (describe-input-method, describe-language-environment):
+ * international/mule-diag.el (list-character-sets)
+ (describe-character-set, describe-coding-system)
+ (describe-fontset, list-fontsets, list-input-methods):
+ * mail/sendmail.el (mail-signature):
+ * net/ange-ftp.el (ange-ftp-copy-file):
+ * net/browse-url.el (browse-url):
+ * net/eudc.el (eudc-set-server, eudc-get-attribute-list):
+ * net/quickurl.el (quickurl-add-url):
+ * net/rcirc.el (names, topic):
+ * net/xesam.el (xesam-mode):
+ * play/5x5.el (5x5-new-game):
+ * play/yow.el (apropos-zippy):
+ * progmodes/ada-mode.el (ada-mode-version):
+ * progmodes/f90.el (f90-beginning-of-subprogram, f90-end-of-subprogram)
+ (f90-end-of-block)
+ (f90-beginning-of-block):
+ * progmodes/fortran.el (fortran-end-of-block)
+ (fortran-beginning-of-block):
+ * progmodes/js.el (js-syntactic-context, js-gc, js-eval):
+ * progmodes/python.el (python-describe-symbol, python-shell):
+ * term/ns-win.el (ns-print-buffer):
+ * textmodes/bibtex.el (bibtex-end-of-entry, bibtex-url):
+ * textmodes/flyspell.el (flyspell-mode-on):
+ * textmodes/page-ext.el (set-page-delimiter, pages-directory)
+ (pages-directory-for-addresses):
+ * textmodes/table.el (table-recognize-cell)
+ (table-query-dimension, table-generate-source)
+ (table-insert-sequence, table--warn-incompatibility):
+ * textmodes/tex-mode.el (tex-validate-buffer):
+ * textmodes/texinfmt.el (texinfmt-version)
+ (texinfo-format-buffer):
+ Use `called-interactively-p' instead of `interactive-p'.
+
+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):
Index: allout.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/allout.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- allout.el 24 Sep 2009 01:37:17 -0000 1.116
+++ allout.el 2 Oct 2009 03:48:38 -0000 1.117
@@ -1590,7 +1590,7 @@
\(allout-init t)"
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(progn
(setq mode
(completing-read
@@ -1614,7 +1614,7 @@
(cond ((not mode)
(set find-file-hook-var-name
(delq hook (symbol-value find-file-hook-var-name)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Allout outline mode auto-activation inhibited.")))
((eq mode 'report)
(if (not (memq hook (symbol-value find-file-hook-var-name)))
@@ -2901,7 +2901,7 @@
(let ((bol-point (point)))
(if (allout-goto-prefix-doublechecked)
(if (<= (point) bol-point)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(allout-end-of-prefix)
(point))
(goto-char (point-min))
@@ -2968,7 +2968,7 @@
(goto-char allout-recent-prefix-end)
(goto-char (point-min)))
(allout-end-of-prefix)
- (if (and (interactive-p)
+ (if (and (called-interactively-p 'interactive)
(= (point) start-point))
(goto-char (allout-current-bullet-pos)))))
;;;_ > allout-end-of-entry (&optional inclusive)
@@ -3018,7 +3018,7 @@
(while (and (< depth allout-recent-depth)
(setq last-ascended (allout-ascend))))
(goto-char allout-recent-prefix-beginning)
- (if (interactive-p) (allout-end-of-prefix))
+ (if (called-interactively-p 'interactive) (allout-end-of-prefix))
(and last-ascended allout-recent-depth))))
;;;_ > allout-ascend ()
(defun allout-ascend (&optional dont-move-if-unsuccessful)
@@ -3046,7 +3046,7 @@
(goto-char bolevel)
(allout-depth)
nil))))
- (if (interactive-p) (allout-end-of-prefix))))
+ (if (called-interactively-p 'interactive) (allout-end-of-prefix))))
;;;_ > allout-descend-to-depth (depth)
(defun allout-descend-to-depth (depth)
"Descend to depth DEPTH within current topic.
@@ -3074,7 +3074,7 @@
(if (not (allout-ascend))
(progn (goto-char start-point)
(error "Can't ascend past outermost level"))
- (if (interactive-p) (allout-end-of-prefix))
+ (if (called-interactively-p 'interactive) (allout-end-of-prefix))
allout-recent-prefix-beginning)))
;;;_ - Linear
@@ -3219,7 +3219,7 @@
(let ((depth (allout-depth)))
(while (allout-previous-sibling depth nil))
(prog1 allout-recent-depth
- (if (interactive-p) (allout-end-of-prefix)))))
+ (if (called-interactively-p 'interactive) (allout-end-of-prefix)))))
;;;_ > allout-next-visible-heading (arg)
(defun allout-next-visible-heading (arg)
"Move to the next ARG'th visible heading line, backward if arg is negative.
@@ -3272,7 +3272,7 @@
matches)."
(interactive "p")
(prog1 (allout-next-visible-heading (- arg))
- (if (interactive-p) (allout-end-of-prefix))))
+ (if (called-interactively-p 'interactive) (allout-end-of-prefix))))
;;;_ > allout-forward-current-level (arg)
(defun allout-forward-current-level (arg)
"Position point at the next heading of the same level.
@@ -3293,7 +3293,7 @@
(allout-previous-sibling)
(allout-next-sibling)))
(setq arg (1- arg)))
- (if (not (interactive-p))
+ (if (not (called-interactively-p 'interactive))
nil
(allout-end-of-prefix)
(if (not (zerop arg))
@@ -3306,7 +3306,7 @@
(defun allout-backward-current-level (arg)
"Inverse of `allout-forward-current-level'."
(interactive "p")
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(let ((current-prefix-arg (* -1 arg)))
(call-interactively 'allout-forward-current-level))
(allout-forward-current-level (* -1 arg))))
@@ -4845,7 +4845,7 @@
(to-reveal (or (allout-chart-to-reveal chart chart-level)
;; interactive, show discontinuous children:
(and chart
- (interactive-p)
+ (called-interactively-p 'interactive)
(save-excursion
(allout-back-to-current-heading)
(setq depth (allout-current-depth))
Index: apropos.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- apropos.el 15 Sep 2009 02:37:31 -0000 1.143
+++ apropos.el 2 Oct 2009 03:48:39 -0000 1.144
@@ -1121,7 +1121,8 @@
(defun apropos-describe-plist (symbol)
"Display a pretty listing of SYMBOL's plist."
- (help-setup-xref (list 'apropos-describe-plist symbol) (interactive-p))
+ (help-setup-xref (list 'apropos-describe-plist symbol)
+ (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(set-buffer standard-output)
(princ "Symbol ")
Index: bookmark.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/bookmark.el,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- bookmark.el 20 Sep 2009 14:54:20 -0000 1.125
+++ bookmark.el 2 Oct 2009 03:48:39 -0000 1.126
@@ -442,7 +442,7 @@
We need this because sometimes bookmark functions are invoked from
menus, so `completing-read' never gets a chance to set `bookmark-history'."
`(or
- (interactive-p)
+ (called-interactively-p 'interactive)
(setq bookmark-history (cons ,string bookmark-history))))
(defvar bookmark-make-record-function 'bookmark-make-record-default
@@ -1494,7 +1494,7 @@
deletion, or > if it is flagged for displaying."
(interactive)
(bookmark-maybe-load-default-file)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(switch-to-buffer (get-buffer-create "*Bookmark List*"))
(set-buffer (get-buffer-create "*Bookmark List*")))
(let ((inhibit-read-only t))
Index: comint.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/comint.el,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -b -r1.393 -r1.394
--- comint.el 25 Sep 2009 03:42:25 -0000 1.393
+++ comint.el 2 Oct 2009 03:48:39 -0000 1.394
@@ -1899,7 +1899,8 @@
(save-excursion
(condition-case nil
(goto-char
- (if (interactive-p) comint-last-input-end comint-last-output-start))
+ (if (called-interactively-p 'interactive)
+ comint-last-input-end comint-last-output-start))
(error nil))
(while (re-search-forward "\r+$" pmark t)
(replace-match "" t t)))))
@@ -3068,7 +3069,7 @@
(let ((proc (or (get-buffer-process (current-buffer))
(error "Current buffer has no process"))))
(goto-char (process-mark proc))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Point is now at the process mark"))))
(defun comint-bol-or-process-mark ()
Index: completion.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/completion.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- completion.el 5 Jan 2009 03:18:49 -0000 1.69
+++ completion.el 2 Oct 2009 03:48:39 -0000 1.70
@@ -1311,7 +1311,7 @@
are specified."
(interactive (interactive-completion-string-reader "Completion to add"))
(check-completion-length string)
- (let* ((current-completion-source (if (interactive-p)
+ (let* ((current-completion-source (if (called-interactively-p 'interactive)
cmpl-source-interactive
current-completion-source))
(entry (add-completion-to-head string)))
@@ -1324,7 +1324,7 @@
"Add STRING if it isn't already listed, and mark it permanent."
(interactive
(interactive-completion-string-reader "Completion to add permanently"))
- (let ((current-completion-source (if (interactive-p)
+ (let ((current-completion-source (if (called-interactively-p 'interactive)
cmpl-source-interactive
current-completion-source)))
(add-completion string nil t)))
Index: descr-text.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/descr-text.el,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- descr-text.el 7 Apr 2009 00:46:13 -0000 1.79
+++ descr-text.el 2 Oct 2009 03:48:39 -0000 1.80
@@ -101,7 +101,8 @@
(defun describe-text-category (category)
"Describe a text property category."
(interactive "SCategory: ")
- (help-setup-xref (list #'describe-text-category category) (interactive-p))
+ (help-setup-xref (list #'describe-text-category category)
+ (called-interactively-p 'interactive))
(save-excursion
(with-output-to-temp-buffer "*Help*"
(set-buffer standard-output)
@@ -607,7 +608,7 @@
(setq max-width (apply #'max (mapcar #'(lambda (x)
(if (cadr x) (length (car x)) 0))
item-list)))
- (help-setup-xref nil (interactive-p))
+ (help-setup-xref nil (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(with-current-buffer standard-output
(set-buffer-multibyte multibyte-p)
Index: desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- desktop.el 15 Sep 2009 04:05:15 -0000 1.138
+++ desktop.el 2 Oct 2009 03:48:40 -0000 1.139
@@ -1280,7 +1280,7 @@
(setq desktop-lazy-timer nil))
(when desktop-buffer-args-list
(setq desktop-buffer-args-list nil)
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Lazy desktop load aborted"))))
;; ----------------------------------------------------------------------------
Index: dired-x.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired-x.el,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- dired-x.el 24 Sep 2009 01:37:17 -0000 1.101
+++ dired-x.el 2 Oct 2009 03:48:40 -0000 1.102
@@ -595,7 +595,7 @@
`dired-omit-marker-char' and calling `dired-do-kill-lines'."
(interactive "sOmit files (regexp): ")
(if (and dired-omit-mode
- (or (interactive-p)
+ (or (called-interactively-p 'interactive)
(not dired-omit-size-limit)
(< (buffer-size) dired-omit-size-limit)
(progn
@@ -1640,7 +1640,7 @@
Binding direction based on `dired-x-hands-off-my-keys'.
This function is part of `after-init-hook'."
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(setq dired-x-hands-off-my-keys
(not (y-or-n-p "Bind dired-x-find-file over find-file? "))))
(cond ((not dired-x-hands-off-my-keys)
Index: dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- dired.el 1 Oct 2009 15:01:32 -0000 1.432
+++ dired.el 2 Oct 2009 03:48:40 -0000 1.433
@@ -2373,7 +2373,7 @@
(goto-char (match-beginning 0))
(beginning-of-line)
(point-marker)))))
- (if (and (> count 1) (interactive-p))
+ (if (and (> count 1) (called-interactively-p 'interactive))
(message "Buffer includes %d directories" count)))
;; We don't need to sort it because it is in buffer order per
;; constructionem. Return new alist:
@@ -3914,7 +3914,7 @@
;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;; "1a0298749959c80c24c73b8bec5f1f74")
+;;;;;; "7c58535b489f23d5503ef8219c7d1282")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\
Index: ediff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- ediff.el 15 Aug 2009 05:57:12 -0000 1.108
+++ ediff.el 2 Oct 2009 03:48:40 -0000 1.109
@@ -1453,7 +1453,7 @@
"Return string describing the version of Ediff.
When called interactively, displays the version."
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" (ediff-version))
(format "Ediff %s of %s" ediff-version ediff-date)))
Index: elide-head.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/elide-head.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- elide-head.el 5 Jan 2009 03:19:02 -0000 1.25
+++ elide-head.el 2 Oct 2009 03:48:40 -0000 1.26
@@ -97,7 +97,7 @@
rest nil))))
(if rest (setq rest (cdr rest))))
(if (not (and beg end))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "No header found"))
(goto-char beg)
(end-of-line)
@@ -114,7 +114,7 @@
(if (and (overlayp elide-head-overlay)
(overlay-buffer elide-head-overlay))
(delete-overlay elide-head-overlay)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "No header hidden"))))
(provide 'elide-head)
Index: emerge.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emerge.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- emerge.el 21 Aug 2009 07:24:29 -0000 1.60
+++ emerge.el 2 Oct 2009 03:48:40 -0000 1.61
@@ -94,7 +94,7 @@
"Return string describing the version of Emerge.
When called interactively, displays the version."
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Emerge version %s" emacs-version)
emacs-version))
Index: env.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/env.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- env.el 10 Feb 2009 10:25:01 -0000 1.49
+++ env.el 2 Oct 2009 03:48:40 -0000 1.50
@@ -203,7 +203,7 @@
(frame-parameters frame))))))
(if (and enable-multibyte-characters value)
(setq value (decode-coding-string value locale-coding-system)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "%s" (if value value "Not set")))
value))
Index: face-remap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/face-remap.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- face-remap.el 23 Jun 2009 08:27:58 -0000 1.16
+++ face-remap.el 2 Oct 2009 03:48:40 -0000 1.17
@@ -417,7 +417,8 @@
An interface to `buffer-face-mode' which uses the `variable-pitch' face.
Besides the choice of face, it is the same as `buffer-face-mode'."
(interactive (list (or current-prefix-arg 'toggle)))
- (buffer-face-mode-invoke 'variable-pitch arg (interactive-p)))
+ (buffer-face-mode-invoke 'variable-pitch arg
+ (called-interactively-p 'interactive)))
(provide 'face-remap)
Index: faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -b -r1.447 -r1.448
--- faces.el 27 Sep 2009 16:06:33 -0000 1.447
+++ faces.el 2 Oct 2009 03:48:40 -0000 1.448
@@ -1348,7 +1348,8 @@
(:inherit . "Inherit")))
(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
attrs))))
- (help-setup-xref (list #'describe-face face) (interactive-p))
+ (help-setup-xref (list #'describe-face face)
+ (called-interactively-p 'interactive))
(unless face
(setq face 'default))
(if (not (listp face))
Index: ffap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ffap.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- ffap.el 9 Sep 2009 02:36:41 -0000 1.85
+++ ffap.el 2 Oct 2009 03:48:40 -0000 1.86
@@ -360,7 +360,7 @@
"Like `ffap-next', but search with `ffap-url-regexp'."
(interactive)
(let ((ffap-next-regexp ffap-url-regexp))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(call-interactively 'ffap-next)
(ffap-next back wrap))))
@@ -1416,7 +1416,7 @@
See also the variables `ffap-dired-wildcards', `ffap-newfile-prompt',
and the functions `ffap-file-at-point' and `ffap-url-at-point'."
(interactive)
- (if (and (interactive-p)
+ (if (and (called-interactively-p 'interactive)
(if ffap-require-prefix (not current-prefix-arg)
current-prefix-arg))
;; Do exactly the ffap-file-finder command, even the prompting:
@@ -1624,7 +1624,7 @@
(find-file-at-point guess)
guess) ; success: return non-nil
(ffap-highlight t)))
- ((interactive-p)
+ ((called-interactively-p 'interactive)
(if ffap-at-mouse-fallback
(call-interactively ffap-at-mouse-fallback)
(message "No file or url found at mouse click.")
@@ -1780,7 +1780,7 @@
(defun dired-at-point (&optional filename)
"Start Dired, defaulting to file at point. See `ffap'."
(interactive)
- (if (and (interactive-p)
+ (if (and (called-interactively-p 'interactive)
(if dired-at-point-require-prefix
(not current-prefix-arg)
current-prefix-arg))
Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1089
retrieving revision 1.1090
diff -u -b -r1.1089 -r1.1090
--- files.el 1 Oct 2009 15:04:22 -0000 1.1089
+++ files.el 2 Oct 2009 03:48:40 -0000 1.1090
@@ -1382,7 +1382,8 @@
Like \\[find-file], but only allow a file that exists, and do not allow
file names with wildcards."
(interactive (nbutlast (find-file-read-args "Find existing file: " t)))
- (if (and (not (interactive-p)) (not (file-exists-p filename)))
+ (if (and (not (called-interactively-p 'interactive))
+ (not (file-exists-p filename)))
(error "%s does not exist" filename)
(find-file filename)
(current-buffer)))
@@ -5067,7 +5068,7 @@
;; turn it back on.
(and (< buffer-saved-size 0)
(setq buffer-saved-size 0))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Auto-save %s (in this buffer)"
(if buffer-auto-save-file-name "on" "off")))
buffer-auto-save-file-name)
Index: font-lock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/font-lock.el,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -b -r1.353 -r1.354
--- font-lock.el 12 Sep 2009 03:55:49 -0000 1.353
+++ font-lock.el 2 Oct 2009 03:48:41 -0000 1.354
@@ -1019,7 +1019,8 @@
"Fontify the current buffer the way the function `font-lock-mode' would."
(interactive)
(font-lock-set-defaults)
- (let ((font-lock-verbose (or font-lock-verbose (interactive-p))))
+ (let ((font-lock-verbose (or font-lock-verbose
+ (called-interactively-p 'interactive))))
(funcall font-lock-fontify-buffer-function)))
(defun font-lock-unfontify-buffer ()
Index: help-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- help-fns.el 1 Oct 2009 16:54:24 -0000 1.141
+++ help-fns.el 2 Oct 2009 03:48:41 -0000 1.142
@@ -52,7 +52,8 @@
fn (intern val)))))
(if (null function)
(message "You didn't specify a function")
- (help-setup-xref (list #'describe-function function) (interactive-p))
+ (help-setup-xref (list #'describe-function function)
+ (called-interactively-p 'interactive))
(save-excursion
(with-help-window (help-buffer)
(prin1 function)
@@ -606,7 +607,7 @@
(setq val (symbol-value variable)
locus (variable-binding-locus variable)))))
(help-setup-xref (list #'describe-variable variable buffer)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(with-current-buffer buffer
(prin1 variable)
@@ -800,7 +801,8 @@
BUFFER defaults to the current buffer."
(interactive)
(setq buffer (or buffer (current-buffer)))
- (help-setup-xref (list #'describe-syntax buffer) (interactive-p))
+ (help-setup-xref (list #'describe-syntax buffer)
+ (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(let ((table (with-current-buffer buffer (syntax-table))))
(with-current-buffer standard-output
@@ -825,7 +827,8 @@
BUFFER should be a buffer or a buffer name."
(interactive)
(setq buffer (or buffer (current-buffer)))
- (help-setup-xref (list #'describe-categories buffer) (interactive-p))
+ (help-setup-xref (list #'describe-categories buffer)
+ (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(let* ((table (with-current-buffer buffer (category-table)))
(docs (char-table-extra-slot table 0)))
Index: help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help.el,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -b -r1.349 -r1.350
--- help.el 27 Sep 2009 00:27:26 -0000 1.349
+++ help.el 2 Oct 2009 03:48:41 -0000 1.350
@@ -461,7 +461,8 @@
To record all your input on a file, use `open-dribble-file'."
(interactive)
- (help-setup-xref (list #'view-lossage) (interactive-p))
+ (help-setup-xref (list #'view-lossage)
+ (called-interactively-p 'interactive))
(with-help-window (help-buffer)
(princ (mapconcat (lambda (key)
(if (or (integerp key) (symbolp key) (listp key))
@@ -492,7 +493,8 @@
or a buffer name."
(interactive)
(or buffer (setq buffer (current-buffer)))
- (help-setup-xref (list #'describe-bindings prefix buffer) (interactive-p))
+ (help-setup-xref (list #'describe-bindings prefix buffer)
+ (called-interactively-p 'interactive))
(with-current-buffer buffer
(describe-bindings-internal nil prefix)))
@@ -721,7 +723,8 @@
(if (or (null defn) (integerp defn) (equal defn 'undefined))
(message "%s%s is undefined"
(help-key-description key untranslated) mouse-msg)
- (help-setup-xref (list #'describe-function defn) (interactive-p))
+ (help-setup-xref (list #'describe-function defn)
+ (called-interactively-p 'interactive))
;; Don't bother user with strings from (e.g.) the select-paste menu.
(when (stringp (aref key (1- (length key))))
(aset key (1- (length key)) "(any string)"))
@@ -798,7 +801,7 @@
(interactive "@")
(unless buffer (setq buffer (current-buffer)))
(help-setup-xref (list #'describe-mode buffer)
- (interactive-p))
+ (called-interactively-p 'interactive))
;; For the sake of help-do-xref and help-xref-go-back,
;; don't switch buffers before calling `help-buffer'.
(with-help-window (help-buffer)
Index: hexl.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/hexl.el,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- hexl.el 28 Aug 2009 17:02:56 -0000 1.123
+++ hexl.el 2 Oct 2009 03:48:41 -0000 1.124
@@ -448,7 +448,7 @@
(if (>= current-column 41)
(- current-column 41)
(/ (- current-column (/ current-column 5)) 2))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Current address is %d/0x%08x" hexl-address hexl-address))
hexl-address))
Index: hi-lock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/hi-lock.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- hi-lock.el 29 Sep 2009 02:26:23 -0000 1.58
+++ hi-lock.el 2 Oct 2009 03:48:41 -0000 1.59
@@ -338,7 +338,7 @@
:keymap hi-lock-map
(when (and (equal (buffer-name) "*scratch*")
load-in-progress
- (not (interactive-p))
+ (not (called-interactively-p 'interactive))
(not hi-lock-archaic-interface-message-used))
(setq hi-lock-archaic-interface-message-used t)
(if hi-lock-archaic-interface-deduce
@@ -636,7 +636,7 @@
(y-or-n-p "Add patterns from this buffer to hi-lock? "))
(t nil)))
(hi-lock-set-file-patterns all-patterns)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Hi-lock added %d patterns." (length all-patterns)))))))
(defun hi-lock-font-lock-hook ()
Index: info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/info.el,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -b -r1.565 -r1.566
--- info.el 22 Sep 2009 08:44:19 -0000 1.565
+++ info.el 2 Oct 2009 03:48:41 -0000 1.566
@@ -4093,7 +4093,7 @@
(let ((command (key-binding key)))
(cond ((null command)
(message "%s is undefined" (key-description key)))
- ((and (interactive-p)
+ ((and (called-interactively-p 'interactive)
(eq command 'execute-extended-command))
(Info-goto-emacs-command-node
(read-command "Find documentation for command: ")))
Index: log-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/log-edit.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- log-edit.el 25 Sep 2009 17:57:13 -0000 1.55
+++ log-edit.el 2 Oct 2009 03:48:41 -0000 1.56
@@ -470,7 +470,8 @@
"Insert the template specified by the CVS administrator, if any.
This simply uses the local CVS/Template file."
(interactive)
- (when (or (interactive-p) (= (point-min) (point-max)))
+ (when (or (called-interactively-p 'interactive)
+ (= (point-min) (point-max)))
(when (file-readable-p "CVS/Template")
(insert-file-contents "CVS/Template"))))
@@ -479,7 +480,8 @@
This contacts the repository to get the rcstemplate file and
can thus take some time."
(interactive)
- (when (or (interactive-p) (= (point-min) (point-max)))
+ (when (or (called-interactively-p 'interactive)
+ (= (point-min) (point-max)))
(when (file-readable-p "CVS/Root")
;; Ignore the stderr stuff, even if it's an error.
(call-process "cvs" nil '(t nil) nil
Index: menu-bar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -b -r1.359 -r1.360
--- menu-bar.el 27 Sep 2009 23:25:06 -0000 1.359
+++ menu-bar.el 2 Oct 2009 03:48:41 -0000 1.360
@@ -1920,7 +1920,7 @@
;; Make the message appear when Emacs is idle. We can not call message
;; directly. The minor-mode message "Menu-bar mode disabled" comes
;; after this function returns, overwriting any message we do here.
- (when (and (interactive-p) (not menu-bar-mode))
+ (when (and (called-interactively-p 'interactive) (not menu-bar-mode))
(run-with-idle-timer 0 nil 'message
"Menu-bar mode disabled. Use M-x menu-bar-mode to
make the menu bar appear."))
menu-bar-mode)
Index: mouse.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- mouse.el 17 Sep 2009 01:33:00 -0000 1.358
+++ mouse.el 2 Oct 2009 03:48:42 -0000 1.359
@@ -2565,7 +2565,8 @@
(if (eq choice 'x-select-font)
(x-select-font)
(symbol-name choice)))
- t (interactive-p))))))))
+ t
+ (called-interactively-p
'interactive))))))))
;;; Bindings for mouse commands.
Index: newcomment.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/newcomment.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- newcomment.el 26 May 2009 03:16:36 -0000 1.117
+++ newcomment.el 2 Oct 2009 03:48:42 -0000 1.118
@@ -1260,7 +1260,7 @@
;; don't do anything (unless no comment syntax is defined).
(unless (and comment-start
comment-auto-fill-only-comments
- (not (interactive-p))
+ (not (called-interactively-p 'interactive))
(not (save-excursion
(prog1 (setq compos (comment-beginning))
(setq comin (point))))))
Index: pgg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pgg.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- pgg.el 5 Jan 2009 03:19:40 -0000 1.16
+++ pgg.el 2 Oct 2009 03:48:42 -0000 1.17
@@ -130,7 +130,7 @@
(put 'pgg-save-coding-system 'lisp-indent-function 2)
(defmacro pgg-save-coding-system (start end &rest body)
- `(if (interactive-p)
+ `(if (called-interactively-p 'interactive)
(let ((buffer (current-buffer)))
(with-temp-buffer
(let (buffer-undo-list)
@@ -324,7 +324,7 @@
(pgg-save-coding-system start end
(pgg-invoke "encrypt-region" (or pgg-scheme pgg-default-scheme)
(point-min) (point-max) rcpts sign passphrase))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -340,7 +340,7 @@
(pgg-invoke "encrypt-symmetric-region"
(or pgg-scheme pgg-default-scheme)
(point-min) (point-max) passphrase))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -357,7 +357,7 @@
(let* ((start (or start (point-min)))
(end (or end (point-max)))
(status (pgg-encrypt-symmetric-region start end passphrase)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -376,7 +376,7 @@
(let* ((start (or start (point-min)))
(end (or end (point-max)))
(status (pgg-encrypt-region start end rcpts sign passphrase)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -392,7 +392,7 @@
(pgg-save-coding-system start end
(pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme)
(point-min) (point-max) passphrase))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -409,7 +409,7 @@
(let* ((start (or start (point-min)))
(end (or end (point-max)))
(status (pgg-decrypt-region start end passphrase)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -429,9 +429,10 @@
(let ((status (pgg-save-coding-system start end
(pgg-invoke "sign-region" (or pgg-scheme pgg-default-scheme)
(point-min) (point-max)
- (or (interactive-p) cleartext)
+ (or (called-interactively-p 'interactive)
+ cleartext)
passphrase))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -454,9 +455,10 @@
(let* ((start (or start (point-min)))
(end (or end (point-max)))
(status (pgg-sign-region start end
- (or (interactive-p) cleartext)
+ (or (called-interactively-p 'interactive)
+ cleartext)
passphrase)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pgg-display-output-buffer start end status))
status))
@@ -484,7 +486,7 @@
pgg-query-keyserver
(setq key (concat "0x" (pgg-truncate-key-identifier key)))
(null (pgg-lookup-key key))
- (or fetch (interactive-p))
+ (or fetch (called-interactively-p 'interactive))
(y-or-n-p (format "Key %s not found; attempt to fetch? " key))
(setq keyserver
(or (cdr (assq 'preferred-key-server packet))
@@ -494,7 +496,7 @@
(pgg-save-coding-system start end
(pgg-invoke "verify-region" (or pgg-scheme pgg-default-scheme)
(point-min) (point-max) signature)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(let ((temp-buffer-show-function
(function pgg-temp-buffer-show-function)))
(with-output-to-temp-buffer pgg-echo-buffer
@@ -516,7 +518,7 @@
(let* ((start (or start (point-min)))
(end (or end (point-max)))
(status (pgg-verify-region start end signature fetch)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(let ((temp-buffer-show-function
(function pgg-temp-buffer-show-function)))
(with-output-to-temp-buffer pgg-echo-buffer
Index: recentf.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/recentf.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- recentf.el 15 Sep 2009 11:42:37 -0000 1.68
+++ recentf.el 2 Oct 2009 03:48:42 -0000 1.69
@@ -1357,7 +1357,7 @@
(dolist (hook recentf-used-hooks)
(apply hook-setup hook)))
(run-hooks 'recentf-mode-hook)
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Recentf mode %sabled" (if recentf-mode "en" "dis"))))
recentf-mode)
Index: savehist.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/savehist.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- savehist.el 5 Jan 2009 03:19:43 -0000 1.33
+++ savehist.el 2 Oct 2009 03:48:42 -0000 1.34
@@ -203,7 +203,7 @@
;; coding cookie to convey that information. That way, if
;; the user changes the value of savehist-coding-system,
;; we can still correctly load the old file.
- (load savehist-file nil (not (interactive-p)))
+ (load savehist-file nil (not (called-interactively-p 'interactive)))
(setq savehist-loaded t))
(error
;; Don't install the mode if reading failed. Doing so would
@@ -351,7 +351,7 @@
(let ((file-precious-flag t)
(coding-system-for-write savehist-coding-system))
(write-region (point-min) (point-max) savehist-file nil
- (unless (interactive-p) 'quiet)))
+ (unless (called-interactively-p 'interactive) 'quiet)))
(when savehist-file-modes
(set-file-modes savehist-file savehist-file-modes))
(setq savehist-last-checksum checksum)))))
Index: shadowfile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/shadowfile.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- shadowfile.el 5 Jan 2009 03:19:45 -0000 1.44
+++ shadowfile.el 2 Oct 2009 03:48:42 -0000 1.45
@@ -510,7 +510,7 @@
call it manually."
(interactive "P")
(if (not shadow-files-to-copy)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "No files need to be shadowed."))
(save-excursion
(map-y-or-n-p (function
Index: simple.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/simple.el,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -b -r1.1013 -r1.1014
--- simple.el 17 Sep 2009 06:02:23 -0000 1.1013
+++ simple.el 2 Oct 2009 03:48:42 -0000 1.1014
@@ -3026,9 +3026,9 @@
visual feedback indicating the extent of the region being copied."
(interactive "r")
(copy-region-as-kill beg end)
- ;; This use of interactive-p is correct
+ ;; This use of called-interactively-p is correct
;; because the code it controls just gives the user visual feedback.
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(let ((other-end (if (= (point) beg) end beg))
(opoint (point))
;; Inhibit quitting so we can make a quit here
@@ -3992,7 +3992,7 @@
(end-of-line)
(insert (if use-hard-newlines hard-newline "\n")))
(line-move arg nil nil try-vscroll))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(condition-case nil
(line-move arg nil nil try-vscroll)
((beginning-of-buffer end-of-buffer) (ding)))
@@ -4022,7 +4022,7 @@
to use and more reliable (no dependence on goal column, etc.)."
(interactive "^p\np")
(or arg (setq arg 1))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(condition-case nil
(line-move (- arg) nil nil try-vscroll)
((beginning-of-buffer end-of-buffer) (ding)))
@@ -6429,7 +6429,7 @@
(keyboard-translate ?\C-? ?\C-?))))
(run-hooks 'normal-erase-is-backspace-hook)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Delete key deletes %s"
(if (terminal-parameter nil 'normal-erase-is-backspace)
"forward" "backward")))))
Index: strokes.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/strokes.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- strokes.el 22 Aug 2009 19:29:25 -0000 1.42
+++ strokes.el 2 Oct 2009 03:48:42 -0000 1.43
@@ -1055,7 +1055,7 @@
;; don't try to update strokes window configuration
;; if window is dedicated or a minibuffer
nil)
- ((or (interactive-p)
+ ((or (called-interactively-p 'interactive)
(not (buffer-live-p (get-buffer strokes-buffer-name)))
(null strokes-window-configuration))
;; create `strokes-window-configuration' from scratch...
@@ -1092,7 +1092,7 @@
(cond ((and (file-exists-p strokes-file)
(file-readable-p strokes-file))
(load-file strokes-file))
- ((interactive-p)
+ ((called-interactively-p 'interactive)
(error "Trouble loading user-defined strokes; nothing done"))
(t
(message "No user-defined strokes, sorry"))))
@@ -1107,7 +1107,7 @@
(setq strokes-global-map nil)
(strokes-load-user-strokes)
(if (and (not (equal current strokes-global-map))
- (or (interactive-p)
+ (or (called-interactively-p 'interactive)
(yes-or-no-p "Save your strokes? ")))
(progn
(require 'pp) ; pretty-print variables
@@ -1202,7 +1202,7 @@
((strokes-lift-p point)
;; a lift--tell the loop to X out the next point...
(setq lift-flag t))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(pop-to-buffer " *strokes-xpm*")
;; (xpm-mode 1)
(goto-char (point-min))
Index: time.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/time.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- time.el 2 Sep 2009 03:21:26 -0000 1.116
+++ time.el 2 Oct 2009 03:48:42 -0000 1.117
@@ -562,7 +562,7 @@
(format-seconds (or format "%Y, %D, %H, %M, %z%S")
(float-time
(time-subtract (current-time) before-init-time)))))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" str)
str)))
@@ -574,7 +574,7 @@
(format "%.1f seconds"
(float-time
(time-subtract after-init-time before-init-time)))))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" str)
str)))
Index: tutorial.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tutorial.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- tutorial.el 11 Sep 2009 00:59:04 -0000 1.36
+++ tutorial.el 2 Oct 2009 03:48:42 -0000 1.37
@@ -74,7 +74,7 @@
for the function it is remapped to)"
(with-output-to-temp-buffer (help-buffer)
(help-setup-xref (list #'tutorial--describe-nonstandard-key value)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-current-buffer (help-buffer)
(insert
"Your Emacs customizations override the default binding for this key:"
@@ -323,7 +323,7 @@
"Give detailed help about changed keys."
(with-output-to-temp-buffer (help-buffer)
(help-setup-xref (list #'tutorial--detailed-help button)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-current-buffer (help-buffer)
(let* ((tutorial-buffer (button-get button 'tutorial-buffer))
(explain-key-desc (button-get button 'explain-key-desc))
Index: type-break.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/type-break.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- type-break.el 5 Jan 2009 03:19:50 -0000 1.52
+++ type-break.el 2 Oct 2009 03:48:42 -0000 1.53
@@ -386,7 +386,7 @@
(cond
((and already-enabled type-break-mode)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Type Break mode is already enabled")))
(type-break-mode
(when type-break-file-name
@@ -430,7 +430,7 @@
type-break-interval-start
type-break-interval)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Type Break mode is enabled and set")))
(t
(type-break-keystroke-reset)
@@ -443,7 +443,7 @@
(set-buffer-modified-p nil)
(unlock-buffer)
(kill-this-buffer)))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Type Break mode is disabled")))))
type-break-mode)
@@ -465,7 +465,7 @@
(interactive "P")
(setq type-break-mode-line-message-mode
(>= (prefix-numeric-value prefix) 0))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(if type-break-mode-line-message-mode
(message "type-break-mode-line-message-mode is enabled")
(message "type-break-mode-line-message-mode is disabled")))
@@ -486,7 +486,7 @@
(interactive "P")
(setq type-break-query-mode
(>= (prefix-numeric-value prefix) 0))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(if type-break-query-mode
(message "type-break-query-mode is enabled")
(message "type-break-query-mode is disabled")))
@@ -1015,7 +1015,7 @@
(setq type-break-keystroke-threshold (cons nil nil)))
(setcar type-break-keystroke-threshold lower)
(setcdr type-break-keystroke-threshold upper)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "min threshold: %d\tmax threshold: %d" lower upper))
type-break-keystroke-threshold))
Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -b -r1.730 -r1.731
--- vc.el 24 Sep 2009 01:37:18 -0000 1.730
+++ vc.el 2 Oct 2009 03:48:42 -0000 1.731
@@ -1577,7 +1577,8 @@
(error "Not a valid revision range"))
;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the
;; placement rules for (interactive) don't actually leave us a choice.
- (vc-diff-internal t (vc-deduce-fileset) rev1 rev2 (interactive-p)))
+ (vc-diff-internal t (vc-deduce-fileset) rev1 rev2
+ (called-interactively-p 'interactive)))
;; (defun vc-contains-version-controlled-file (dir)
;; "Return t if DIR contains a version-controlled file, nil otherwise."
@@ -1598,7 +1599,8 @@
(if historic
(call-interactively 'vc-version-diff)
(when buffer-file-name (vc-buffer-sync not-urgent))
- (vc-diff-internal t (vc-deduce-fileset) nil nil (interactive-p))))
+ (vc-diff-internal t (vc-deduce-fileset) nil nil
+ (called-interactively-p 'interactive))))
;;;###autoload
(defun vc-root-diff (historic &optional not-urgent)
@@ -1625,7 +1627,8 @@
(setq rootdir (vc-call-backend backend 'root default-directory))
(setq working-revision (vc-working-revision rootdir))
(vc-diff-internal
- t (list backend (list rootdir) working-revision) nil nil
(interactive-p)))))
+ t (list backend (list rootdir) working-revision) nil nil
+ (called-interactively-p 'interactive)))))
;;;###autoload
(defun vc-revision-other-window (rev)
Index: version.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/version.el,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -b -r2.77 -r2.78
--- version.el 11 Sep 2009 06:42:16 -0000 2.77
+++ version.el 2 Oct 2009 03:48:43 -0000 2.78
@@ -55,7 +55,7 @@
to the system configuration; look at `system-configuration' instead."
(interactive "P")
(let ((version-string
- (format (if (not (interactive-p))
+ (format (if (not (called-interactively-p 'interactive))
"GNU Emacs %s (%s%s%s)\n of %s on %s"
"GNU Emacs %s (%s%s%s) of %s on %s")
emacs-version
@@ -77,7 +77,7 @@
emacs-build-system)))
(if here
(insert version-string)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" version-string)
version-string))))
Index: vt-control.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vt-control.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- vt-control.el 5 Jan 2009 03:19:54 -0000 1.20
+++ vt-control.el 2 Oct 2009 03:48:43 -0000 1.21
@@ -88,20 +88,23 @@
(interactive)
(send-string-to-terminal "\e=")
(setq vt-applications-keypad-p t)
- (if (or tell (interactive-p)) (message "Applications keypad enabled.")))
+ (if (or tell (called-interactively-p 'interactive))
+ (message "Applications keypad enabled.")))
(defun vt-keypad-off (&optional tell)
"Turn off the VT applications keypad."
(interactive "p")
(send-string-to-terminal "\e>")
(setq vt-applications-keypad-p nil)
- (if (or tell (interactive-p)) (message "Applications keypad disabled.")))
+ (if (or tell (called-interactively-p 'interactive))
+ (message "Applications keypad disabled.")))
(defun vt-numlock nil
"Toggle VT application keypad on and off."
(interactive)
- (if vt-applications-keypad-p (vt-keypad-off (interactive-p))
- (vt-keypad-on (interactive-p))))
+ (if vt-applications-keypad-p
+ (vt-keypad-off (called-interactively-p 'interactive))
+ (vt-keypad-on (called-interactively-p 'interactive))))
(provide 'vt-control)
Index: winner.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/winner.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- winner.el 5 Jan 2009 03:19:57 -0000 1.40
+++ winner.el 2 Oct 2009 03:48:43 -0000 1.41
@@ -387,7 +387,8 @@
(setq winner-modified-list (frame-list))
(winner-save-old-configurations)
(run-hooks 'winner-mode-hook)
- (when (interactive-p) (message "Winner mode enabled")))
+ (when (called-interactively-p 'interactive)
+ (message "Winner mode enabled")))
;; Turn mode off
(winner-mode
(setq winner-mode nil)
@@ -396,7 +397,8 @@
(remove-hook 'post-command-hook 'winner-save-conditionally)
(remove-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
(run-hooks 'winner-mode-leave-hook)
- (when (interactive-p) (message "Winner mode disabled"))))))
+ (when (called-interactively-p 'interactive)
+ (message "Winner mode disabled"))))))
;; Inspired by undo (simple.el)
Index: calendar/timeclock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/timeclock.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- calendar/timeclock.el 5 Jan 2009 03:20:42 -0000 1.48
+++ calendar/timeclock.el 2 Oct 2009 03:48:43 -0000 1.49
@@ -378,7 +378,8 @@
60 60.0) 60))))))
(timeclock-log "i" (or project
(and timeclock-get-project-function
- (or find-project (interactive-p))
+ (or find-project
+ (called-interactively-p 'interactive))
(funcall timeclock-get-project-function))))
(run-hooks 'timeclock-in-hook)))
@@ -401,7 +402,7 @@
(if arg "O" "o")
(or reason
(and timeclock-get-reason-function
- (or find-reason (interactive-p))
+ (or find-reason (called-interactively-p 'interactive))
(funcall timeclock-get-reason-function))))
(run-hooks 'timeclock-out-hook)
(if arg
@@ -445,7 +446,7 @@
(if (> remainder 0)
"remaining" "over")
(timeclock-when-to-leave-string show-seconds today-only)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" status)
status)))
@@ -458,7 +459,7 @@
working on."
(interactive "P")
(timeclock-out arg)
- (timeclock-in nil project (interactive-p)))
+ (timeclock-in nil project (called-interactively-p 'interactive)))
;;;###autoload
(defun timeclock-query-out ()
@@ -516,7 +517,7 @@
(let ((string (timeclock-seconds-to-string
(timeclock-workday-remaining today-only)
show-seconds t)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" string)
string)))
@@ -538,7 +539,7 @@
(interactive)
(let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed)
show-seconds)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" string)
string)))
@@ -583,7 +584,7 @@
(if show-seconds
(format-time-string "%-I:%M:%S %p" then)
(format-time-string "%-I:%M %p" then))))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" string)
string)))
Index: calendar/todo-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/todo-mode.el,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- calendar/todo-mode.el 21 Jul 2009 05:02:40 -0000 1.75
+++ calendar/todo-mode.el 2 Oct 2009 03:48:43 -0000 1.76
@@ -562,7 +562,7 @@
todo-prefix todo-category-beg cat
todo-category-end
todo-prefix todo-category-sep))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
;; properly display the newly added category
(progn (setq todo-category-number 0) (todo-show))
0))))
Index: emacs-lisp/advice.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/advice.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- emacs-lisp/advice.el 2 Oct 2009 00:02:05 -0000 1.67
+++ emacs-lisp/advice.el 2 Oct 2009 03:48:43 -0000 1.68
@@ -218,7 +218,7 @@
;; "Make `car' an interactive function."
;; (interactive "xCar of list: ")
;; ad-do-it
-;; (if (interactive-p)
+;; (if (called-interactively-p 'interactive)
;; (message "%s" ad-return-value)))
@@ -2390,7 +2390,7 @@
(interactive
(list (ad-read-regexp "Enable advices via regexp")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%d matching advices enabled" matched-advices))
matched-advices))
@@ -2400,7 +2400,7 @@
(interactive
(list (ad-read-regexp "Disable advices via regexp")))
(let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%d matching advices disabled" matched-advices))
matched-advices))
Index: emacs-lisp/autoload.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- emacs-lisp/autoload.el 27 Sep 2009 23:25:06 -0000 1.144
+++ emacs-lisp/autoload.el 2 Oct 2009 03:48:43 -0000 1.145
@@ -505,7 +505,7 @@
(no-autoloads (autoload-generate-file-autoloads file)))
(if autoload-modified-buffers
(if save-after (autoload-save-buffers))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Autoload section for %s is up to date." file)))
(if no-autoloads file)))
Index: emacs-lisp/checkdoc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/checkdoc.el,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- emacs-lisp/checkdoc.el 30 Aug 2009 13:59:51 -0000 1.74
+++ emacs-lisp/checkdoc.el 2 Oct 2009 03:48:43 -0000 1.75
@@ -853,7 +853,8 @@
store all errors found in a warnings buffer,
otherwise stop after the first error."
(interactive "P")
- (if (interactive-p) (message "Checking buffer for style..."))
+ (if (called-interactively-p 'interactive)
+ (message "Checking buffer for style..."))
;; Assign a flag to spellcheck flag
(let ((checkdoc-spellcheck-documentation-flag
(car (memq checkdoc-spellcheck-documentation-flag
@@ -870,7 +871,7 @@
(checkdoc-start)
(checkdoc-message-text)
(checkdoc-rogue-spaces)
- (not (interactive-p))
+ (not (called-interactively-p 'interactive))
(if take-notes (checkdoc-show-diagnostics))
(message "Checking buffer for style...Done."))))
@@ -884,7 +885,7 @@
(interactive "P")
(let ((p (point)))
(goto-char (point-min))
- (if (and take-notes (interactive-p))
+ (if (and take-notes (called-interactively-p 'interactive))
(checkdoc-start-section "checkdoc-start"))
(checkdoc-continue take-notes)
;; Go back since we can't be here without success above.
@@ -920,7 +921,7 @@
(if (not take-notes)
(error "%s" (checkdoc-error-text msg)))))
(checkdoc-show-diagnostics)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "No style warnings."))))
(defun checkdoc-next-docstring ()
@@ -968,7 +969,7 @@
(e (checkdoc-rogue-space-check-engine nil nil interact))
(checkdoc-generate-compile-warnings-flag
(or take-notes checkdoc-generate-compile-warnings-flag)))
- (if (not (interactive-p))
+ (if (not (called-interactively-p 'interactive))
e
(if e
(message "%s" (checkdoc-error-text e))
@@ -986,13 +987,14 @@
(checkdoc-generate-compile-warnings-flag
(or take-notes checkdoc-generate-compile-warnings-flag)))
(setq e (checkdoc-message-text-search))
- (if (not (interactive-p))
+ (if (not (called-interactively-p 'interactive))
e
(if e
(error "%s" (checkdoc-error-text e))
(checkdoc-show-diagnostics)))
(goto-char p))
- (if (interactive-p) (message "Checking interactive message text...done.")))
+ (if (called-interactively-p 'interactive)
+ (message "Checking interactive message text...done.")))
;;;###autoload
(defun checkdoc-eval-defun ()
@@ -1041,7 +1043,8 @@
(if msg (if no-error
(message "%s" (checkdoc-error-text msg))
(error "%s" (checkdoc-error-text msg))))))
- (if (interactive-p) (message "Checkdoc: done."))))))
+ (if (called-interactively-p 'interactive)
+ (message "Checkdoc: done."))))))
;;; Ispell interface for forcing a spell check
;;
Index: emacs-lisp/debug.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/debug.el,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- emacs-lisp/debug.el 30 Aug 2009 14:19:28 -0000 1.114
+++ emacs-lisp/debug.el 2 Oct 2009 03:48:43 -0000 1.115
@@ -873,7 +873,8 @@
"Display a list of all the functions now set to debug on entry."
(interactive)
(require 'help-mode)
- (help-setup-xref '(debugger-list-functions) (interactive-p))
+ (help-setup-xref '(debugger-list-functions)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(with-current-buffer standard-output
(if (null debug-function-list)
Index: emacs-lisp/easy-mmode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/easy-mmode.el,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- emacs-lisp/easy-mmode.el 2 Oct 2009 00:02:05 -0000 1.97
+++ emacs-lisp/easy-mmode.el 2 Oct 2009 03:48:43 -0000 1.98
@@ -533,7 +533,7 @@
(error "No next %s" ,name))
(goto-char (match-beginning 0))
(when (and (eq (current-buffer) (window-buffer
(selected-window)))
- (interactive-p))
+ (called-interactively-p 'interactive))
(let ((endpt (or (save-excursion
,(if endfun `(,endfun)
`(re-search-forward ,re nil t 2)))
Index: emacs-lisp/eieio-opt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/eieio-opt.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- emacs-lisp/eieio-opt.el 1 Oct 2009 02:50:04 -0000 1.3
+++ emacs-lisp/eieio-opt.el 2 Oct 2009 03:48:43 -0000 1.4
@@ -80,7 +80,7 @@
(interactive (list (eieio-read-class "Class: ")))
(with-output-to-temp-buffer (help-buffer) ;"*Help*"
(help-setup-xref (list #'eieio-describe-class class headerfcn)
- (interactive-p))
+ (called-interactively-p 'interactive))
(when headerfcn (funcall headerfcn))
@@ -312,7 +312,8 @@
(if (not (generic-p generic))
(signal 'wrong-type-argument '(generic-p generic)))
(with-output-to-temp-buffer (help-buffer) ; "*Help*"
- (help-setup-xref (list #'eieio-describe-generic generic) (interactive-p))
+ (help-setup-xref (list #'eieio-describe-generic generic)
+ (called-interactively-p 'interactive))
(prin1 generic)
(princ " is a generic function")
Index: emacs-lisp/lisp-mnt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/lisp-mnt.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- emacs-lisp/lisp-mnt.el 5 Jan 2009 03:21:04 -0000 1.62
+++ emacs-lisp/lisp-mnt.el 2 Oct 2009 03:48:44 -0000 1.63
@@ -583,7 +583,7 @@
(let ((must-kill (and file (not (get-file-buffer file)))))
(when file (find-file file))
(prog1
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" (lm-summary))
(lm-summary))
(when must-kill (kill-buffer (current-buffer))))))))
Index: emacs-lisp/shadow.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/shadow.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- emacs-lisp/shadow.el 22 Jul 2009 02:34:11 -0000 1.31
+++ emacs-lisp/shadow.el 2 Oct 2009 03:48:44 -0000 1.32
@@ -241,7 +241,7 @@
(setq shadows (cdr (cdr shadows))))
(if stringp
(buffer-string)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(save-excursion
;; We are interactive.
;; Create the *Shadows* buffer and display shadowings there.
Index: emulation/cua-base.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/cua-base.el,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- emulation/cua-base.el 28 Aug 2009 04:25:03 -0000 1.101
+++ emulation/cua-base.el 2 Oct 2009 03:48:44 -0000 1.102
@@ -1599,7 +1599,7 @@
(if (nth 2 cua--saved-state)
(pc-selection-mode 1))
(setq shift-select-mode (nth 3 cua--saved-state))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "CUA mode disabled.%s%s%s%s"
(if (nth 1 cua--saved-state) " Delete-Selection" "")
(if (and (nth 1 cua--saved-state) (nth 2 cua--saved-state)) "
and" "")
Index: emulation/edt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/edt.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- emulation/edt.el 21 Aug 2009 07:24:30 -0000 1.68
+++ emulation/edt.el 2 Oct 2009 03:48:44 -0000 1.69
@@ -1272,7 +1272,7 @@
(/ (1- (+ (* (string-to-number bottom) 100) (window-height)))
(window-height)))))
;; report scroll margin settings if running interactively
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Scroll margins set. Top = %s%%, Bottom = %s%%"
edt-top-scroll-margin edt-bottom-scroll-margin)))
Index: emulation/tpu-edt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/tpu-edt.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- emulation/tpu-edt.el 22 Sep 2009 02:28:46 -0000 1.69
+++ emulation/tpu-edt.el 2 Oct 2009 03:48:44 -0000 1.70
@@ -884,7 +884,7 @@
(setq tpu-newline-and-indent-p t)
(tpu-local-set-key "\C-m" 'newline-and-indent)))
(tpu-update-mode-line)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Carriage return inserts a newline%s"
(if tpu-newline-and-indent-p " and indents." "."))))
@@ -1305,7 +1305,7 @@
(interactive)
(setq tpu-regexp-p (not tpu-regexp-p))
(tpu-set-search)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Regular expression search and substitute %sabled."
(if tpu-regexp-p "en" "dis"))))
@@ -1450,7 +1450,7 @@
(interactive)
(setq tpu-searching-forward (not tpu-searching-forward))
(tpu-set-search t)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Searching %sward."
(if tpu-searching-forward "for" "back"))))
@@ -1501,7 +1501,7 @@
(setq tpu-rectangular-p (not tpu-rectangular-p))
(setq tpu-rectangle-string (if tpu-rectangular-p " Rect" ""))
(tpu-update-mode-line)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Rectangular cut and paste %sabled."
(if tpu-rectangular-p "en" "dis"))))
@@ -2273,7 +2273,7 @@
"Toggle control key bindings between TPU-edt and Emacs."
(interactive)
(tpu-reset-control-keys (not tpu-control-keys))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Control keys function with %s bindings."
(if tpu-control-keys "TPU-edt" "Emacs"))))
@@ -2438,7 +2438,7 @@
;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free
tpu-set-scroll-margins
-;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el"
"a7e10e36bed23a02f05ec5a69ae8569a")
+;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el"
"54d496981b1b831be427cbe3521e01d1")
;;; Generated autoloads from tpu-extras.el
(autoload 'tpu-cursor-free-mode "tpu-extras" "\
Index: emulation/tpu-extras.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/tpu-extras.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- emulation/tpu-extras.el 5 Jan 2009 03:21:18 -0000 1.28
+++ emulation/tpu-extras.el 2 Oct 2009 03:48:44 -0000 1.29
@@ -436,7 +436,7 @@
(ad-enable-advice f 'around 'tpu-respect-bottom-scroll-margin)
(ad-activate f))
;; report scroll margin settings if running interactively
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Scroll margins set. Top = %s%%, Bottom = %s%%"
tpu-top-scroll-margin tpu-bottom-scroll-margin)))
Index: emulation/viper-cmd.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper-cmd.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- emulation/viper-cmd.el 15 Aug 2009 05:57:12 -0000 1.84
+++ emulation/viper-cmd.el 2 Oct 2009 03:48:44 -0000 1.85
@@ -3773,7 +3773,7 @@
"///" 'vi-state
[2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e
return]
scope)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message
"// and /// now toggle case-sensitivity and regexp search")))
(viper-unrecord-kbd-macro "//" 'vi-state)
@@ -3796,7 +3796,7 @@
"%%%" 'vi-state
[(meta x) v i p e r - t o g g l e - p a r s e - s e x p - i g n o
r e - c o m m e n t s return]
't)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message
"%%%%%% now toggles whether comments should be parsed for
matching parentheses")))
(viper-unrecord-kbd-macro "%%%" 'vi-state))))
@@ -3825,7 +3825,7 @@
"///" 'emacs-state
[2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e
return]
(or arg-majormode major-mode))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message
"// and /// now toggle case-sensitivity and regexp search.")))
(viper-unrecord-kbd-macro "//" 'emacs-state)
Index: emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- emulation/viper.el 28 Aug 2009 17:02:55 -0000 1.123
+++ emulation/viper.el 2 Oct 2009 03:48:44 -0000 1.124
@@ -897,7 +897,8 @@
(defadvice self-insert-command (around viper-self-insert-ad activate)
"Ignore all self-inserting keys in the vi-state."
- (if (and (eq viper-current-state 'vi-state) (interactive-p))
+ (if (and (eq viper-current-state 'vi-state)
+ (called-interactively-p 'interactive))
(beep 1)
ad-do-it
))
Index: eshell/esh-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/eshell/esh-mode.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- eshell/esh-mode.el 22 Jan 2009 06:33:07 -0000 1.43
+++ eshell/esh-mode.el 2 Oct 2009 03:48:44 -0000 1.44
@@ -999,10 +999,10 @@
(beginning-of-line)
(let ((pos (point)))
(if (bobp)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Buffer too short to truncate"))
(delete-region (point-min) (point))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Truncated buffer from %d to %d lines (%.1fk freed)"
lines eshell-buffer-maximum-lines
(/ pos 1024.0))))))))
Index: international/mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -b -r1.370 -r1.371
--- international/mule-cmds.el 11 Sep 2009 21:07:02 -0000 1.370
+++ international/mule-cmds.el 2 Oct 2009 03:48:44 -0000 1.371
@@ -403,7 +403,7 @@
(let ((base (coding-system-base coding-system))
(eol-type (coding-system-eol-type coding-system)))
(set-coding-system-priority base)
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(or (eq base coding-system)
(message "Highest priority is set to %s (base of %s)"
base coding-system)))
@@ -1530,7 +1530,7 @@
(setq input-method (symbol-name input-method)))
(help-setup-xref (list #'describe-input-method
(or input-method current-input-method))
- (interactive-p))
+ (called-interactively-p 'interactive))
(if (null input-method)
(describe-current-input-method)
@@ -1544,7 +1544,7 @@
(error
(activate-input-method current)
(help-setup-xref (list #'describe-input-method input-method)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(let ((elt (assoc input-method input-method-alist)))
(princ (format
@@ -2067,7 +2067,7 @@
(require feature))
(let ((doc (get-language-info language-name 'documentation)))
(help-setup-xref (list #'describe-language-environment language-name)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(save-excursion
(set-buffer standard-output)
Index: international/mule-diag.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-diag.el,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- international/mule-diag.el 3 Sep 2009 06:55:02 -0000 1.132
+++ international/mule-diag.el 2 Oct 2009 03:48:44 -0000 1.133
@@ -67,7 +67,8 @@
With prefix ARG, the output format gets more cryptic,
but still shows the full information."
(interactive "P")
- (help-setup-xref (list #'list-character-sets arg) (interactive-p))
+ (help-setup-xref (list #'list-character-sets arg)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer "*Character Set List*"
(with-current-buffer standard-output
(if arg
@@ -314,7 +315,8 @@
(interactive (list (read-charset "Charset: ")))
(or (charsetp charset)
(error "Invalid charset: %S" charset))
- (help-setup-xref (list #'describe-character-set charset) (interactive-p))
+ (help-setup-xref (list #'describe-character-set charset)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(with-current-buffer standard-output
(insert "Character set: " (symbol-name charset))
@@ -419,7 +421,7 @@
(if (null coding-system)
(describe-current-coding-system)
(help-setup-xref (list #'describe-coding-system coding-system)
- (interactive-p))
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(print-coding-system-briefly coding-system 'doc-string)
(let ((type (coding-system-type coding-system))
@@ -983,7 +985,8 @@
(if (= (length fontset) 0)
(setq fontset (face-attribute 'default :fontset))
(setq fontset (query-fontset fontset)))
- (help-setup-xref (list #'describe-fontset fontset) (interactive-p))
+ (help-setup-xref (list #'describe-fontset fontset)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(with-current-buffer standard-output
(print-fontset fontset t))))
@@ -999,7 +1002,8 @@
(interactive "P")
(if (not (and window-system (fboundp 'fontset-list)))
(error "No fontsets being used")
- (help-setup-xref (list #'list-fontsets arg) (interactive-p))
+ (help-setup-xref (list #'list-fontsets arg)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(with-current-buffer standard-output
;; This code is duplicated near the end of mule-diag.
@@ -1018,7 +1022,8 @@
(defun list-input-methods ()
"Display information about all input methods."
(interactive)
- (help-setup-xref '(list-input-methods) (interactive-p))
+ (help-setup-xref '(list-input-methods)
+ (called-interactively-p 'interactive))
(with-output-to-temp-buffer (help-buffer)
(list-input-methods-1)
(with-current-buffer standard-output
Index: mail/sendmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/sendmail.el,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- mail/sendmail.el 13 Sep 2009 00:53:01 -0000 1.331
+++ mail/sendmail.el 2 Oct 2009 03:48:45 -0000 1.332
@@ -1437,7 +1437,7 @@
;; whitespace, so that we don't modify the buffer needlessly.
(if (and (memq mail-signature '(t nil))
(not (file-readable-p mail-signature-file)))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "The signature file `%s' could not be read"
mail-signature-file))
(save-excursion
Index: net/ange-ftp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/ange-ftp.el,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- net/ange-ftp.el 1 Oct 2009 15:33:44 -0000 1.110
+++ net/ange-ftp.el 2 Oct 2009 03:48:45 -0000 1.111
@@ -3797,7 +3797,7 @@
keep-date
nil
nil
- (interactive-p)))
+ (called-interactively-p 'interactive)))
(defun ange-ftp-copy-files-async (okay-p line verbose-p files)
"Copy some files in the background.
Index: net/browse-url.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- net/browse-url.el 2 Oct 2009 00:02:06 -0000 1.81
+++ net/browse-url.el 2 Oct 2009 03:48:45 -0000 1.82
@@ -770,7 +770,7 @@
Prompts for a URL, defaulting to the URL at or before point. Variable
`browse-url-browser-function' says which browser to use."
(interactive (browse-url-interactive-arg "URL: "))
- (unless (interactive-p)
+ (unless (called-interactively-p 'interactive)
(setq args (or args (list browse-url-new-window-flag))))
(let ((process-environment (copy-sequence process-environment)))
;; When connected to various displays, be careful to use the display of
Index: net/eudc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/eudc.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- net/eudc.el 18 Sep 2009 07:07:37 -0000 1.30
+++ net/eudc.el 2 Oct 2009 03:48:45 -0000 1.31
@@ -706,7 +706,7 @@
(setq eudc-server server)
(eudc-update-local-variables)
(run-hooks 'eudc-switch-to-server-hook)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Current directory server is now %s (%s)" eudc-server
eudc-protocol))
(if (null no-save)
(eudc-save-options)))
@@ -753,9 +753,10 @@
otherwise a list of symbols is returned."
(interactive)
(if eudc-list-attributes-function
- (let ((entries (funcall eudc-list-attributes-function (interactive-p))))
+ (let ((entries (funcall eudc-list-attributes-function
+ (called-interactively-p 'interactive))))
(if entries
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(eudc-display-records entries t)
entries)))
(error "The %s protocol has no support for listing attributes"
eudc-protocol)))
Index: net/quickurl.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/quickurl.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- net/quickurl.el 5 Jan 2009 03:22:46 -0000 1.20
+++ net/quickurl.el 2 Oct 2009 03:48:45 -0000 1.21
@@ -368,7 +368,7 @@
(quickurl-load-urls)
(let* ((current-url (quickurl-find-url word))
(add-it (if current-url
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(y-or-n-p (format "\"%s\" exists, replace URL?
" word))
t)
t)))
@@ -382,7 +382,7 @@
(quickurl-save-urls)
(when (get-buffer quickurl-list-buffer-name)
(quickurl-list-populate-buffer))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Added %s" url))))))
;;;###autoload
Index: net/rcirc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- net/rcirc.el 2 Sep 2009 03:20:48 -0000 1.52
+++ net/rcirc.el 2 Oct 2009 03:48:45 -0000 1.53
@@ -2014,7 +2014,7 @@
"Display list of names in CHANNEL or in current channel if CHANNEL is nil.
If called interactively, prompt for a channel when prefix arg is supplied."
(interactive "P")
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(if channel
(setq channel (read-string "List names in channel: " target))))
(let ((channel (if (> (length channel) 0)
@@ -2026,7 +2026,7 @@
"List TOPIC for the TARGET channel.
With a prefix arg, prompt for new topic."
(interactive "P")
- (if (and (interactive-p) topic)
+ (if (and (called-interactively-p 'interactive) topic)
(setq topic (read-string "New Topic: " rcirc-topic)))
(rcirc-send-string process (concat "TOPIC " target
(when (> (length topic) 0)
Index: net/xesam.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/xesam.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- net/xesam.el 5 Jan 2009 03:22:50 -0000 1.15
+++ net/xesam.el 2 Oct 2009 03:48:45 -0000 1.16
@@ -502,7 +502,7 @@
'face 'xesam-mode-line
'help-echo (when xesam-debug xesam-xml-string)))))))
- (when (not (interactive-p))
+ (when (not (called-interactively-p 'interactive))
;; Initialize buffer.
(setq buffer-read-only t)
(let ((inhibit-read-only t))
Index: play/5x5.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/play/5x5.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- play/5x5.el 4 Sep 2009 06:58:59 -0000 1.29
+++ play/5x5.el 2 Oct 2009 03:48:45 -0000 1.30
@@ -211,7 +211,8 @@
(defun 5x5-new-game ()
"Start a new game of `5x5'."
(interactive)
- (when (if (interactive-p) (5x5-y-or-n-p "Start a new game? ") t)
+ (when (if (called-interactively-p 'interactive)
+ (5x5-y-or-n-p "Start a new game? ") t)
(setq 5x5-x-pos (/ 5x5-grid-size 2)
5x5-y-pos (/ 5x5-grid-size 2)
5x5-moves 0
Index: play/yow.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/play/yow.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- play/yow.el 21 Aug 2009 07:24:30 -0000 1.41
+++ play/yow.el 2 Oct 2009 03:48:45 -0000 1.42
@@ -91,7 +91,7 @@
(setq i (1+ i))))
(and matches
(setq matches (sort matches 'string-lessp)))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(cond ((null matches)
(message "No matches found."))
(t
Index: progmodes/ada-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/ada-mode.el,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- progmodes/ada-mode.el 22 Aug 2009 19:29:27 -0000 1.103
+++ progmodes/ada-mode.el 2 Oct 2009 03:48:45 -0000 1.104
@@ -135,7 +135,7 @@
"Return Ada mode version."
(interactive)
(let ((version-string "4.00"))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message version-string)
version-string)))
Index: progmodes/f90.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/f90.el,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- progmodes/f90.el 3 Sep 2009 06:41:50 -0000 1.122
+++ progmodes/f90.el 2 Oct 2009 03:48:45 -0000 1.123
@@ -1505,7 +1505,8 @@
matching-beg
;; Note this includes the case of an un-named main program,
;; in which case we go to (point-min).
- (if (interactive-p) (message "No beginning found"))
+ (if (called-interactively-p 'interactive)
+ (message "No beginning found"))
nil)))
(defun f90-end-of-subprogram ()
@@ -1530,7 +1531,8 @@
;;; (forward-line 1)
(if (zerop count)
matching-end
- (if (interactive-p) (message "No end found"))
+ (if (called-interactively-p 'interactive)
+ (message "No end found"))
nil)))
@@ -1542,7 +1544,8 @@
completes outermost block if `f90-smart-end' is non-nil.
Interactively, pushes mark before moving point."
(interactive "p")
- (if (interactive-p) (push-mark (point) t)) ; can move some distance
+ (if (called-interactively-p 'interactive)
+ (push-mark (point) t)) ; can move some distance
(and num (< num 0) (f90-beginning-of-block (- num)))
(let ((f90-smart-end (if f90-smart-end 'no-blink)) ; for final match-end
(case-fold-search t)
@@ -1598,7 +1601,7 @@
Does not check the outermost block, because it may be incomplete.
Interactively, pushes mark before moving point."
(interactive "p")
- (if (interactive-p) (push-mark (point) t))
+ (if (called-interactively-p 'interactive) (push-mark (point) t))
(and num (< num 0) (f90-end-of-block (- num)))
(let ((case-fold-search t)
(count (or num 1))
Index: progmodes/fortran.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/fortran.el,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- progmodes/fortran.el 10 Sep 2009 06:19:53 -0000 1.155
+++ progmodes/fortran.el 2 Oct 2009 03:48:46 -0000 1.156
@@ -1295,7 +1295,7 @@
not check for consistency of block types. Interactively, pushes
mark before moving point."
(interactive "p")
- (if (interactive-p) (push-mark (point) t))
+ (if (called-interactively-p 'interactive) (push-mark (point) t))
(and num (< num 0) (fortran-beginning-of-block (- num)))
(let ((case-fold-search t)
(count (or num 1)))
@@ -1328,7 +1328,7 @@
Does not check for consistency of block types. Interactively,
pushes mark before moving point."
(interactive "p")
- (if (interactive-p) (push-mark (point) t))
+ (if (called-interactively-p 'interactive) (push-mark (point) t))
(and num (< num 0) (fortran-end-of-block (- num)))
(let ((case-fold-search t)
(count (or num 1)))
Index: progmodes/js.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/js.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- progmodes/js.el 18 Sep 2009 07:16:52 -0000 1.7
+++ progmodes/js.el 2 Oct 2009 03:48:46 -0000 1.8
@@ -1595,7 +1595,7 @@
(let* ((syntactic-context (js--syntactic-context-from-pstate
(js--parse-state-at-point))))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Syntactic context: %s" syntactic-context))
syntactic-context))
@@ -2821,7 +2821,7 @@
(setq num (js--js-funcall '(repl "_jsGC") (or keys [])))
(setq js--js-last-gcs-done this-gcs-done)
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "Cleaned %s entries" num))
num)))
@@ -2835,7 +2835,7 @@
(let* ((content-window (js--js-content-window
(js--get-js-context)))
(result (js-eval content-window js)))
- (when (interactive-p)
+ (when (called-interactively-p 'interactive)
(message "%s" (js! "String" result)))
result)))
Index: progmodes/python.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- progmodes/python.el 1 Sep 2009 03:18:53 -0000 1.97
+++ progmodes/python.el 2 Oct 2009 03:48:46 -0000 1.98
@@ -1785,7 +1785,8 @@
(with-output-to-temp-buffer (help-buffer)
(with-current-buffer standard-output
;; Fixme: Is this actually useful?
- (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p))
+ (help-setup-xref (list 'python-describe-symbol symbol)
+ (called-interactively-p 'interactive))
(set (make-local-variable 'comint-redirect-subvert-readonly) t)
(help-print-return-message))))
(comint-redirect-send-command-to-process (format "emacs.ehelp(%S, %s)"
@@ -2797,7 +2798,7 @@
(python-toggle-shells python-default-interpreter))
(let ((args python-which-args))
(when (and argprompt
- (interactive-p)
+ (called-interactively-p 'interactive)
(fboundp 'split-string))
;; TBD: Perhaps force "-i" in the final list?
(setq args (split-string
Index: term/ns-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- term/ns-win.el 27 Sep 2009 16:06:04 -0000 1.55
+++ term/ns-win.el 2 Oct 2009 03:48:46 -0000 1.56
@@ -888,7 +888,7 @@
(defun ns-print-buffer ()
"Interactive front-end to `print-buffer': asks for user confirmation first."
(interactive)
- (if (and (interactive-p)
+ (if (and (called-interactively-p 'interactive)
(or (listp last-nonmenu-event)
(and (char-or-string-p (event-basic-type last-command-event))
(memq 'super (event-modifiers last-command-event)))))
Index: textmodes/bibtex.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/bibtex.el,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- textmodes/bibtex.el 24 Sep 2009 01:37:21 -0000 1.149
+++ textmodes/bibtex.el 2 Oct 2009 03:48:46 -0000 1.150
@@ -3334,7 +3334,8 @@
((looking-at bibtex-any-valid-entry-type)
;; Parsing of entry failed
(error "Syntactically incorrect BibTeX entry starts here"))
- (t (if (interactive-p) (message "Not on a known BibTeX entry."))
+ (t (if (called-interactively-p 'interactive)
+ (message "Not on a known BibTeX entry."))
(goto-char pnt)))
(point)))
@@ -4749,9 +4750,10 @@
(error "Match failed: %s" text)))
(if fmt (apply 'format fmt (nreverse obj))
(apply 'concat (nreverse obj)))))
- (if (interactive-p) (message "%s" url))
+ (if (called-interactively-p 'interactive) (message "%s" url))
(unless no-browse (browse-url url)))
- (if (and (not url) (interactive-p)) (message "No URL known."))
+ (if (and (not url) (called-interactively-p 'interactive))
+ (message "No URL known."))
url)))
Index: textmodes/flyspell.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/flyspell.el,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- textmodes/flyspell.el 23 Sep 2009 23:05:40 -0000 1.147
+++ textmodes/flyspell.el 2 Oct 2009 03:48:46 -0000 1.148
@@ -604,7 +604,7 @@
;; the welcome message
(if (and flyspell-issue-message-flag
flyspell-issue-welcome-flag
- (interactive-p))
+ (called-interactively-p 'interactive))
(let ((binding (where-is-internal 'flyspell-auto-correct-word
nil 'non-ascii)))
(message "%s"
Index: textmodes/page-ext.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/page-ext.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- textmodes/page-ext.el 10 Jan 2009 22:03:12 -0000 1.42
+++ textmodes/page-ext.el 2 Oct 2009 03:48:47 -0000 1.43
@@ -507,7 +507,7 @@
(if (not reset-p)
(setq page-delimiter regexp)
(setq page-delimiter original-page-delimiter))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "The value of `page-delimiter' is now: %s" page-delimiter)))
@@ -565,7 +565,7 @@
(setq regexp pages-directory-previous-regexp)
(setq pages-directory-previous-regexp regexp))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Creating directory for: %s "
(buffer-name)))
@@ -633,7 +633,7 @@
(set-buffer standard-output)
;; Put positions in increasing order to go with buffer.
(setq pages-pos-list (nreverse pages-pos-list))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%d matching lines in: %s"
(length pages-pos-list) (buffer-name pages-target-buffer))))
(pop-to-buffer pages-directory-buffer)
@@ -765,7 +765,7 @@
(list (if current-prefix-arg
(read-file-name "Filename: " pages-addresses-file-name))))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Creating directory for: %s "
(or filename pages-addresses-file-name)))
(if (file-exists-p (or filename pages-addresses-file-name))
Index: textmodes/table.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/table.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- textmodes/table.el 21 Aug 2009 07:24:32 -0000 1.42
+++ textmodes/table.el 2 Oct 2009 03:48:47 -0000 1.43
@@ -2044,7 +2044,7 @@
(interactive "i\ni\np")
(table--make-cell-map)
(if (or force (not (memq (table--get-last-command) table-command-list)))
- (let* ((cell (table--probe-cell (interactive-p)))
+ (let* ((cell (table--probe-cell (called-interactively-p 'interactive)))
(cache-buffer (get-buffer-create table-cache-buffer-name))
(modified-flag (buffer-modified-p))
(inhibit-read-only t))
@@ -2953,7 +2953,7 @@
(setq table-rb (cdr starting-cell))
(setq col-list (cons (car (table--get-coordinate (car starting-cell)))
nil))
(setq row-list (cons (cdr (table--get-coordinate (car starting-cell)))
nil))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Computing cell dimension..."))
(while
(progn
@@ -2980,7 +2980,7 @@
(th (+ 3 (- (cdr table-rb-coordinate) (cdr
table-lu-coordinate))))
(c (length col-list))
(r (length row-list)))
- (and (interactive-p)
+ (and (called-interactively-p 'interactive)
(message "Cell: (%dw, %dh), Table: (%dw, %dh), Dim: (%dc, %dr),
Total Cells: %d" cw ch tw th c r cells))
(list cw ch tw th c r cells))))))
@@ -3025,7 +3025,8 @@
(read-buffer "Destination buffer: " (concat table-dest-buffer-name "."
language))
(table--read-from-minibuffer '("Table Caption" .
table-source-caption-history)))))
(let ((default-buffer-name (concat table-dest-buffer-name "." (symbol-name
language))))
- (unless (or (interactive-p) (table--probe-cell)) (error "Table not found
here"))
+ (unless (or (called-interactively-p 'interactive) (table--probe-cell))
+ (error "Table not found here"))
(unless (bufferp dest-buffer)
(setq dest-buffer (get-buffer-create (or dest-buffer
default-buffer-name))))
(if (string= (buffer-name dest-buffer) default-buffer-name)
@@ -3047,7 +3048,7 @@
(let ((wheel [?- ?\\ ?| ?/]))
(while
(progn
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(progn
(message "Analyzing table...%c" (aref wheel i))
(if (eq (setq i (1+ i)) (length wheel))
@@ -3084,7 +3085,7 @@
;; insert closing
(table--generate-source-epilogue dest-buffer language col-list
row-list))
;; lastly do some convenience work
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(save-selected-window
(pop-to-buffer dest-buffer t)
(goto-char (point-min))
@@ -3433,9 +3434,10 @@
(format "Justify (default %s): " default)
'(("left") ("center") ("right"))
nil t nil 'table-sequence-justify-history
default)))))))
- (unless (or (interactive-p) (table--probe-cell)) (error "Table not found
here"))
+ (unless (or (called-interactively-p 'interactive) (table--probe-cell))
+ (error "Table not found here"))
(string-match "\\([0-9]*\\)\\([]})>]*\\)\\'" str)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Sequencing..."))
(let* ((prefix (substring str 0 (match-beginning 1)))
(index (match-string 1 str))
@@ -3483,7 +3485,7 @@
(setq cells (1- cells))
(and (> n 0) (> cells 0)))))
(table-recognize-cell 'force)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "Sequencing...done"))
))
@@ -5344,7 +5346,7 @@
This feature is disabled when `table-disable-incompatibility-warning'
is non-nil. The warning is done only once per session for each item."
(unless (and table-disable-incompatibility-warning
- (not (interactive-p)))
+ (not (called-interactively-p 'interactive)))
(cond ((and (featurep 'xemacs)
(not (get 'table-disable-incompatibility-warning 'xemacs)))
(put 'table-disable-incompatibility-warning 'xemacs t)
Index: textmodes/tex-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/tex-mode.el,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- textmodes/tex-mode.el 1 Sep 2009 07:24:21 -0000 1.225
+++ textmodes/tex-mode.el 2 Oct 2009 03:48:47 -0000 1.226
@@ -1274,7 +1274,7 @@
(let ((no-matches (zerop num-matches)))
(if no-matches
(insert "None!\n"))
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message (cond (no-matches "No mismatches found")
((= num-matches 1) "1 mismatch found")
(t "%d mismatches found"))
Index: textmodes/texinfmt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/texinfmt.el,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- textmodes/texinfmt.el 5 Jan 2009 03:24:13 -0000 1.97
+++ textmodes/texinfmt.el 2 Oct 2009 03:48:47 -0000 1.98
@@ -38,7 +38,7 @@
(format "Version of \`texinfmt.el\': %s" texinfmt-version)))
(if here
(insert version-string)
- (if (interactive-p)
+ (if (called-interactively-p 'interactive)
(message "%s" version-string)
version-string))))
@@ -171,7 +171,8 @@
(message (setq lastmessage "Splitting Info file..."))
(Info-split))))
(message (concat lastmessage
- (if (interactive-p) "done. Now save it." "done.")))))
+ (if (called-interactively-p 'interactive)
+ "done. Now save it." "done.")))))
(defvar texinfo-region-buffer-name "*Info Region*"
"*Name of the temporary buffer used by \\[texinfo-format-region].")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el bookm...,
Juanma Barranquero <=