diff options
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/emacsbug.el | 12 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 5 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 6 | ||||
| -rw-r--r-- | lisp/mail/rmailout.el | 7 |
4 files changed, 17 insertions, 13 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index f4ba2264dc8..f54893fb4be 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -215,7 +215,7 @@ usually do not have translators for other languages.\n\n"))) (insert "Please describe exactly what actions triggered the bug, and\n" "the precise symptoms of the bug. If you can, give a recipe\n" - "starting from `emacs -Q':\n\n") + "starting from 'emacs -Q':\n\n") (let ((txt (delete-and-extract-region (save-excursion (rfc822-goto-eoh) (line-beginning-position 2)) (point)))) @@ -225,7 +225,7 @@ usually do not have translators for other languages.\n\n"))) (insert "If Emacs crashed, and you have the Emacs process in the gdb debugger,\n" "please include the output from the following gdb commands:\n" - " `bt full' and `xbacktrace'.\n") + " 'bt full' and 'xbacktrace'.\n") (let ((debug-file (expand-file-name "DEBUG" data-directory))) (if (file-readable-p debug-file) @@ -240,7 +240,7 @@ usually do not have translators for other languages.\n\n"))) (if (fboundp 'x-server-vendor) (condition-case nil ;; This is used not only for X11 but also W32 and others. - (insert "Windowing system distributor `" (x-server-vendor) + (insert "Windowing system distributor '" (x-server-vendor) "', version " (mapconcat 'number-to-string (x-server-version) ".") "\n") (error t))) @@ -253,7 +253,7 @@ usually do not have translators for other languages.\n\n"))) (insert "System " lsb "\n"))) (when (and system-configuration-options (not (equal system-configuration-options ""))) - (insert "Configured using:\n `configure " + (insert "Configured using:\n 'configure " system-configuration-options "'\n\n") (fill-region (line-beginning-position -1) (point))) (insert "Configured features:\n" system-configuration-features "\n\n") @@ -315,7 +315,7 @@ usually do not have translators for other languages.\n\n"))) (insert (format "\nMemory information:\n")) (pp (garbage-collect) (current-buffer)) - + ;; This is so the user has to type something in order to send easily. (use-local-map (nconc (make-sparse-keymap) (current-local-map))) (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug) @@ -417,7 +417,7 @@ and send the mail again%s." (regexp-quote (system-name))) from)) (not (yes-or-no-p - (format "Is `%s' really your email address? " from))) + (format "Is '%s' really your email address? " from))) (error "Please edit the From address and try again")))))) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index a94a81c5575..ccd892640ec 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1889,7 +1889,8 @@ with various lower-level mechanisms to provide features such as queueing." (defun feedmail-message-action-help-blat (d-string) (feedmail-say-debug ">in-> feedmail-message-action-help-blat") (with-output-to-temp-buffer feedmail-p-h-b-n - (princ "You're dispatching a message and feedmail queuing is enabled. + (princ (substitute-command-keys "\ +You're dispatching a message and feedmail queuing is enabled. Typing ? again will normally scroll this help buffer. Choices: @@ -1914,7 +1915,7 @@ Synonyms: y YUP do the default behavior \(same as \"C-m\"\) SPC SCROLL UP \(same as \">\"\) -The user-configurable default is currently \"") +The user-configurable default is currently \"")) (princ d-string) (princ "\". For other possibilities, see the variable feedmail-prompt-before-queue-user-alist. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 90a140b272c..67b04b56968 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -894,7 +894,7 @@ isn't provided." (error (display-warning 'rmail - (format "Although MIME support is requested + (format-message "Although MIME support is requested through `rmail-enable-mime' being non-nil, the required feature `%s' (the value of `rmail-mime-feature') is not available in the current session. @@ -2662,8 +2662,8 @@ Ask the user whether to add that list name to `mail-mailing-lists'." "\\>\\)")) addr)) (y-or-n-p - (format "Add `%s' to `mail-mailing-lists'? " - addr))) + (format-message "Add `%s' to `mail-mailing-lists'? " + addr))) (customize-save-variable 'mail-mailing-lists (cons addr mail-mailing-lists))))))))) diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index 6b753b39e17..1e770e6fea6 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -85,8 +85,11 @@ This uses `rmail-output-file-alist'." (error (display-warning :error - (format "Error evaluating \ -`rmail-output-file-alist' element:\nregexp: %s\naction: %s\nerror: %S\n" + (format-message "\ +Error evaluating `rmail-output-file-alist' element: +regexp: %s +action: %s +error: %S\n" (caar tail) (cdar tail) err)) nil)))) (setq tail (cdr tail))) |