Changeset 3894 for trunk/lisp/emacs-lisp/advice.el

Timestamp:

2005年10月02日 09時47分43秒 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/emacs-lisp/advice.el (modified) (17 diffs)

trunk/lisp/emacs-lisp/advice.el

@@ -2219 +2219 @@
-         (function
-          (completing-read
-(default %s) " (or prompt "Function: 
+ (default %s): " (or prompt "Function
-           ad-advised-functions
-           (if predicate
@@ -2251 +2251 @@
-            (error "ad-read-advice-class: `%s' has no advices" function)))
-  (let ((class (completing-read
-(default %s) " (or prompt "Class: 
+ (default %s): " (or prompt "Class
-                ad-advice-class-completion-table nil t)))
-    (if (equal class "")
@@ -2269 +2269 @@
-                      function class)
-             (car (car name-completion-table))))
-(default %s) " (or prompt "Name: 
+ (default %s): " (or prompt "Name
-         (name (completing-read prompt name-completion-table nil t)))
-    (if (equal name "")
@@ -2290 +2290 @@
-  "Read a regular expression from the minibuffer."
-  (let ((regexp (read-from-minibuffer
-: 
-
-(default \"%s\")
+
+: 
+ (default %s):
-    (setq ad-last-regexp
-          (if (equal regexp "") ad-last-regexp regexp))))
@@ -2353 +2353 @@
-(defun ad-enable-advice (function class name)
-  "Enables the advice of FUNCTION with CLASS and NAME."
-: 
+
-  (if (ad-is-advised function)
-      (if (eq (ad-enable-advice-internal function class name t) 0)
@@ -2362 +2362 @@
-(defun ad-disable-advice (function class name)
-  "Disable the advice of FUNCTION with CLASS and NAME."
-: 
+
-  (if (ad-is-advised function)
-      (if (eq (ad-enable-advice-internal function class name nil) 0)
@@ -2386 +2386 @@
-All currently advised functions will be considered."
-  (interactive
-: 
+
-  (let ((matched-advices (ad-enable-regexp-internal regexp 'any t)))
-    (if (interactive-p)
@@ -2396 +2396 @@
-All currently advised functions will be considered."
-  (interactive
-: 
+
-  (let ((matched-advices (ad-enable-regexp-internal regexp 'any nil)))
-    (if (interactive-p)
@@ -2406 +2406 @@
-If such an advice was found it will be removed from the list of advices
-in that CLASS."
-: 
+
-  (if (ad-is-advised function)
-      (let* ((advice-to-remove (ad-find-advice function class name)))
@@ -3286 +3286 @@
-advised definition from scratch."
-  (interactive
-: 
+
-  (ad-set-advice-info-field function 'cache nil))
-
@@ -3603 +3603 @@
-definition will always be cached for later usage."
-  (interactive
-: 
+
-         current-prefix-arg))
-  (if ad-activate-on-top-level
@@ -3633 +3633 @@
-a call to `ad-activate'."
-  (interactive
-: 
+
-  (if (not (ad-is-advised function))
-      (error "ad-deactivate: `%s' is not advised" function)
@@ -3651 +3651 @@
-  (interactive
-   (list (ad-read-advised-function
-: 
+
-  (if (ad-is-active function)
-      (ad-activate function compile)))
@@ -3659 +3659 @@
-If FUNCTION was not advised this will be a noop."
-  (interactive
-: 
+
-  (cond ((ad-is-advised function)
-         (if (ad-is-active function)
@@ -3690 +3690 @@
-See `ad-activate' for documentation on the optional COMPILE argument."
-  (interactive
-: 
+
-         current-prefix-arg))
-  (ad-do-advised-functions (function)
@@ -3701 +3701 @@
-that has at least one piece of advice whose name includes a match for REGEXP."
-  (interactive
-: 
+
-  (ad-do-advised-functions (function)
-    (if (ad-find-some-advice function 'any regexp)
@@ -3712 +3712 @@
-See `ad-activate' for documentation on the optional COMPILE argument."
-  (interactive
-: 
+
-         current-prefix-arg))
-  (ad-do-advised-functions (function)