comparison lisp/mail/rmail.el @ 88206:fdaa84109d39

(rmail-get-sender): Deleted (rmail-process-new-messages): Use mail-fetch-field instead.

88205:f400fb7ee08a

  (let ((inhibit-read-only t)
        (case-fold-search nil)
	(new-message-counter 0)
	(start (point-max))
	end attributes keywords message-descriptor-list
	date coding)
    (or nomsg (message "Processing new messages..."))
    ;; Process each message in turn starting from the back and
    ;; proceeding to the front of the region.  This is especially a
    ;; good approach since the buffer will likely have new headers
    ;; added.

		(vconcat (list (list (point-min-marker)
				     attributes
                                     keywords
				     date
                                     (count-lines start end)
                                     (rmail-get-sender)
                                     (rmail-header-get-header "subject")))
			 message-descriptor-list)))))
    ;; Add the new message data lists to the Rmail message descriptor
    ;; vector.
    (rmail-desc-add-descriptors message-descriptor-list)

     (setq curmask (lsh curmask -8))
     (aset string-vector i (logxor charmask (aref string-vector i)))
     (setq i (1+ i)))
   (concat string-vector)))

;;; New functions that need better placement.
(defun rmail-get-sender ()
  "Return the message sender.
The current buffer (possibly narrowed) contains a single message."
  (save-excursion
    (goto-char (point-min))
    (if (not (re-search-forward "^From:[ \t]*" nil t))
	"                         "
      (let* ((from (mail-strip-quoted-names
		    (buffer-substring
		     (1- (point))
		     ;; Get all the lines of the From field
		     ;; so that we get a whole comment if there is one,
		     ;; so that mail-strip-quoted-names can discard it.
		     (let ((opoint (point)))
		       (while (progn (forward-line 1)
				     (looking-at "[ \t]")))
		       ;; Back up over newline, then trailing spaces or tabs
		       (forward-char -1)
		       (skip-chars-backward " \t")
		       (point)))))
	     len mch lo)
	(if (string-match (concat "^\\("
				  (regexp-quote (user-login-name))
				  "\\($\\|@\\)\\|"
				  (regexp-quote
				   ;; Don't lose if run from init file
				   ;; where user-mail-address is not
				   ;; set yet.
				   (or user-mail-address
				       (concat (user-login-name) "@"
					       (or mail-host-address
						   (system-name)))))
				  "\\>\\)")
			  from)
	    (save-excursion
	      (goto-char (point-min))
	      (if (not (re-search-forward "^To:[ \t]*" nil t))
		  nil
		(setq from
		      (concat "to: "
			      (mail-strip-quoted-names
			       (buffer-substring
				(point)
				(progn (end-of-line)
				       (skip-chars-backward " \t")
				       (point)))))))))
	(setq len (length from))
	(setq mch (string-match "[@%]" from))
	(format "%25s"
		(if (or (not mch) (<= len 25))
		    (substring from (max 0 (- len 25)))
		  (substring from
			     (setq lo (cond ((< (- mch 14) 0) 0)
					    ((< len (+ mch 11))
					     (- len 25))
					    (t (- mch 14))))
			     (min len (+ lo 25)))))))))

;;;;  Desktop support

(defun rmail-restore-desktop-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
                                     desktop-buffer-misc)

88206:fdaa84109d39

  (let ((inhibit-read-only t)
        (case-fold-search nil)
	(new-message-counter 0)
	(start (point-max))
	end attributes keywords message-descriptor-list
	date coding sender)
    (or nomsg (message "Processing new messages..."))
    ;; Process each message in turn starting from the back and
    ;; proceeding to the front of the region.  This is especially a
    ;; good approach since the buffer will likely have new headers
    ;; added.

		(vconcat (list (list (point-min-marker)
				     attributes
                                     keywords
				     date
                                     (count-lines start end)
				     (cadr (mail-extract-address-components
					    (mail-fetch-field "from")))
                                     (rmail-header-get-header "subject")))
			 message-descriptor-list)))))
    ;; Add the new message data lists to the Rmail message descriptor
    ;; vector.
    (rmail-desc-add-descriptors message-descriptor-list)

     (setq curmask (lsh curmask -8))
     (aset string-vector i (logxor charmask (aref string-vector i)))
     (setq i (1+ i)))
   (concat string-vector)))

;;;;  Desktop support

(defun rmail-restore-desktop-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
                                     desktop-buffer-misc)