diff options
| author | Richard M. Stallman | 1998-05-14 05:39:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-05-14 05:39:59 +0000 |
| commit | 2036d16f5156093a02c384dffeec1bd766d0fee2 (patch) | |
| tree | c56c6c0a1a7e8629d4d51f8c9c09119fcae62d36 | |
| parent | 0f2aa0e118094903e79b5acd7b30faafd4bd8615 (diff) | |
| download | emacs-2036d16f5156093a02c384dffeec1bd766d0fee2.tar.gz emacs-2036d16f5156093a02c384dffeec1bd766d0fee2.zip | |
(ad-handle-definition, defadvice): Fix error messages.
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 33e2ab6b4fc..afb2c419778 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el | |||
| @@ -3557,7 +3557,7 @@ the value of `ad-redefinition-action' and de/activate again." | |||
| 3557 | ;; we have a redefinition: | 3557 | ;; we have a redefinition: |
| 3558 | (if (not (memq ad-redefinition-action '(accept discard warn))) | 3558 | (if (not (memq ad-redefinition-action '(accept discard warn))) |
| 3559 | (error "ad-handle-definition (see its doc): `%s' %s" | 3559 | (error "ad-handle-definition (see its doc): `%s' %s" |
| 3560 | function "illegally redefined") | 3560 | function "invalidly redefined") |
| 3561 | (if (eq ad-redefinition-action 'discard) | 3561 | (if (eq ad-redefinition-action 'discard) |
| 3562 | (ad-safe-fset function original-definition) | 3562 | (ad-safe-fset function original-definition) |
| 3563 | (ad-set-orig-definition function current-definition) | 3563 | (ad-set-orig-definition function current-definition) |
| @@ -3794,13 +3794,13 @@ during preloading. | |||
| 3794 | 3794 | ||
| 3795 | Look at the file `advice.el' for comprehensive documentation." | 3795 | Look at the file `advice.el' for comprehensive documentation." |
| 3796 | (if (not (ad-name-p function)) | 3796 | (if (not (ad-name-p function)) |
| 3797 | (error "defadvice: Illegal function name: %s" function)) | 3797 | (error "defadvice: Invalid function name: %s" function)) |
| 3798 | (let* ((class (car args)) | 3798 | (let* ((class (car args)) |
| 3799 | (name (if (not (ad-class-p class)) | 3799 | (name (if (not (ad-class-p class)) |
| 3800 | (error "defadvice: Illegal advice class: %s" class) | 3800 | (error "defadvice: Invalid advice class: %s" class) |
| 3801 | (nth 1 args))) | 3801 | (nth 1 args))) |
| 3802 | (position (if (not (ad-name-p name)) | 3802 | (position (if (not (ad-name-p name)) |
| 3803 | (error "defadvice: Illegal advice name: %s" name) | 3803 | (error "defadvice: Invalid advice name: %s" name) |
| 3804 | (setq args (nthcdr 2 args)) | 3804 | (setq args (nthcdr 2 args)) |
| 3805 | (if (ad-position-p (car args)) | 3805 | (if (ad-position-p (car args)) |
| 3806 | (prog1 (car args) | 3806 | (prog1 (car args) |
| @@ -3817,7 +3817,7 @@ Look at the file `advice.el' for comprehensive documentation." | |||
| 3817 | (cond ((eq completion t) flag) | 3817 | (cond ((eq completion t) flag) |
| 3818 | ((assoc completion ad-defadvice-flags) | 3818 | ((assoc completion ad-defadvice-flags) |
| 3819 | (intern completion)) | 3819 | (intern completion)) |
| 3820 | (t (error "defadvice: Illegal or ambiguous flag: %s" | 3820 | (t (error "defadvice: Invalid or ambiguous flag: %s" |
| 3821 | flag)))))) | 3821 | flag)))))) |
| 3822 | args)) | 3822 | args)) |
| 3823 | (advice (ad-make-advice | 3823 | (advice (ad-make-advice |