mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-28 08:11:05 -08:00
Add new error and function `user-error'.
* lisp/subr.el (user-error): New function. * lisp/window.el (switch-to-buffer): * lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve) (smerge-match-conflict): * lisp/simple.el (previous-matching-history-element) (next-matching-history-element, goto-history-element, undo-more) (undo-start): * lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag) (find-tag-noselect, find-tag-in-order, etags-goto-tag-location) (next-file, tags-loop-scan, list-tags, complete-tag): * lisp/progmodes/compile.el (compilation-loop): * lisp/mouse.el (mouse-minibuffer-check): * lisp/man.el (Man-bgproc-sentinel, Man-goto-page): * lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back) (Info-history-forward, Info-follow-reference, Info-menu) (Info-extract-menu-item, Info-extract-menu-counting) (Info-forward-node, Info-backward-node, Info-next-menu-item) (Info-last-menu-item, Info-next-preorder, Info-last-preorder) (Info-next-reference, Info-prev-reference, Info-index) (Info-index-next, Info-follow-nearest-node) (Info-copy-current-node-name): * lisp/imenu.el (imenu--make-index-alist) (imenu-default-create-index-function, imenu-add-to-menubar): * lisp/files.el (basic-save-buffer, recover-file): * lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): * lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments) (checkdoc-message-text, checkdoc-defun): * lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point): * lisp/cus-edit.el (customize-changed-options, customize-rogue) (customize-saved, custom-variable-set, custom-variable-mark-to-save) (custom-variable-mark-to-reset-standard) (custom-variable-reset-backup, custom-face-mark-to-reset-standard) (custom-file): * lisp/completion.el (check-completion-length): * lisp/comint.el (comint-search-arg) (comint-previous-matching-input-string-position) (comint-previous-matching-input) (comint-replace-by-expanded-history-before-point, comint-send-input) (comint-copy-old-input, comint-backward-matching-input) (comint-goto-process-mark, comint-set-process-mark): * lisp/calendar/calendar.el (calendar-cursor-to-date): Use it. * lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'. * src/data.c (PUT_ERROR): New macro. (syms_of_data): Use it. Add new error type `user-error'. * src/undo.c (user_error): New function. (Fprimitive_undo): Use it. * src/print.c (print_error_message): Adjust print style for `user-error'. * src/keyboard.c (user_error): New function. (Fexit_recursive_edit, Fabort_recursive_edit): Use it.
This commit is contained in:
parent
956cceb9b1
commit
71873e2b33
29 changed files with 329 additions and 418 deletions
|
|
@ -916,7 +916,7 @@ is the starting location. If this is nil, `point-min' is used instead."
|
|||
(progn
|
||||
(goto-char wrong)
|
||||
(if (not take-notes)
|
||||
(error "%s" (checkdoc-error-text msg)))))
|
||||
(user-error "%s" (checkdoc-error-text msg)))))
|
||||
(checkdoc-show-diagnostics)
|
||||
(if (called-interactively-p 'interactive)
|
||||
(message "No style warnings."))))
|
||||
|
|
@ -949,7 +949,7 @@ if there is one."
|
|||
(e (checkdoc-file-comments-engine))
|
||||
(checkdoc-generate-compile-warnings-flag
|
||||
(or take-notes checkdoc-generate-compile-warnings-flag)))
|
||||
(if e (error "%s" (checkdoc-error-text e)))
|
||||
(if e (user-error "%s" (checkdoc-error-text e)))
|
||||
(checkdoc-show-diagnostics)
|
||||
e))
|
||||
|
||||
|
|
@ -987,7 +987,7 @@ Optional argument TAKE-NOTES causes all errors to be logged."
|
|||
(if (not (called-interactively-p 'interactive))
|
||||
e
|
||||
(if e
|
||||
(error "%s" (checkdoc-error-text e))
|
||||
(user-error "%s" (checkdoc-error-text e))
|
||||
(checkdoc-show-diagnostics)))
|
||||
(goto-char p))
|
||||
(if (called-interactively-p 'interactive)
|
||||
|
|
@ -1027,19 +1027,14 @@ space at the end of each line."
|
|||
(car (memq checkdoc-spellcheck-documentation-flag
|
||||
'(defun t))))
|
||||
(beg (save-excursion (beginning-of-defun) (point)))
|
||||
(end (save-excursion (end-of-defun) (point)))
|
||||
(msg (checkdoc-this-string-valid)))
|
||||
(if msg (if no-error
|
||||
(message "%s" (checkdoc-error-text msg))
|
||||
(error "%s" (checkdoc-error-text msg)))
|
||||
(setq msg (checkdoc-message-text-search beg end))
|
||||
(if msg (if no-error
|
||||
(message "%s" (checkdoc-error-text msg))
|
||||
(error "%s" (checkdoc-error-text msg)))
|
||||
(setq msg (checkdoc-rogue-space-check-engine beg end))
|
||||
(if msg (if no-error
|
||||
(message "%s" (checkdoc-error-text msg))
|
||||
(error "%s" (checkdoc-error-text msg))))))
|
||||
(end (save-excursion (end-of-defun) (point))))
|
||||
(dolist (fun (list #'checkdoc-this-string-valid
|
||||
(lambda () (checkdoc-message-text-search beg end))
|
||||
(lambda () (checkdoc-rogue-space-check-engine beg end))))
|
||||
(let ((msg (funcall fun)))
|
||||
(if msg (if no-error
|
||||
(message "%s" (checkdoc-error-text msg))
|
||||
(user-error "%s" (checkdoc-error-text msg))))))
|
||||
(if (called-interactively-p 'interactive)
|
||||
(message "Checkdoc: done."))))))
|
||||
|
||||
|
|
@ -2644,12 +2639,6 @@ function called to create the messages."
|
|||
|
||||
(custom-add-option 'emacs-lisp-mode-hook 'checkdoc-minor-mode)
|
||||
|
||||
(add-to-list 'debug-ignored-errors
|
||||
"Argument `.*' should appear (as .*) in the doc string")
|
||||
(add-to-list 'debug-ignored-errors
|
||||
"Lisp symbol `.*' should appear in quotes")
|
||||
(add-to-list 'debug-ignored-errors "Disambiguate .* by preceding .*")
|
||||
|
||||
(provide 'checkdoc)
|
||||
|
||||
;;; checkdoc.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue