Prefer declare
over a put
of list-indent-function
.
While at it, I enabled lexical-binding in the affected files. * lisp/cedet/semantic/sb.el: Enable lexical-binding. (semantic-sb-with-tag-buffer): Use `declare`. * lisp/cedet/semantic/bovine/el.el: Enable lexical-binding. (semantic-elisp-setup-form-parser): Use `declare`. * lisp/emacs-lisp/ert.el: * lisp/emacs-lisp/ert-x.el: Remove redundant `put`. * lisp/emulation/cua-rect.el: Enable lexical-binding. (cua--rectangle-operation, cua--rectangle-aux-replace): Use `declare`. * lisp/mh-e/mh-acros.el: Enable lexical-binding. (mh-do-in-gnu-emacs, mh-do-in-xemacs, mh-funcall-if-exists, defun-mh) (defmacro-mh, with-mh-folder-updating, mh-in-show-buffer) (mh-do-at-event-location, mh-iterate-on-messages-in-region) (mh-iterate-on-range): Use `declare`. * lisp/mh-e/mh-compat.el: Enable lexical-binding. (mh-flet): Use `declare`. * lisp/mh-e/mh-e.el: Enable lexical-binding. (defgroup-mh, defcustom-mh, defface-mh): Use `declare`. * lisp/net/sieve.el: Enable lexical-binding. Remove redundant :group args. (sieve-activate, sieve-remove, sieve-edit-script): Remove unused arg from the interactive spec. (sieve-deactivate-all): Remove unused var `name`. (sieve-change-region): Use `declare`. * lisp/obsolete/fast-lock.el: Enable lexical-binding. Remove redundant :group args. Remove XEmacs compat code. (save-buffer-state): Remove macro. (fast-lock-add-properties): Use `with-silent-modifications` instead. * lisp/obsolete/lazy-lock.el: Enable lexical-binding. Remove redundant :group args. (do-while): Use `declare`. (save-buffer-state): Remove macro. (lazy-lock-fontify-rest-after-change, lazy-lock-defer-line-after-change) (lazy-lock-defer-rest-after-change, lazy-lock-after-fontify-buffer) (lazy-lock-after-unfontify-buffer, lazy-lock-fontify-region): Use `with-silent-modifications` instead. * lisp/obsolete/pgg.el: Enable lexical-binding. Remove XEmacs compat code. (pgg-save-coding-system, pgg-as-lbt, pgg-process-when-success): Use `declare`. (pgg-add-passphrase-to-cache): Remove unused var `new-timer`. (pgg-decrypt-region): Remove unused var `buf`. * lisp/org/org-agenda.el (org-let, org-let2): Move from org-macs and use `declare`. * lisp/org/org-macs.el (org-let, org-let2): Move these functions that are inherently harmful to your karma to the only package that uses them. (org-scroll): Use `pcase` to avoid `eval` and use more readable syntax for those integers standing for events. * lisp/progmodes/antlr-mode.el: Enable lexical-binding. (save-buffer-state-x): Use `declare` and `with-silent-modifications`. * lisp/international/mule-util.el (with-coding-priority): * lisp/cedet/ede/proj-comp.el (proj-comp-insert-variable-once): * lisp/org/org-element.el (org-element-map): * test/lisp/emacs-lisp/bytecomp-tests.el (test-byte-comp-compile-and-load): * test/lisp/emacs-lisp/generator-tests.el (cps-testcase): Use `declare`.
This commit is contained in:
parent
f1fa35f091
commit
8d5dfafab7
20 changed files with 235 additions and 483 deletions
|
@ -102,15 +102,6 @@ the name of the test and the result of NAME-FORM."
|
|||
(indent 1))
|
||||
`(ert--call-with-test-buffer ,name-form (lambda () ,@body)))
|
||||
|
||||
;; We use these `put' forms in addition to the (declare (indent)) in
|
||||
;; the defmacro form since the `declare' alone does not lead to
|
||||
;; correct indentation before the .el/.elc file is loaded.
|
||||
;; Autoloading these `put' forms solves this.
|
||||
;;;###autoload
|
||||
(progn
|
||||
;; TODO(ohler): Figure out what these mean and make sure they are correct.
|
||||
(put 'ert-with-test-buffer 'lisp-indent-function 1))
|
||||
|
||||
;;;###autoload
|
||||
(defun ert-kill-all-test-buffers ()
|
||||
"Kill all test buffers that are still live."
|
||||
|
|
|
@ -81,15 +81,13 @@ Use nil for no limit (caution: backtrace lines can be very long)."
|
|||
:background "green1")
|
||||
(((class color) (background dark))
|
||||
:background "green3"))
|
||||
"Face used for expected results in the ERT results buffer."
|
||||
:group 'ert)
|
||||
"Face used for expected results in the ERT results buffer.")
|
||||
|
||||
(defface ert-test-result-unexpected '((((class color) (background light))
|
||||
:background "red1")
|
||||
(((class color) (background dark))
|
||||
:background "red3"))
|
||||
"Face used for unexpected results in the ERT results buffer."
|
||||
:group 'ert)
|
||||
"Face used for unexpected results in the ERT results buffer.")
|
||||
|
||||
|
||||
;;; Copies/reimplementations of cl functions.
|
||||
|
@ -224,16 +222,6 @@ it has to be wrapped in `(eval (quote ...))'.
|
|||
:body (lambda () ,@body)))
|
||||
',name))))
|
||||
|
||||
;; We use these `put' forms in addition to the (declare (indent)) in
|
||||
;; the defmacro form since the `declare' alone does not lead to
|
||||
;; correct indentation before the .el/.elc file is loaded.
|
||||
;; Autoloading these `put' forms solves this.
|
||||
;;;###autoload
|
||||
(progn
|
||||
;; TODO(ohler): Figure out what these mean and make sure they are correct.
|
||||
(put 'ert-deftest 'lisp-indent-function 2)
|
||||
(put 'ert-info 'lisp-indent-function 1))
|
||||
|
||||
(defvar ert--find-test-regexp
|
||||
(concat "^\\s-*(ert-deftest"
|
||||
find-function-space-re
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue