X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ab6f89780a01ad996693c42c2cf9ad3d5c3665e9..689421a9696767055deef191a6e8da493bce8561:/lisp/mail/mail-utils.el diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index c234411ac8..42be6b5704 100644 --- a/lisp/mail/mail-utils.el +++ b/lisp/mail/mail-utils.el @@ -1,6 +1,6 @@ ;;; mail-utils.el --- utility functions used both by rmail and rnews -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail, news @@ -32,12 +32,14 @@ ;;; We require lisp-mode to make sure that lisp-mode-syntax-table has ;;; been initialized. (require 'lisp-mode) - + ;;;###autoload -(defvar mail-use-rfc822 nil "\ +(defcustom mail-use-rfc822 nil "\ *If non-nil, use a full, hairy RFC822 parser on mail addresses. Otherwise, (the default) use a smaller, somewhat faster, and -often correct parser.") +often correct parser." + :type 'boolean + :group 'mail) ;; Returns t if file FILE is an Rmail file. ;;;###autoload @@ -57,6 +59,7 @@ from START (inclusive) to END (exclusive)." (concat (substring string 0 start) (substring string end nil)))) +;;;###autoload (defun mail-quote-printable (string &optional wrapper) "Convert a string to the \"quoted printable\" Q encoding. If the optional argument WRAPPER is non-nil, @@ -80,6 +83,7 @@ we add the wrapper characters =?ISO-8859-1?Q?....?=." (+ (- char ?A) 10) (- char ?0))) +;;;###autoload (defun mail-unquote-printable (string &optional wrapper) "Undo the \"quoted printable\" encoding. If the optional argument WRAPPER is non-nil, @@ -88,17 +92,48 @@ we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=." (and wrapper (string-match "\\`=\\?ISO-8859-1\\?Q\\?\\([^?]*\\)\\?" string) (setq string (match-string 1 string))) - (let ((i 0) (result "")) - (while (string-match "=\\(..\\)" string i) - (setq result - (concat result (substring string i (match-beginning 0)) - (make-string 1 + (let ((i 0) strings) + (while (string-match "=\\(..\\|\n\\)" string i) + (setq strings (cons (substring string i (match-beginning 0)) strings)) + (unless (= (aref string (match-beginning 1)) ?\n) + (setq strings + (cons (make-string 1 (+ (* 16 (mail-unquote-printable-hexdigit (aref string (match-beginning 1)))) (mail-unquote-printable-hexdigit - (aref string (1+ (match-beginning 1)))))))) + (aref string (1+ (match-beginning 1)))))) + strings))) (setq i (match-end 0))) - (concat result (substring string i))))) + (apply 'concat (nreverse (cons (substring string i) strings)))))) + +;;;###autoload +(defun mail-unquote-printable-region (beg end &optional wrapper) + "Undo the \"quoted printable\" encoding in buffer from BEG to END. +If the optional argument WRAPPER is non-nil, +we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=." + (interactive "r\nP") + (save-match-data + (save-excursion + (save-restriction + (narrow-to-region beg end) + (goto-char (point-min)) + (when (and wrapper + (looking-at "\\`=\\?ISO-8859-1\\?Q\\?\\([^?]*\\)\\?")) + (delete-region (match-end 1) end) + (delete-region (point) (match-beginning 1))) + (while (re-search-forward "=\\(..\\|\n\\)" nil t) + (goto-char (match-end 0)) + (replace-match + (if (= (char-after (match-beginning 1)) ?\n) + "" + (make-string 1 + (+ (* 16 (mail-unquote-printable-hexdigit + (char-after (match-beginning 1)))) + (mail-unquote-printable-hexdigit + (char-after (1+ (match-beginning 1))))))) + t t)))))) + +(eval-when-compile (require 'rfc822)) (defun mail-strip-quoted-names (address) "Delete comments and quoted strings in an address list ADDRESS. @@ -110,18 +145,11 @@ Return a modified address list." (progn (require 'rfc822) (mapconcat 'identity (rfc822-addresses address) ", ")) (let (pos) - (string-match "\\`[ \t\n]*" address) - ;; strip surrounding whitespace - (setq address (substring address - (match-end 0) - (string-match "[ \t\n]*\\'" address - (match-end 0)))) ;; Detect nested comments. (if (string-match "[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*(" address) ;; Strip nested comments. - (save-excursion - (set-buffer (get-buffer-create " *temp*")) + (with-current-buffer (get-buffer-create " *temp*") (erase-buffer) (insert address) (set-syntax-table lisp-mode-syntax-table) @@ -138,82 +166,100 @@ Return a modified address list." (setq address (buffer-string)) (erase-buffer)) ;; Strip non-nested comments an easier way. - (while (setq pos (string-match + (while (setq pos (string-match ;; This doesn't hack rfc822 nested comments ;; `(xyzzy (foo) whinge)' properly. Big deal. "[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*)" address)) - (setq address - (mail-string-delete address - pos (match-end 0))))) + (setq address (replace-match "" nil nil address 0)))) + + ;; strip surrounding whitespace + (string-match "\\`[ \t\n]*" address) + (setq address (substring address + (match-end 0) + (string-match "[ \t\n]*\\'" address + (match-end 0)))) ;; strip `quoted' names (This is supposed to hack `"Foo Bar" ') (setq pos 0) (while (setq pos (string-match - "[ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*" + "\\([ \t]?\\)\\([ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*\\)" address pos)) ;; If the next thing is "@", we have "foo bar"@host. Leave it. (if (and (> (length address) (match-end 0)) (= (aref address (match-end 0)) ?@)) (setq pos (match-end 0)) - (setq address - (mail-string-delete address - pos (match-end 0))))) - ;; Retain only part of address in <> delims, if there is such a thing. - (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)[^,]*<\\([^>,:]*>\\)" + ;; Otherwise discard the "..." part. + (setq address (replace-match "" nil nil address 2)))) + ;; If this address contains <...>, replace it with just + ;; the part between the <...>. + (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)\\([^,]*<\\([^>,:]*\\)>[^,]*\\)\\(\\s-*,\\|\\'\\)" address)) - (let ((junk-beg (match-end 1)) - (junk-end (match-beginning 2)) - (close (match-end 0))) - (setq address (mail-string-delete address (1- close) close)) - (setq address (mail-string-delete address junk-beg junk-end)))) + (setq address (replace-match (match-string 3 address) + nil 'literal address 2))) address)))) - -(or (and (boundp 'rmail-default-dont-reply-to-names) - (not (null rmail-default-dont-reply-to-names))) - (setq rmail-default-dont-reply-to-names "info-")) -; rmail-dont-reply-to-names is defined in loaddefs -(defun rmail-dont-reply-to (userids) - "Returns string of mail addresses USERIDS sans any recipients -that start with matches for `rmail-dont-reply-to-names'. -Usenet paths ending in an element that matches are removed also." +;;; The following piece of ugliness is legacy code. The name was an +;;; unfortunate choice --- a flagrant violation of the Emacs Lisp +;;; coding conventions. `mail-dont-reply-to' would have been +;;; infinitely better. Also, `rmail-dont-reply-to-names' might have +;;; been better named `mail-dont-reply-to-names' and sourced from this +;;; file instead of in rmail.el. Yuck. -pmr +(defun rmail-dont-reply-to (destinations) + "Prune addresses from DESTINATIONS, a list of recipient addresses. +All addresses matching `rmail-dont-reply-to-names' are removed from +the comma-separated list. The pruned list is returned." (if (null rmail-dont-reply-to-names) (setq rmail-dont-reply-to-names (concat (if rmail-default-dont-reply-to-names (concat rmail-default-dont-reply-to-names "\\|") - "") - (concat (regexp-quote (user-login-name)) - "\\>")))) - (let ((match (concat "\\(^\\|,\\)[ \t\n]*\\([^,\n]*[!<]\\|\\)\\(" - rmail-dont-reply-to-names - "\\|[^\,.<]*<\\(" rmail-dont-reply-to-names "\\)" - "\\)")) - (case-fold-search t) - pos epos) - (while (setq pos (string-match match userids)) - (if (> pos 0) (setq pos (match-beginning 2))) - (setq epos - ;; Delete thru the next comma, plus whitespace after. - (if (string-match ",[ \t\n]*" userids (match-end 0)) - (match-end 0) - (length userids))) - (setq userids - (mail-string-delete - userids pos epos))) - ;; get rid of any trailing commas - (if (setq pos (string-match "[ ,\t\n]*\\'" userids)) - (setq userids (substring userids 0 pos))) - ;; remove leading spaces. they bother me. - (if (string-match "\\s *" userids) - (substring userids (match-end 0)) - userids))) + "") + (if (and user-mail-address + (not (equal user-mail-address user-login-name))) + (concat (regexp-quote user-mail-address) "\\|") + "") + (concat (regexp-quote user-login-name) "\\>")))) + ;; Split up DESTINATIONS and match each element separately. + (let ((start-pos 0) (cur-pos 0) + (case-fold-search t)) + (while start-pos + (setq cur-pos (string-match "[,\"]" destinations cur-pos)) + (if (and cur-pos (equal (match-string 0 destinations) "\"")) + ;; Search for matching quote. + (let ((next-pos (string-match "\"" destinations (1+ cur-pos)))) + (if next-pos + (setq cur-pos (1+ next-pos)) + ;; If the open-quote has no close-quote, + ;; delete the open-quote to get something well-defined. + ;; This case is not valid, but it can happen if things + ;; are weird elsewhere. + (setq destinations (concat (substring destinations 0 cur-pos) + (substring destinations (1+ cur-pos)))) + (setq cur-pos start-pos))) + (let* ((address (substring destinations start-pos cur-pos)) + (naked-address (mail-strip-quoted-names address))) + (if (string-match rmail-dont-reply-to-names naked-address) + (setq destinations (concat (substring destinations 0 start-pos) + (and cur-pos (substring destinations + (1+ cur-pos)))) + cur-pos start-pos) + (setq cur-pos (and cur-pos (1+ cur-pos)) + start-pos cur-pos)))))) + ;; get rid of any trailing commas + (let ((pos (string-match "[ ,\t\n]*\\'" destinations))) + (if pos + (setq destinations (substring destinations 0 pos)))) + ;; remove leading spaces. they bother me. + (if (string-match "\\(\\s \\|,\\)*" destinations) + (substring destinations (match-end 0)) + destinations)) + ;;;###autoload (defun mail-fetch-field (field-name &optional last all list) - "Return the value of the header field FIELD-NAME. -The buffer is expected to be narrowed to just the headers of the message. -If second arg LAST is non-nil, use the last such field if there are several. + "Return the value of the header field whose type is FIELD-NAME. +The buffer is expected to be narrowed to just the header of the message. +If second arg LAST is non-nil, use the last field of type FIELD-NAME. If third arg ALL is non-nil, concatenate all such fields with commas between. If 4th arg LIST is non-nil, return a list of all such fields." (save-excursion @@ -258,16 +304,16 @@ If 4th arg LIST is non-nil, return a list of all such fields." (defun mail-parse-comma-list () (let (accumulated beg) - (skip-chars-forward " ") + (skip-chars-forward " \t\n") (while (not (eobp)) (setq beg (point)) (skip-chars-forward "^,") - (skip-chars-backward " ") + (skip-chars-backward " \t\n") (setq accumulated - (cons (buffer-substring beg (point)) + (cons (buffer-substring-no-properties beg (point)) accumulated)) (skip-chars-forward "^,") - (skip-chars-forward ", ")) + (skip-chars-forward ", \t\n")) accumulated)) (defun mail-comma-list-regexp (labels)