;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; 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
;; 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:
(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)))
;;;###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)
: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-delete-after-output nil "\
(cite-prefix "a-z")
(cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
(list '("^\\(From\\|Sender\\|Resent-From\\):"
- . font-lock-function-name-face)
- '("^Reply-To:.*$" . font-lock-function-name-face)
- '("^Subject:" . font-lock-comment-face)
- '("^X-Spam-Status:" . font-lock-keyword-face)
+ . 'rmail-header-name)
+ '("^Reply-To:.*$" . 'rmail-header-name)
+ '("^Subject:" . 'rmail-header-name)
+ '("^X-Spam-Status:" . 'rmail-header-name)
'("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
- . font-lock-keyword-face)
+ . 'rmail-header-name)
;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
`(,cite-chars
(,(concat "\\=[ \t]*"
(1 font-lock-comment-delimiter-face nil t)
(5 font-lock-comment-face nil t)))
'("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$"
- . font-lock-string-face))))
+ . 'rmail-header-name))))
"Additional expressions to highlight in Rmail mode.")
;; Perform BODY in the summary buffer
(require rmail-mime-feature)
(error
(display-warning
- :warning
+ 'rmail
(format "Although MIME support is requested
by setting `rmail-enable-mime' to non-nil, the required feature
`%s' (the value of `rmail-mime-feature')
is not available in the current session.
-So, the MIME support is turned off for the moment."
- rmail-mime-feature))
+So, the MIME support is turned off for the moment."
+ rmail-mime-feature)
+ :warning)
(setq rmail-enable-mime nil)))))
;; 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
(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.
(provide 'rmail)
-;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
+;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
;;; rmail.el ends here