diff options
Diffstat (limited to 'lisp/mh-e/mh-acros.el')
| -rw-r--r-- | lisp/mh-e/mh-acros.el | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index af6f2f1ab02..8fdcf3c62b4 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -1,4 +1,4 @@ -;;; mh-acros.el --- macros used in MH-E +;;; mh-acros.el --- macros used in MH-E -*- lexical-binding: t; -*- ;; Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. @@ -36,8 +36,6 @@ ;; because it's pointless to compile a file full of macros. But we ;; kept the name. -;;; Change Log: - ;;; Code: (require 'cl-lib) @@ -49,20 +47,19 @@ ;;;###mh-autoload (defmacro mh-do-in-gnu-emacs (&rest body) "Execute BODY if in GNU Emacs." - (declare (debug t)) + (declare (debug t) (indent defun)) (unless (featurep 'xemacs) `(progn ,@body))) -(put 'mh-do-in-gnu-emacs 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-do-in-xemacs (&rest body) "Execute BODY if in XEmacs." - (declare (debug t)) + (declare (debug t) (indent defun)) (when (featurep 'xemacs) `(progn ,@body))) -(put 'mh-do-in-xemacs 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-funcall-if-exists (function &rest args) "Call FUNCTION with ARGS as parameters if it exists." + (declare (debug (symbolp body))) ;; FIXME: Not clear when this should be used. If the function happens ;; not to exist at compile-time (e.g. because the corresponding package ;; wasn't loaded), then it won't ever be used :-( @@ -75,25 +72,24 @@ "Create function NAME. If FUNCTION exists, then NAME becomes an alias for FUNCTION. Otherwise, create function NAME with ARG-LIST and BODY." + (declare (indent defun) (doc-string 4) + (debug (&define name symbolp sexp def-body))) `(defalias ',name (if (fboundp ',function) ',function (lambda ,arg-list ,@body)))) -(put 'defun-mh 'lisp-indent-function 'defun) -(put 'defun-mh 'doc-string-elt 4) ;;;###mh-autoload (defmacro defmacro-mh (name macro arg-list &rest body) "Create macro NAME. If MACRO exists, then NAME becomes an alias for MACRO. Otherwise, create macro NAME with ARG-LIST and BODY." + (declare (indent defun) (doc-string 4) + (debug (&define name symbolp sexp def-body))) (let ((defined-p (fboundp macro))) (if defined-p `(defalias ',name ',macro) `(defmacro ,name ,arg-list ,@body)))) -(put 'defmacro-mh 'lisp-indent-function 'defun) -(put 'defmacro-mh 'doc-string-elt 4) - ;;; Miscellaneous @@ -127,7 +123,7 @@ Execute BODY, which can modify the folder buffer without having to worry about file locking or the read-only flag, and return its result. If SAVE-MODIFICATION-FLAG is non-nil, the buffer's modification flag is unchanged, otherwise it is cleared." - (declare (debug t)) + (declare (debug t) (indent defun)) (setq save-modification-flag (car save-modification-flag)) ; CL style `(prog1 (let ((mh-folder-updating-mod-flag (buffer-modified-p)) @@ -139,14 +135,13 @@ is unchanged, otherwise it is cleared." (mh-set-folder-modified-p mh-folder-updating-mod-flag))) ,@(if (not save-modification-flag) '((mh-set-folder-modified-p nil))))) -(put 'with-mh-folder-updating 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-in-show-buffer (show-buffer &rest body) "Format is (mh-in-show-buffer (SHOW-BUFFER) &body BODY). Display buffer SHOW-BUFFER in other window and execute BODY in it. Stronger than `save-excursion', weaker than `save-window-excursion'." - (declare (debug t)) + (declare (debug t) (indent defun)) (setq show-buffer (car show-buffer)) ; CL style `(let ((mh-in-show-buffer-saved-window (selected-window))) (switch-to-buffer-other-window ,show-buffer) @@ -155,7 +150,6 @@ Stronger than `save-excursion', weaker than `save-window-excursion'." (progn ,@body) (select-window mh-in-show-buffer-saved-window)))) -(put 'mh-in-show-buffer 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-do-at-event-location (event &rest body) @@ -163,7 +157,7 @@ Stronger than `save-excursion', weaker than `save-window-excursion'." After BODY has been executed return to original window. The modification flag of the buffer in the event window is preserved." - (declare (debug t)) + (declare (debug t) (indent defun)) (let ((event-window (make-symbol "event-window")) (event-position (make-symbol "event-position")) (original-window (make-symbol "original-window")) @@ -190,7 +184,6 @@ preserved." (goto-char ,original-position) (set-marker ,original-position nil) (select-window ,original-window)))))) -(put 'mh-do-at-event-location 'lisp-indent-hook 'defun) @@ -209,7 +202,7 @@ VAR is bound to the message on the current line as we loop starting from BEGIN till END. In each step BODY is executed. If VAR is nil then the loop is executed without any binding." - (declare (debug (symbolp body))) + (declare (debug (symbolp body)) (indent defun)) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var)) @@ -221,7 +214,6 @@ If VAR is nil then the loop is executed without any binding." (let ,(if binding-needed-flag `((,var (mh-get-msg-num t))) ()) ,@body)) (forward-line 1))))) -(put 'mh-iterate-on-messages-in-region 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-iterate-on-range (var range &rest body) @@ -235,7 +227,7 @@ a string. In each iteration, BODY is executed. The parameter RANGE is usually created with `mh-interactive-range' in order to provide a uniform interface to MH-E functions." - (declare (debug (symbolp body))) + (declare (debug (symbolp body)) (indent defun)) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var) @@ -263,7 +255,6 @@ MH-E functions." (when (gethash v ,seq-hash-table) (let ,(if binding-needed-flag `((,var v)) ()) ,@body)))))))) -(put 'mh-iterate-on-range 'lisp-indent-hook 'defun) (defmacro mh-dlet* (binders &rest body) "Like `let*' but always dynamically scoped." |