diff options
| author | Paul Eggert | 2015-09-03 15:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-09-03 15:32:54 -0700 |
| commit | 26bd978d87dfbf9baa115cd961a67d42b416c4bf (patch) | |
| tree | 20f3d063895796f54b9f521c0b35f65bbcd418c4 /lisp/mail | |
| parent | 944d77f070da388b0c6e6578a9f868e88c088940 (diff) | |
| download | emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.tar.gz emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.zip | |
Fix some more docstring etc. quoting problems
Mostly these fixes prevent the transliteration of apostrophes
that should stay apostrophes. Also, prefer curved quotes in
Bahá’í proper names, as that’s the preferred Bahá’í style and
these names are chock-full of non-ASCII characters anyway.
* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload)
(eieio-defclass-internal):
* lisp/emacs-lisp/eieio.el (defclass):
* lisp/hi-lock.el (hi-lock-mode):
Don’t transliterate Lisp apostrophes when generating a
doc string or diagnostic.
* lisp/international/mule-diag.el (list-coding-systems-1):
* lisp/international/ogonek.el (ogonek-jak, ogonek-how):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map):
Substitute quotes before putting them in the help buffer.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/feedmail.el | 4 | ||||
| -rw-r--r-- | lisp/mail/mailalias.el | 6 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 28 |
3 files changed, 20 insertions, 18 deletions
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index ccd892640ec..14c45d1ec0b 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el | |||
| @@ -566,7 +566,7 @@ but common in some proprietary systems." | |||
| 566 | "If non-nil and the email has no Sender: header, use this value. | 566 | "If non-nil and the email has no Sender: header, use this value. |
| 567 | May be nil, in which case nothing in particular is done with respect | 567 | May be nil, in which case nothing in particular is done with respect |
| 568 | to Sender: lines. By design, will not replace an existing Sender: | 568 | to Sender: lines. By design, will not replace an existing Sender: |
| 569 | line, but you can achieve that with a fiddle-plex 'replace action. | 569 | line, but you can achieve that with a fiddle-plex replace action. |
| 570 | NB: it makes no sense to use the value t since there is no sensible | 570 | NB: it makes no sense to use the value t since there is no sensible |
| 571 | default for Sender:. | 571 | default for Sender:. |
| 572 | 572 | ||
| @@ -1745,7 +1745,7 @@ applied to a file after you've just read it from disk: for example, a | |||
| 1745 | feedmail FQM message file from a queue. You could use something like | 1745 | feedmail FQM message file from a queue. You could use something like |
| 1746 | this: | 1746 | this: |
| 1747 | 1747 | ||
| 1748 | \(setq auto-mode-alist \(cons \'\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) | 1748 | \(setq auto-mode-alist \(cons \\='\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) |
| 1749 | " | 1749 | " |
| 1750 | (feedmail-say-debug ">in-> feedmail-vm-mail-mode") | 1750 | (feedmail-say-debug ">in-> feedmail-vm-mail-mode") |
| 1751 | (let ((the-buf (current-buffer))) | 1751 | (let ((the-buf (current-buffer))) |
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 577cec0fd86..cd9df1f638a 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el | |||
| @@ -119,11 +119,11 @@ completed. `pattern' is nil when `mail-directory-requery' is nil. | |||
| 119 | 119 | ||
| 120 | The value might look like this: | 120 | The value might look like this: |
| 121 | 121 | ||
| 122 | '(remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\") | 122 | (remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\") |
| 123 | 123 | ||
| 124 | or like this: | 124 | or like this: |
| 125 | 125 | ||
| 126 | '(remote-shell-program \"HOST\" \"-n\" \"COMMAND '^\" pattern \"'\")" | 126 | (remote-shell-program \"HOST\" \"-n\" \"COMMAND \\='^\" pattern \"\\='\")" |
| 127 | :type 'sexp | 127 | :type 'sexp |
| 128 | :group 'mailalias) | 128 | :group 'mailalias) |
| 129 | (put 'mail-directory-process 'risky-local-variable t) | 129 | (put 'mail-directory-process 'risky-local-variable t) |
| @@ -512,7 +512,7 @@ PREFIX is the string we want to complete." | |||
| 512 | mail-aliases)) | 512 | mail-aliases)) |
| 513 | (if (consp mail-local-names) | 513 | (if (consp mail-local-names) |
| 514 | mail-local-names) | 514 | mail-local-names) |
| 515 | (or directory | 515 | (or directory |
| 516 | (when (consp mail-directory-names) | 516 | (when (consp mail-directory-names) |
| 517 | mail-directory-names))) | 517 | mail-directory-names))) |
| 518 | (lambda (a b) | 518 | (lambda (a b) |
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 5b5ee4ec2c5..4c0f2b98257 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el | |||
| @@ -525,31 +525,33 @@ This also saves the value of `send-mail-function' via Customize." | |||
| 525 | ;; Query the user. | 525 | ;; Query the user. |
| 526 | (with-temp-buffer | 526 | (with-temp-buffer |
| 527 | (rename-buffer "*Emacs Mail Setup Help*" t) | 527 | (rename-buffer "*Emacs Mail Setup Help*" t) |
| 528 | (insert "\ | 528 | (insert (substitute-command-keys "\ |
| 529 | Emacs is about to send an email message, but it has not been | 529 | Emacs is about to send an email message, but it has not been |
| 530 | configured for sending email. To tell Emacs how to send email: | 530 | configured for sending email. To tell Emacs how to send email: |
| 531 | 531 | ||
| 532 | - Type `" | 532 | - Type `") |
| 533 | (propertize "mail client" 'face 'bold) | 533 | (propertize "mail client" 'face 'bold) |
| 534 | "' to start your default email client and | 534 | (substitute-command-keys "\ |
| 535 | pass it the message text.\n\n") | 535 | ' to start your default email client and |
| 536 | pass it the message text.\n\n")) | ||
| 536 | (and sendmail-program | 537 | (and sendmail-program |
| 537 | (executable-find sendmail-program) | 538 | (executable-find sendmail-program) |
| 538 | (insert "\ | 539 | (insert (substitute-command-keys "\ |
| 539 | - Type `" | 540 | - Type `") |
| 540 | (propertize "transport" 'face 'bold) | 541 | (propertize "transport" 'face 'bold) |
| 541 | "' to invoke the system's mail transport agent | 542 | (substitute-command-keys "\ |
| 542 | (the `" | 543 | ' to invoke the system's mail transport agent |
| 544 | (the `") | ||
| 543 | sendmail-program | 545 | sendmail-program |
| 544 | "' program).\n\n")) | 546 | (substitute-command-keys "' program).\n\n"))) |
| 545 | (insert "\ | 547 | (insert (substitute-command-keys "\ |
| 546 | - Type `" | 548 | - Type `") |
| 547 | (propertize "smtp" 'face 'bold) | 549 | (propertize "smtp" 'face 'bold) |
| 548 | "' to send mail directly to an \"outgoing mail\" server. | 550 | (substitute-command-keys "' to send mail directly to an \"outgoing mail\" server. |
| 549 | (Emacs may prompt you for SMTP settings). | 551 | (Emacs may prompt you for SMTP settings). |
| 550 | 552 | ||
| 551 | Emacs will record your selection and will use it thereafter. | 553 | Emacs will record your selection and will use it thereafter. |
| 552 | To change it later, customize the option `send-mail-function'.\n") | 554 | To change it later, customize the option `send-mail-function'.\n")) |
| 553 | (goto-char (point-min)) | 555 | (goto-char (point-min)) |
| 554 | (display-buffer (current-buffer)) | 556 | (display-buffer (current-buffer)) |
| 555 | (let ((completion-ignore-case t)) | 557 | (let ((completion-ignore-case t)) |