diff options
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/footnote.el | 19 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 24 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 10 | ||||
| -rw-r--r-- | lisp/mail/smtpmail.el | 22 |
4 files changed, 47 insertions, 28 deletions
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 2dd2e7af175..7992438df25 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -267,14 +267,17 @@ Wrapping around the alphabet implies successive repetitions of letters." ;; Latin-1 -(defconst footnote-latin-regexp "¹²³ºª§¶" +(defconst footnote-latin-string "¹²³ºª§¶" + "String of Latin-1 footnoting characters.") + +(defconst footnote-latin-regexp (concat "[" footnote-latin-string "]") "Regexp for Latin-1 footnoting characters.") (defun Footnote-latin (n) "Latin-1 footnote style. Use a range of Latin-1 non-ASCII characters for footnoting." - (string (aref footnote-latin-regexp - (mod (1- n) (length footnote-latin-regexp))))) + (string (aref footnote-latin-string + (mod (1- n) (length footnote-latin-string))))) ;;; list of all footnote styles (defvar footnote-style-alist @@ -291,14 +294,18 @@ See footnote-han.el, footnote-greek.el and footnote-hebrew.el for more exciting styles.") (defcustom footnote-style 'numeric - "*Style used for footnoting. + "*Default style used for footnoting. numeric == 1, 2, 3, ... english-lower == a, b, c, ... english-upper == A, B, C, ... roman-lower == i, ii, iii, iv, v, ... roman-upper == I, II, III, IV, V, ... latin == ¹ ² ³ º ª § ¶ -See also variables `footnote-start-tag' and `footnote-end-tag'." +See also variables `footnote-start-tag' and `footnote-end-tag'. + +Customizing this variable has no effect on buffers already +displaying footnotes. You can change the style of existing +buffers using the command `Footnote-set-style'." :type (cons 'choice (mapcar (lambda (x) (list 'const (car x))) footnote-style-alist)) :group 'footnote) @@ -654,7 +661,7 @@ delete the footnote with that number." (while (< i notes) (setq alist-ptr (nth i footnote-pointer-marker-alist)) (setq alist-txt (nth i footnote-text-marker-alist)) - (unless (eq (1+ i) (car alist-ptr)) + (unless (= (1+ i) (car alist-ptr)) (Footnote-renumber (car alist-ptr) (1+ i) alist-ptr alist-txt)) (setq i (1+ i)))))) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 5e534b2d47d..bfdd5048877 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1959,9 +1959,13 @@ is non-nil if the user has supplied the password interactively. (base64-header-field-end (save-excursion (goto-char start) - (re-search-forward - "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" - header-end t)))) + (and (re-search-forward + "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" + header-end t) + ;; Don't try to decode non-text data. + (re-search-forward + "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/" + header-end t))))) (if quoted-printable-header-field-end (save-excursion (unless @@ -2061,10 +2065,16 @@ is non-nil if the user has supplied the password interactively. "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*" header-end t))) (base64-header-field-end - (save-excursion - (re-search-forward - "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" - header-end t))) + (and + (save-excursion + (re-search-forward + "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" + header-end t)) + ;; Don't decode non-text data. + (save-excursion + (re-search-forward + "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/" + header-end t)))) (size ;; Get the numeric value from the Content-Length field. (save-excursion diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 2bb1a6ed0fa..c0fcdf8ff43 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -620,16 +620,16 @@ Like Text Mode but with these additional commands: \\[mail-send-and-exit] mail-send-and-exit (send the message and exit) Here are commands that move to a header field (and create it if there isn't): - \\[mail-to] move to To: \\[mail-subject] move to Subject: - \\[mail-cc] move to CC: \\[mail-bcc] move to BCC: + \\[mail-to] move to To: \\[mail-subject] move to Subj: + \\[mail-bcc] move to BCC: \\[mail-cc] move to CC: \\[mail-fcc] move to FCC: \\[mail-reply-to] move to Reply-To: \\[mail-mail-reply-to] move to Mail-Reply-To: \\[mail-mail-followup-to] move to Mail-Followup-To: -\\[mail-text] mail-text (move to beginning of message text). +\\[mail-text] move to message text. \\[mail-signature] mail-signature (insert `mail-signature-file' file). \\[mail-yank-original] mail-yank-original (insert current message, in Rmail). \\[mail-fill-yanked-message] mail-fill-yanked-message (fill what was yanked). -\\[mail-sent-via] mail-sent-via (add a Sent-via field for each To or CC). +\\[mail-sent-via] mail-sent-via (add a sent-via field for each To or CC). Turning on Mail mode runs the normal hooks `text-mode-hook' and `mail-mode-hook' (in that order)." (make-local-variable 'mail-reply-action) @@ -1392,7 +1392,7 @@ Create a Mail-Followup-To field if none." nil))) (defun mail-text () - "Move point to beginning of message text." + "Move point to beginning of text field." (interactive) (expand-abbrev) (goto-char (mail-text-start))) diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index e1e742a1d72..66c4bdd8df7 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -691,20 +691,22 @@ This is relative to `smtpmail-queue-dir'.") (>= (car response-code) 400)) (throw 'done nil))) (dolist (line (cdr (cdr response-code))) - (let ((name (mapcar (lambda (s) (intern (downcase s))) - (split-string (substring line 4) "[ ]")))) + (let ((name + (with-case-table ascii-case-table + (mapcar (lambda (s) (intern (downcase s))) + (split-string (substring line 4) "[ ]"))))) (and (eq (length name) 1) (setq name (car name))) - (and name + (and name (cond ((memq (if (consp name) (car name) name) '(verb xvrb 8bitmime onex xone - expn size dsn etrn - enhancedstatuscodes - help xusr - auth=login auth starttls)) - (setq supported-extensions - (cons name supported-extensions))) - (smtpmail-warn-about-unknown-extensions + expn size dsn etrn + enhancedstatuscodes + help xusr + auth=login auth starttls)) + (setq supported-extensions + (cons name supported-extensions))) + (smtpmail-warn-about-unknown-extensions (message "Unknown extension %s" name))))))) (if (and do-starttls |