diff options
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/emacsbug.el | 14 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 12 | ||||
| -rw-r--r-- | lisp/mail/hashcash.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rfc2368.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 4 | ||||
| -rw-r--r-- | lisp/mail/rmailout.el | 5 |
6 files changed, 26 insertions, 13 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 8e28973c43f..ef5e86a6c8b 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -162,6 +162,14 @@ Prompts for bug subject. Leaves you in a mail buffer." (setq message-end-point (with-current-buffer (messages-buffer) (point-max-marker))) + (condition-case nil + ;; For the novice user make sure there's always enough space for + ;; the mail and the warnings buffer on this frame (Bug#10873). + (unless report-emacs-bug-no-explanations + (delete-other-windows) + (set-window-dedicated-p nil nil) + (set-frame-parameter nil 'unsplittable nil)) + (error nil)) (compose-mail report-emacs-bug-address topic) ;; The rest of this does not execute if the user was asked to ;; confirm and said no. @@ -234,7 +242,11 @@ usually do not have translators for other languages.\n\n"))) (let ((txt (delete-and-extract-region (1+ user-point) (point)))) (insert (propertize "\n" 'display txt))) - (insert "\n\nIn " (emacs-version) "\n") + (insert "\n\nIn " (emacs-version)) + (if emacs-build-system + (insert " built on " emacs-build-system)) + (insert "\n") + (if (stringp emacs-repository-version) (insert "Repository revision: " emacs-repository-version "\n")) (if (fboundp 'x-server-vendor) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index aec93db3fa6..bb93cff96bc 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -606,7 +606,7 @@ variables or other means, this option has no effect." May be t, in which case a default is computed (and you probably won't be happy with it). May be nil, in which case nothing in particular is done with respect to From: lines. By design, will not replace an -existing From: line, but you can achieve that with a fiddle-plex 'replace +existing From: line, but you can achieve that with a fiddle-plex `replace' action. If neither nil nor t, it may be a string, a fiddle-plex, or a function @@ -870,11 +870,11 @@ headers for specific addresses. May be t, in which case a \"To:\" header is added to the message with the stripped address as the header contents. The fiddle-plex operator -is 'supplement. +is `supplement'. May be a string, in which case the string is assumed to be the name of a message header field with the stripped address serving as the value. -The fiddle-plex operator is 'supplement. +The fiddle-plex operator is `supplement'. May be a function, in which case it is called with no arguments and is expected to return nil, t, a string, another function, or a fiddle-plex. @@ -891,7 +891,7 @@ If a list, each item is acted on in turn as described above. For example, - (setq feedmail-spray-address-fiddle-plex-list 'feedmail-spray-via-bbdb) + (setq feedmail-spray-address-fiddle-plex-list \\='feedmail-spray-via-bbdb) The idea of the example is that, during spray mode, as each message is about to be transmitted to an individual address, the function will be @@ -1383,7 +1383,7 @@ See documentation of `feedmail-mail-send-hook-splitter' for details." (defun feedmail-confirm-addresses-hook-example () "An example of a `feedmail-last-chance-hook'. It shows the simple addresses and gets a confirmation. Use as: - (setq feedmail-last-chance-hook 'feedmail-confirm-addresses-hook-example)." + (setq feedmail-last-chance-hook \\='feedmail-confirm-addresses-hook-example)." (save-window-excursion (display-buffer (set-buffer (get-buffer-create " F-C-A-H-E"))) (erase-buffer) @@ -2080,7 +2080,7 @@ backup file names and the like)." (defun feedmail-queue-reminder (&optional what-event) "Perform some kind of reminder activity about queued and draft messages. Called with an optional symbol argument which says what kind of event -is triggering the reminder activity. The default is 'on-demand, which +is triggering the reminder activity. The default is `on-demand', which is what you typically would use if you were putting this in your Emacs start-up or mail hook code. Other recognized values for WHAT-EVENT (these are passed internally by feedmail): diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el index 70170654f67..1e57119f5a5 100644 --- a/lisp/mail/hashcash.el +++ b/lisp/mail/hashcash.el @@ -97,7 +97,7 @@ If this is not in your PATH, specify an absolute file name." (defcustom hashcash-extra-generate-parameters nil "A list of parameter strings passed to `hashcash-program' when minting. -For example, you may want to set this to '(\"-Z2\") to reduce header length." +For example, you may want to set this to (\"-Z2\") to reduce header length." :type '(repeat string) :group 'hashcash) diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index 50ff2cfb8ea..3cea39e1b2c 100644 --- a/lisp/mail/rfc2368.el +++ b/lisp/mail/rfc2368.el @@ -87,7 +87,7 @@ MAILTO-URL should be a RFC 2368 (mailto) compliant url. A cons cell w/ a key of `Body' is a special case and is considered a header for this purpose. The returned alist is intended for use w/ the `compose-mail' interface. -Note: make sure MAILTO-URL has been 'unhtmlized' (e.g. & -> &), before +Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., & -> &), before calling this function." (let ((case-fold-search t) prequery query headers-alist) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 1ed4cc7f6d8..fe3375e8f58 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -100,7 +100,7 @@ its character representation and its display representation.") (defvar rmail-header-style 'normal "The current header display style choice, one of -'normal (selected headers) or 'full (all headers).") +`normal' (selected headers) or `full' (all headers).") (defvar rmail-mime-decoded nil "Non-nil if message has been processed by `rmail-show-mime-function'.") @@ -300,7 +300,7 @@ mail URLs as the source mailbox.") ;;;###autoload (defun rmail-movemail-variant-p (&rest variants) "Return t if the current movemail variant is any of VARIANTS. -Currently known variants are 'emacs and 'mailutils." +Currently known variants are `emacs' and `mailutils'." (when (not rmail-movemail-variant-in-use) ;; Autodetect (setq rmail-movemail-variant-in-use (rmail-autodetect))) diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index 1e770e6fea6..587d75f09b9 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -84,13 +84,14 @@ This uses `rmail-output-file-alist'." (eval (cdar tail)) (error (display-warning - :error + 'rmail-output (format-message "\ Error evaluating `rmail-output-file-alist' element: regexp: %s action: %s error: %S\n" - (caar tail) (cdar tail) err)) + (caar tail) (cdar tail) err) + :error) nil)))) (setq tail (cdr tail))) answer)))))) |