diff options
| author | Robert Cochran | 2016-08-19 18:03:24 -0700 |
|---|---|---|
| committer | Noam Postavsky | 2016-09-03 12:02:04 -0400 |
| commit | 2ad16e4bf9b43c169bcfa1e6240584488fbc3d78 (patch) | |
| tree | b4865b834918ad5ad738539ef3add718d96529c5 | |
| parent | 5fbba6cceaf843cfca449eb000a0a65243b61808 (diff) | |
| download | emacs-2ad16e4bf9b43c169bcfa1e6240584488fbc3d78.tar.gz emacs-2ad16e4bf9b43c169bcfa1e6240584488fbc3d78.zip | |
Fix uses of (call-interactively) in lisp/emacs-lisp/checkdoc.el
Passing the prefix argument as the 3rd argument to 'call-interactively'
causes the prefix argument to be interpreted as events, which is not
only wrong, but also causes a type error, as 'current-prefix-arg' can
never be a vector as 'call-interactively' expects. 'call-interactively'
automatically passes its prefix argument to the called function, so just
do that, eliminating faulty behavior.
* lisp/emacs-lisp/checkdoc.el (checkdoc-ispell):
(checkdoc-ispell-current-buffer):
(checkdoc-ispell-interactive):
(checkdoc-ispell-message-text):
(checkdoc-ispell-start):
(checkdoc-ispell-continue):
(checkdoc-ispell-comments):
(checkdoc-ispell-defun):
Do not pass 'current-prefix-arg' to 'call-interactively' as an event
vector; merely allow it to propagate forward to the interactive call.
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 3a81adeb6a6..769c2fe5741 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el | |||
| @@ -1062,7 +1062,7 @@ Calls `checkdoc' with spell-checking turned on. | |||
| 1062 | Prefix argument is the same as for `checkdoc'" | 1062 | Prefix argument is the same as for `checkdoc'" |
| 1063 | (interactive) | 1063 | (interactive) |
| 1064 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1064 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1065 | (call-interactively #'checkdoc nil current-prefix-arg))) | 1065 | (call-interactively #'checkdoc))) |
| 1066 | 1066 | ||
| 1067 | ;;;###autoload | 1067 | ;;;###autoload |
| 1068 | (defun checkdoc-ispell-current-buffer () | 1068 | (defun checkdoc-ispell-current-buffer () |
| @@ -1071,7 +1071,7 @@ Calls `checkdoc-current-buffer' with spell-checking turned on. | |||
| 1071 | Prefix argument is the same as for `checkdoc-current-buffer'" | 1071 | Prefix argument is the same as for `checkdoc-current-buffer'" |
| 1072 | (interactive) | 1072 | (interactive) |
| 1073 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1073 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1074 | (call-interactively #'checkdoc-current-buffer nil current-prefix-arg))) | 1074 | (call-interactively #'checkdoc-current-buffer))) |
| 1075 | 1075 | ||
| 1076 | ;;;###autoload | 1076 | ;;;###autoload |
| 1077 | (defun checkdoc-ispell-interactive () | 1077 | (defun checkdoc-ispell-interactive () |
| @@ -1080,7 +1080,7 @@ Calls `checkdoc-interactive' with spell-checking turned on. | |||
| 1080 | Prefix argument is the same as for `checkdoc-interactive'" | 1080 | Prefix argument is the same as for `checkdoc-interactive'" |
| 1081 | (interactive) | 1081 | (interactive) |
| 1082 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1082 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1083 | (call-interactively #'checkdoc-interactive nil current-prefix-arg))) | 1083 | (call-interactively #'checkdoc-interactive))) |
| 1084 | 1084 | ||
| 1085 | ;;;###autoload | 1085 | ;;;###autoload |
| 1086 | (defun checkdoc-ispell-message-interactive () | 1086 | (defun checkdoc-ispell-message-interactive () |
| @@ -1099,7 +1099,7 @@ Calls `checkdoc-message-text' with spell-checking turned on. | |||
| 1099 | Prefix argument is the same as for `checkdoc-message-text'" | 1099 | Prefix argument is the same as for `checkdoc-message-text'" |
| 1100 | (interactive) | 1100 | (interactive) |
| 1101 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1101 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1102 | (call-interactively #'checkdoc-message-text nil current-prefix-arg))) | 1102 | (call-interactively #'checkdoc-message-text))) |
| 1103 | 1103 | ||
| 1104 | ;;;###autoload | 1104 | ;;;###autoload |
| 1105 | (defun checkdoc-ispell-start () | 1105 | (defun checkdoc-ispell-start () |
| @@ -1108,7 +1108,7 @@ Calls `checkdoc-start' with spell-checking turned on. | |||
| 1108 | Prefix argument is the same as for `checkdoc-start'" | 1108 | Prefix argument is the same as for `checkdoc-start'" |
| 1109 | (interactive) | 1109 | (interactive) |
| 1110 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1110 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1111 | (call-interactively #'checkdoc-start nil current-prefix-arg))) | 1111 | (call-interactively #'checkdoc-start))) |
| 1112 | 1112 | ||
| 1113 | ;;;###autoload | 1113 | ;;;###autoload |
| 1114 | (defun checkdoc-ispell-continue () | 1114 | (defun checkdoc-ispell-continue () |
| @@ -1117,7 +1117,7 @@ Calls `checkdoc-continue' with spell-checking turned on. | |||
| 1117 | Prefix argument is the same as for `checkdoc-continue'" | 1117 | Prefix argument is the same as for `checkdoc-continue'" |
| 1118 | (interactive) | 1118 | (interactive) |
| 1119 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1119 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1120 | (call-interactively #'checkdoc-continue nil current-prefix-arg))) | 1120 | (call-interactively #'checkdoc-continue))) |
| 1121 | 1121 | ||
| 1122 | ;;;###autoload | 1122 | ;;;###autoload |
| 1123 | (defun checkdoc-ispell-comments () | 1123 | (defun checkdoc-ispell-comments () |
| @@ -1126,7 +1126,7 @@ Calls `checkdoc-comments' with spell-checking turned on. | |||
| 1126 | Prefix argument is the same as for `checkdoc-comments'" | 1126 | Prefix argument is the same as for `checkdoc-comments'" |
| 1127 | (interactive) | 1127 | (interactive) |
| 1128 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1128 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1129 | (call-interactively #'checkdoc-comments nil current-prefix-arg))) | 1129 | (call-interactively #'checkdoc-comments))) |
| 1130 | 1130 | ||
| 1131 | ;;;###autoload | 1131 | ;;;###autoload |
| 1132 | (defun checkdoc-ispell-defun () | 1132 | (defun checkdoc-ispell-defun () |
| @@ -1135,7 +1135,7 @@ Calls `checkdoc-defun' with spell-checking turned on. | |||
| 1135 | Prefix argument is the same as for `checkdoc-defun'" | 1135 | Prefix argument is the same as for `checkdoc-defun'" |
| 1136 | (interactive) | 1136 | (interactive) |
| 1137 | (let ((checkdoc-spellcheck-documentation-flag t)) | 1137 | (let ((checkdoc-spellcheck-documentation-flag t)) |
| 1138 | (call-interactively #'checkdoc-defun nil current-prefix-arg))) | 1138 | (call-interactively #'checkdoc-defun))) |
| 1139 | 1139 | ||
| 1140 | ;;; Error Management | 1140 | ;;; Error Management |
| 1141 | ;; | 1141 | ;; |