Merge from emacs--rel--22

[bpt/emacs.git] / lisp / mail / rmail.el

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9570ab3..6e3056d 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -219,7 +217,15 @@ Otherwise, look for `movemail' in the directories in
       (dolist (dir (append rmail-movemail-search-path exec-path
                           (list exec-directory)))
        (when (and dir (file-accessible-directory-p dir))
-         (let ((progname (expand-file-name "movemail" dir)))
+         ;; Previously, this didn't have to work on Windows, because
+         ;; rmail-insert-inbox-text before r1.439 fell back to using
+         ;; (expand-file-name "movemail" exec-directory) and just
+         ;; assuming it would work.
+         ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-02/msg00087.html
+         (let ((progname (expand-file-name
+                          (concat "movemail"
+                                  (if (memq system-type '(ms-dos windows-nt))
+                                      ".exe")) dir)))
            (when (and (not (file-directory-p progname))
                       (file-executable-p progname))
              (let ((x (rmail-probe progname)))
@@ -327,8 +333,7 @@ If nil, display all header fields except those matched by
 ;;;###autoload
 (defcustom rmail-highlighted-headers "^From:\\|^Subject:" "\
 *Regexp to match Header fields that Rmail should normally highlight.
-A value of nil means don't highlight.
-See also `rmail-highlight-face'."
+A value of nil means don't highlight."
   :type 'regexp
   :group 'rmail-headers)
 
@@ -338,26 +343,12 @@ See also `rmail-highlight-face'."
   :group 'rmail-headers
   :version "22.1")
 
-;;;###autoload
-(defcustom rmail-highlight-face 'rmail-highlight "\
-*Face used by Rmail for highlighting headers."
-  :type '(choice (const :tag "Default" nil)
-                face)
-  :group 'rmail-headers)
-
 (defface rmail-header-name
   '((t (:inherit font-lock-function-name-face)))
   "Face to use for highlighting the header names."
   :group 'rmail-headers
   :version "23.1")
 
-;;;###autoload
-(defcustom rmail-header-name-face 'rmail-header-name "\
-*Face to use for highlighting the header names."
-  :type '(choice (const :tag "Default" nil)
-                face)
-  :group 'rmail-headers)
-
 ;;;###autoload
 (defcustom rmail-delete-after-output nil "\
 *Non-nil means automatically delete a message that is copied to a file."
@@ -711,9 +702,9 @@ The first parenthesized expression should match the MIME-charset name.")
      "\n"))
   nil)
 
-(setq rmail-font-lock-keywords
+(defvar rmail-font-lock-keywords
   ;; These are all matched case-insensitively.
-      ;;(eval-when-compile
+  (eval-when-compile
     (let* ((cite-chars "[>|}]")
           (cite-prefix "a-z")
           (cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
@@ -735,8 +726,7 @@ The first parenthesized expression should match the MIME-charset name.")
               (5 font-lock-comment-face nil t)))
            '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$"
              . 'rmail-header-name))))
-;;)
-;;  "Additional expressions to highlight in Rmail mode.")
+  "Additional expressions to highlight in Rmail mode.")
 
 ;; Perform BODY in the summary buffer
 ;; in such a way that its cursor is properly updated in its own window.
@@ -1813,9 +1803,9 @@ is non-nil if the user has supplied the password interactively.
                    ;; in case of multiple inboxes that need moving.
                    (concat ".newmail-"
                            (file-name-nondirectory
-                            (if (memq system-type '(windows-nt cygwin))
-                                ;; cannot have "po:" in file name
-                                (substring file 3)
+                            (if (memq system-type '(windows-nt cygwin ms-dos))
+                                ;; cannot have colons in file name
+                                (replace-regexp-in-string ":" "-" file)
                               file)))
                    ;; Use the directory of this rmail file
                    ;; because it's a nuisance to use the homedir
@@ -2989,7 +2979,7 @@ iso-8859, koi8-r, etc."
                (inhibit-read-only t)
                ;; Highlight with boldface if that is available.
                ;; Otherwise use the `highlight' face.
-               (face (or rmail-highlight-face
+               (face (or 'rmail-highlight
                          (if (face-differs-from-default-p 'bold)
                              'bold 'highlight)))
                ;; List of overlays to reuse.
@@ -4292,5 +4282,5 @@ encoded string (and the same mask) will decode the string."
 
 (provide 'rmail)
 
-;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
+;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
 ;;; rmail.el ends here