[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Francesco Potortì]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.357 emacs/lisp/mail/rmail.el:1.358
*** emacs/lisp/mail/rmail.el:1.357      Sun Mar 24 19:41:26 2002
--- emacs/lisp/mail/rmail.el    Mon May  6 03:52:30 2002
***************
*** 315,321 ****
    :group 'rmail
    :version "21.1"
    :type '(repeat (sexp :tag "Directive")))
!   
  (defvar rmail-reply-prefix "Re: "
    "String to prepend to Subject line when replying to a message.")
  
--- 315,321 ----
    :group 'rmail
    :version "21.1"
    :type '(repeat (sexp :tag "Directive")))
! 
  (defvar rmail-reply-prefix "Re: "
    "String to prepend to Subject line when replying to a message.")
  
***************
*** 432,438 ****
  ;;;###autoload
  (defvar rmail-insert-mime-forwarded-message-function nil
    "Function to insert a message in MIME format so it can be forwarded.
! This function is called if `rmail-enable-mime' or 
  `rmail-enable-mime-composing' is non-nil.
  It is called with one argument FORWARD-BUFFER, which is a
  buffer containing the message to forward.  The current buffer
--- 432,438 ----
  ;;;###autoload
  (defvar rmail-insert-mime-forwarded-message-function nil
    "Function to insert a message in MIME format so it can be forwarded.
! This function is called if `rmail-enable-mime' or
  `rmail-enable-mime-composing' is non-nil.
  It is called with one argument FORWARD-BUFFER, which is a
  buffer containing the message to forward.  The current buffer
***************
*** 546,552 ****
      (let* ((cite-chars "[>|}]")
           (cite-prefix "A-Za-z")
           (cite-suffix (concat cite-prefix "address@hidden'\"")))
!       (list '("^\\(From\\|Sender\\):" . font-lock-function-name-face)
            '("^Reply-To:.*$" . font-lock-function-name-face)
            '("^Subject:" . font-lock-comment-face)
            '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
--- 546,552 ----
      (let* ((cite-chars "[>|}]")
           (cite-prefix "A-Za-z")
           (cite-suffix (concat cite-prefix "address@hidden'\"")))
!       (list '("^\\(From\\|Sender\\|Resent-[Ff]rom\\):" . 
font-lock-function-name-face)
            '("^Reply-To:.*$" . font-lock-function-name-face)
            '("^Subject:" . font-lock-comment-face)
            '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
***************
*** 632,638 ****
         ;; need code conversion while the buffer is unibyte
         ;; (i.e. enable-multibyte-characters is nil).
           (rmail-enable-multibyte
!           (if existed 
              (with-current-buffer existed enable-multibyte-characters)
              (default-value 'enable-multibyte-characters)))
         ;; Since the file may contain messages of different encodings
--- 632,638 ----
         ;; need code conversion while the buffer is unibyte
         ;; (i.e. enable-multibyte-characters is nil).
           (rmail-enable-multibyte
!           (if existed
              (with-current-buffer existed enable-multibyte-characters)
              (default-value 'enable-multibyte-characters)))
         ;; Since the file may contain messages of different encodings
***************
*** 657,663 ****
                   (eq major-mode 'rmail-mode))
              (progn (rmail-forget-messages)
                     (rmail-set-message-counters))))
!       (switch-to-buffer 
         (let ((enable-local-variables nil))
         (find-file-noselect file-name))))
      (if (eq major-mode 'rmail-edit-mode)
--- 657,663 ----
                   (eq major-mode 'rmail-mode))
              (progn (rmail-forget-messages)
                     (rmail-set-message-counters))))
!       (switch-to-buffer
         (let ((enable-local-variables nil))
         (find-file-noselect file-name))))
      (if (eq major-mode 'rmail-edit-mode)
***************
*** 1269,1276 ****
                   (if (consp item)
                       (progn
                         (setq command
!                              (rmail-list-to-menu (car item) (cdr item) 
!                                                  action 
                                                   (if full-name
                                                       (concat full-name "/"
                                                               (car item))
--- 1269,1276 ----
                   (if (consp item)
                       (progn
                         (setq command
!                              (rmail-list-to-menu (car item) (cdr item)
!                                                  action
                                                   (if full-name
                                                       (concat full-name "/"
                                                               (car item))
***************
*** 1278,1287 ****
                         (setq name (car item)))
                     (progn
                       (setq name item)
!                      (setq command 
                             (list 'lambda () '(interactive)
                                   (list action
!                                        (expand-file-name 
                                          (if full-name
                                              (concat full-name "/" item)
                                            item)
--- 1278,1287 ----
                         (setq name (car item)))
                     (progn
                       (setq name item)
!                      (setq command
                             (list 'lambda () '(interactive)
                                   (list action
!                                        (expand-file-name
                                          (if full-name
                                              (concat full-name "/" item)
                                            item)
***************
*** 1290,1296 ****
                     (cons name command)))))
       (reverse l))
      menu))
!  
  ;; This command is always "disabled" when it appears in a menu.
  (put 'rmail-disable-menu 'menu-enable ''nil)
  
--- 1290,1296 ----
                     (cons name command)))))
       (reverse l))
      menu))
! 
  ;; This command is always "disabled" when it appears in a menu.
  (put 'rmail-disable-menu 'menu-enable ''nil)
  
***************
*** 1299,1311 ****
      (if files
        (progn
          (define-key rmail-mode-map [menu-bar classify input-menu]
!           (cons "Input Rmail File" 
!                 (rmail-list-to-menu "Input Rmail File" 
                                      files
                                      'rmail-input)))
          (define-key rmail-mode-map [menu-bar classify output-menu]
!           (cons "Output Rmail File" 
!                 (rmail-list-to-menu "Output Rmail File" 
                                      files
                                      'rmail-output-to-rmail-file))))
  
--- 1299,1311 ----
      (if files
        (progn
          (define-key rmail-mode-map [menu-bar classify input-menu]
!           (cons "Input Rmail File"
!                 (rmail-list-to-menu "Input Rmail File"
                                      files
                                      'rmail-input)))
          (define-key rmail-mode-map [menu-bar classify output-menu]
!           (cons "Output Rmail File"
!                 (rmail-list-to-menu "Output Rmail File"
                                      files
                                      'rmail-output-to-rmail-file))))
  
***************
*** 1548,1560 ****
                   (save-excursion
                     (setq errors (generate-new-buffer " *rmail loss*"))
                     (buffer-disable-undo errors)
!                    (let ((args 
!                           (append 
                             (list (or rmail-movemail-program
                                       (expand-file-name "movemail"
                                                         exec-directory))
                                   nil errors nil)
!                            (if rmail-preserve-inbox 
                                 (list "-p")
                               nil)
                             rmail-movemail-flags
--- 1548,1560 ----
                   (save-excursion
                     (setq errors (generate-new-buffer " *rmail loss*"))
                     (buffer-disable-undo errors)
!                    (let ((args
!                           (append
                             (list (or rmail-movemail-program
                                       (expand-file-name "movemail"
                                                         exec-directory))
                                   nil errors nil)
!                            (if rmail-preserve-inbox
                                 (list "-p")
                               nil)
                             rmail-movemail-flags
***************
*** 1869,1875 ****
                      ""
                    (concat
                     "Date: \\2, \\4 \\3 \\9 \\5 "
!                   
                     ;; The timezone could be matched by group 7 or group 10.
                     ;; If neither of them matched, assume EST, since only
                     ;; Easterners would be so sloppy.
--- 1869,1875 ----
                      ""
                    (concat
                     "Date: \\2, \\4 \\3 \\9 \\5 "
! 
                     ;; The timezone could be matched by group 7 or group 10.
                     ;; If neither of them matched, assume EST, since only
                     ;; Easterners would be so sloppy.
***************
*** 2312,2318 ****
            (aset rmail-msgref-vector i (list i))
            (setq i (1+ i))))
        (message "Counting messages...done")))))
!       
  (defun rmail-set-message-counters-counter (&optional stop)
    (let ((start (point))
        next)
--- 2312,2318 ----
            (aset rmail-msgref-vector i (list i))
            (setq i (1+ i))))
        (message "Counting messages...done")))))
! 
  (defun rmail-set-message-counters-counter (&optional stop)
    (let ((start (point))
        next)
***************
*** 2588,2594 ****
    "Show previous message whether deleted or not.
  With prefix arg N, moves backward N messages, or forward if N is negative."
    (interactive "p")
!   (rmail-next-message (- n)))  
  
  (defun rmail-next-undeleted-message (n)
    "Show following non-deleted message.
--- 2588,2594 ----
    "Show previous message whether deleted or not.
  With prefix arg N, moves backward N messages, or forward if N is negative."
    (interactive "p")
!   (rmail-next-message (- n)))
  
  (defun rmail-next-undeleted-message (n)
    "Show following non-deleted message.
***************
*** 2675,2681 ****
                (forward-line 1))
              (setq beg (point))
              (narrow-to-region (point) end))
!           (progn 
              (rfc822-goto-eoh)
              (setq end (point)))
          (setq beg (point))
--- 2675,2681 ----
                (forward-line 1))
              (setq beg (point))
              (narrow-to-region (point) end))
!           (progn
              (rfc822-goto-eoh)
              (setq end (point)))
          (setq beg (point))
***************
*** 3419,3432 ****
      (save-excursion
        (goto-char (point-min))
        (let ((case-fold-search t))
!       (if (and content-type 
!                (string-match 
!                 ";[\n\t ]*boundary=\"?\\([-0-9a-z'()+_,./:=? ]+\\)\"?" 
                  content-type))
            ;; Handle a MIME multipart bounce message.
            (let ((codestring
                   (concat "\n--"
!                          (substring content-type (match-beginning 1) 
                                      (match-end 1)))))
              (unless (re-search-forward mail-mime-unsent-header nil t)
                (error "Cannot find beginning of header in failed message"))
--- 3419,3432 ----
      (save-excursion
        (goto-char (point-min))
        (let ((case-fold-search t))
!       (if (and content-type
!                (string-match
!                 ";[\n\t ]*boundary=\"?\\([-0-9a-z'()+_,./:=? ]+\\)\"?"
                  content-type))
            ;; Handle a MIME multipart bounce message.
            (let ((codestring
                   (concat "\n--"
!                          (substring content-type (match-beginning 1)
                                      (match-end 1)))))
              (unless (re-search-forward mail-mime-unsent-header nil t)
                (error "Cannot find beginning of header in failed message"))
***************
*** 3547,3553 ****
         (setq window (get-buffer-window rmail-summary-buffer))
         ;; Don't try to change the size if just one window in frame.
         (not (eq window (frame-root-window (window-frame window))))
!        (unwind-protect 
             (progn
               (select-window window)
               (enlarge-window (- rmail-summary-window-size (window-height))))
--- 3547,3553 ----
         (setq window (get-buffer-window rmail-summary-buffer))
         ;; Don't try to change the size if just one window in frame.
         (not (eq window (frame-root-window (window-frame window))))
!        (unwind-protect
             (progn
               (select-window window)
               (enlarge-window (- rmail-summary-window-size (window-height))))
***************
*** 3706,3712 ****
    "Set PASSWORD to be used for retrieving mail from a POP server."
    (interactive "sPassword: ")
    (if password
!       (setq rmail-encoded-pop-password 
            (rmail-encode-string password (emacs-pid)))
      (setq rmail-pop-password nil)
      (setq rmail-encoded-pop-password nil)))
--- 3706,3712 ----
    "Set PASSWORD to be used for retrieving mail from a POP server."
    (interactive "sPassword: ")
    (if password
!       (setq rmail-encoded-pop-password
            (rmail-encode-string password (emacs-pid)))
      (setq rmail-pop-password nil)
      (setq rmail-encoded-pop-password nil)))
***************
*** 3732,3738 ****
  Returns the encoded string.  Calling the function again with an
  encoded string (and the same mask) will decode the string."
   (setq mask (abs mask))                       ; doesn't work if negative
!  (let* ((string-vector (string-to-vector string)) (i 0) 
        (len (length string-vector)) (curmask mask) charmask)
     (while (< i len)
       (if (= curmask 0)
--- 3732,3738 ----
  Returns the encoded string.  Calling the function again with an
  encoded string (and the same mask) will decode the string."
   (setq mask (abs mask))                       ; doesn't work if negative
!  (let* ((string-vector (string-to-vector string)) (i 0)
        (len (length string-vector)) (curmask mask) charmask)
     (while (< i len)
       (if (= curmask 0)