diff options
Diffstat (limited to 'lisp/gnus/message.el')
| -rw-r--r-- | lisp/gnus/message.el | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index e10322417d8..0782778fd43 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -307,7 +307,7 @@ any confusion." "Command to take a screenshot. The command should insert a PNG in the current buffer." :group 'message-various - :type '(list string) + :type '(repeat string) :version "28.1") ;;; Start of variables adopted from `message-utils.el'. @@ -1106,7 +1106,8 @@ point and mark around the citation text as modified." If nil, don't insert a signature. If t, insert `message-signature-file'. If a function or form, insert its result. -See `mail-signature' for the recommended format of a signature." +See `mail-signature' for the recommended format of a signature. +Also see `message-signature-insert-empty-line'." :version "23.2" :type '(choice string (const :tag "None" nil) @@ -2787,9 +2788,7 @@ Consider adding this function to `message-header-setup-hook'" ;; add URL (when (nth 1 message-openpgp-header) (when need-sep (insert "; ")) - (if (string-match-p ";") - (insert "url=\"" (nth 1 message-openpgp-header) "\"") - (insert "url=\"" (nth 1 message-openpgp-header) "\"")) + (insert "url=\"" (nth 1 message-openpgp-header) "\"") (setq need-sep t)) ;; add preference (when (nth 2 message-openpgp-header) @@ -3536,8 +3535,8 @@ Prefix arg means justify as well." (equal quoted (match-string 0))) (goto-char (match-end 0)) (looking-at "[ \t]*") - (if (> (length leading-space) (length (match-string 0))) - (setq leading-space (match-string 0))) + (when (< (length leading-space) (length (match-string 0))) + (setq leading-space (match-string 0))) (forward-line 1)) (setq end (point)) (goto-char beg) @@ -3614,7 +3613,14 @@ Message buffers and is not meant to be called directly." (do-auto-fill)))) (defun message-insert-signature (&optional force) - "Insert a signature. See documentation for variable `message-signature'." + "Insert a signature at the end of the buffer. + +See the documentation for the `message-signature' variable for +more information. + +If FORCE is 0 (or when called interactively), the global values +of the signature variables will be consulted if the local ones +are null." (interactive (list 0)) (let ((message-signature message-signature) (message-signature-file message-signature-file)) @@ -4568,7 +4574,8 @@ This function could be useful in `message-setup-hook'." (custom-add-option 'message-setup-hook 'message-check-recipients) (defun message-add-action (action &rest types) - "Add ACTION to be performed when doing an exit of type TYPES." + "Add ACTION to be performed when doing an exit of type TYPES. +Valid types are `send', `return', `exit', `kill' and `postpone'." (while types (add-to-list (intern (format "message-%s-actions" (pop types))) action))) @@ -4843,10 +4850,10 @@ If you always want Gnus to send messages in one piece, set Each line should be no more than 79 characters long." (goto-char (point-min)) (while (not (eobp)) - (when (and (looking-at "[^:]+:") - (> (- (line-end-position) (point)) 79)) - (mail-header-fold-field)) - (forward-line 1))) + (if (and (looking-at "[^:]+:") + (> (- (line-end-position) (point)) 79)) + (goto-char (mail-header-fold-field)) + (forward-line 1)))) (defvar sendmail-program) (defvar smtpmail-smtp-server) @@ -5658,7 +5665,7 @@ The result is a fixnum." (mail-file-babyl-p filename)) ;; gnus-output-to-mail does the wrong thing with live, mbox ;; Rmail buffers in Emacs 23. - ;; http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 (let ((buff (find-buffer-visiting filename))) (and buff (with-current-buffer buff (eq major-mode 'rmail-mode))))) @@ -8099,7 +8106,7 @@ See `gmm-tool-bar-from-list' for the format of the list." (library image &optional path no-error)) (defun message-make-tool-bar (&optional force) - "Make a message mode tool bar from `message-tool-bar-list'. + "Make a message mode tool bar from `message-tool-bar'. When FORCE, rebuild the tool bar." (when (and (boundp 'tool-bar-mode) tool-bar-mode @@ -8590,7 +8597,7 @@ Meant for use on `completion-at-point-functions'." ;; FIXME: What is the most common term (circular letter, form letter, serial ;; letter, standard letter) for such kind of letter? See also -;; <http://en.wikipedia.org/wiki/Form_letter> +;; <https://en.wikipedia.org/wiki/Form_letter> ;; FIXME: Maybe extent message-mode's font-lock support to recognize ;; `message-form-letter-separator', i.e. highlight each message like a single @@ -8854,6 +8861,8 @@ will then start up Emacs ready to compose mail." (provide 'message) +(make-obsolete-variable 'message-load-hook + "use `with-eval-after-load' instead." "28.1") (run-hooks 'message-load-hook) ;; Local Variables: |