emacs: lisp/mail/rmail.el comparison

comparison lisp/mail/rmail.el @ 21435:41fa600fadc4

(rmail-message-regexp-p): Handle messages whose headers have not been reformatted. (rmail-message-recipients-p): Likewise. (rmail-movemail-program): Customized. (rmail-message-filter): Customized. (rmail-display-summary): Customized. (rmail-inbox-list, rmail-keywords, rmail-current-message) (rmail-total-messages, rmail-message-vector, rmail-deleted-vector) (rmail-msgref-vector, rmail-overlay-list, rmail-view-buffer) (rmail-last-label, rmail-last-regexp): Now permanent locals. (rmail-perm-variables): Set up all permanent locals here. (rmail-variables): Not here. (rmail-variables): Set enable-local-variables here. (rmail-mode-2): Not here.

author	Karl Heuer <kwzh@gnu.org>
date	Wed, 08 Apr 1998 19:02:34 +0000
parents	4370dfe3cfb3
children	cd1971673dfd

comparison

equal deleted inserted replaced

-:276b22459b98
+:41fa600fadc4
 ;;   buffers, summary by topic or by regular expression, rmail-reply-prefix
 ;;   variable, and a bury rmail buffer (wipe) command.
 ;;
 (require 'mail-utils)
-;; For Emacs V18 compatibility
-(and (not (fboundp 'buffer-disable-undo))
-(fboundp 'buffer-flush-undo)
-(defalias 'buffer-disable-undo 'buffer-flush-undo))
 ; These variables now declared in paths.el.
 ;(defvar rmail-spool-directory "/usr/spool/mail/"
 ;  "This is the name of the directory used by the system mailer for\n\
 ;delivering new mail.  Its name should end with a slash.")
 :prefix "rmail-output-"
 :prefix "rmail-"
 :group 'rmail)
-(defvar rmail-movemail-program nil
+(defcustom rmail-movemail-program nil
-"If non-nil, name of program for fetching new mail.")
+"If non-nil, name of program for fetching new mail."
+:group 'rmail-retrieve
+:type 'string)
 (defcustom rmail-pop-password nil
 "*Password to use when reading mail from a POP server, if required."
 :type '(choice (string :tag "Password")
 		 (const :tag "Not Required" nil))
 (defvar rmail-mmdf-delim1 "^\001\001\001\001\n"
 "Regexp marking the start of an mmdf message")
 (defvar rmail-mmdf-delim2 "^\001\001\001\001\n"
 "Regexp marking the end of an mmdf message")
-(defvar rmail-message-filter nil
+(defcustom rmail-message-filter nil
 "If non-nil, a filter function for new messages in RMAIL.
 Called with region narrowed to the message, including headers,
-before obeying `rmail-ignored-headers'.")
+before obeying `rmail-ignored-headers'."
+:group 'rmail-headers
+:type 'function)
 (defvar rmail-reply-prefix "Re: "
 "String to prepend to Subject line when replying to a message.")
 ;; Some mailers use "Re(2):" or "Re^2:" or "Re: Re:" or "Re[2]:".
 ;; This pattern should catch all the common variants.
 (defvar rmail-reply-regexp "\\`\\(Re\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?: *\\)*"
 "Regexp to delete from Subject line before inserting `rmail-reply-prefix'.")
-(defvar rmail-display-summary nil
+(defcustom rmail-display-summary nil
-"If non-nil, Rmail always displays the summary buffer.")
+"*If non-nil, Rmail always displays the summary buffer."
+:group 'rmail-summary
-(defvar rmail-mode-map nil)
+:type 'boolean)
 (defvar rmail-inbox-list nil)
+(put 'rmail-inbox-list 'permanent-local t)
 (defvar rmail-keywords nil)
+(put 'rmail-keywords 'permanent-local t)
 (defvar rmail-buffer nil
 "The RMAIL buffer related to the current buffer.
 In an RMAIL buffer, this holds the RMAIL buffer itself.
 In a summary buffer, this holds the RMAIL buffer it is a summary for.")
 (put 'rmail-buffer 'permanent-local t)
 ;; Message counters and markers.  Deleted flags.
 (defvar rmail-current-message nil)
+(put 'rmail-current-message 'permanent-local t)
 (defvar rmail-total-messages nil)
+(put 'rmail-total-messages 'permanent-local t)
 (defvar rmail-message-vector nil)
+(put 'rmail-message-vector 'permanent-local t)
 (defvar rmail-deleted-vector nil)
+(put 'rmail-deleted-vector 'permanent-local t)
 (defvar rmail-msgref-vector nil
 "In an Rmail buffer, a vector whose Nth element is a list (N).
 When expunging renumbers messages, these lists are modified
 by substituting the new message number into the existing list.")
+(put 'rmail-msgref-vector 'permanent-local t)
 (defvar rmail-overlay-list nil)
+(put 'rmail-overlay-list 'permanent-local t)
+;; These are used by autoloaded rmail-summary.
+(defvar rmail-summary-buffer nil)
+(put 'rmail-summary-buffer 'permanent-local t)
+(defvar rmail-summary-vector nil)
+(put 'rmail-summary-vector 'permanent-local t)
+(defvar rmail-view-buffer nil
+"Buffer which holds RMAIL message for MIME displaying.")
+(put 'rmail-view-buffer 'permanent-local t)
+;; `Sticky' default variables.
+;; Last individual label specified to a or k.
+(defvar rmail-last-label nil)
+(put 'rmail-last-label 'permanent-local t)
+;; Last set of values specified to C-M-n, C-M-p, C-M-s or C-M-l.
+(defvar rmail-last-multi-labels nil)
+(defvar rmail-last-regexp nil)
+(put 'rmail-last-regexp 'permanent-local t)
+(defcustom rmail-default-file "~/xmail"
+"*Default file name for \\[rmail-output]."
+:type 'file
+:group 'rmail-files)
+(defcustom rmail-default-rmail-file "~/XMAIL"
+"*Default file name for \\[rmail-output-to-rmail-file]."
+:type 'file
+:group 'rmail-files)
+;; Mule and MIME related variables.
+;;;###autoload
+(defvar rmail-file-coding-system nil
+"Coding system used in RMAIL file.
+This is set to nil by default.")
+;;;###autoload
+(defcustom rmail-enable-mime nil
+"*If non-nil, RMAIL uses MIME feature.
+If the value is t, RMAIL automatically shows MIME decoded message.
+If the value is neither t nor nil, RMAIL does not show MIME decoded message
+until a user explicitly requires it."
+:type '(choice (const :tag "on" t)
+		 (const :tag "off" nil)
+		 (sexp :tag "when asked" :format "%t\n" ask))
+:group 'rmail)
+;;;###autoload
+(defvar rmail-show-mime-function nil
+"Function to show MIME decoded message of RMAIL file.")
+;;;###autoload
+(defvar rmail-mime-feature 'rmail-mime
+"Feature to provide for using MIME feature in RMAIL.
+When starting rmail, this feature is requrired if rmail-enable-mime
+is non-nil.")
+;;; Regexp matching the delimiter of messages in UNIX mail format
+;;; (UNIX From lines), minus the initial ^.  Note that if you change
+;;; this expression, you must change the code in rmail-nuke-pinhead-header
+;;; that knows the exact ordering of the \\( \\) subexpressions.
+(defvar rmail-unix-mail-delimiter
+(let ((time-zone-regexp
+	 (concat "\\([A-Z]?[A-Z]?[A-Z][A-Z]\\( DST\\)?"
+		 "\\|[-+]?[0-9][0-9][0-9][0-9]"
+		 "\\|"
+		 "\\) *")))
+(concat
+"From "
+;; Many things can happen to an RFC 822 mailbox before it is put into
+;; a `From' line.  The leading phrase can be stripped, e.g.
+;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
+;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
+;; can be removed, e.g.
+;;		From: joe@y.z (Joe	K
+;;			User)
+;; can yield `From joe@y.z (Joe 	K Fri Mar 22 08:11:15 1996', and
+;;		From: Joe User
+;;			<joe@y.z>
+;; can yield `From Joe User Fri Mar 22 08:11:15 1996'.
+;; The mailbox can be removed or be replaced by white space, e.g.
+;;		From: "Joe User"{space}{tab}
+;;			<joe@y.z>
+;; can yield `From {space}{tab} Fri Mar 22 08:11:15 1996',
+;; where {space} and {tab} represent the Ascii space and tab characters.
+;; We want to match the results of any of these manglings.
+;; The following regexp rejects names whose first characters are
+;; obviously bogus, but after that anything goes.
+"\\([^\0-\b\n-\r\^?].*\\)? "
+;; The time the message was sent.
+"\\([^\0-\r \^?]+\\) +"				; day of the week
+"\\([^\0-\r \^?]+\\) +"				; month
+"\\([0-3]?[0-9]\\) +"				; day of month
+"\\([0-2][0-9]:[0-5][0-9]\\(:[0-6][0-9]\\)?\\) *"	; time of day
+;; Perhaps a time zone, specified by an abbreviation, or by a
+;; numeric offset.
+time-zone-regexp
+;; The year.
+" \\([0-9][0-9]+\\) *"
+;; On some systems the time zone can appear after the year, too.
+time-zone-regexp
+;; Old uucp cruft.
+"\\(remote from .*\\)?"
+"\n"))
+nil)
 (defvar rmail-font-lock-keywords
 (eval-when-compile
 (let* ((cite-chars "[>|}]")
 	   (cite-prefix "A-Za-z")
 	       (4 font-lock-comment-face nil t)))
 	    '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\|Date\\):.*$"
 	      . font-lock-string-face))))
 "Additional expressions to highlight in Rmail mode.")
-;; These are used by autoloaded rmail-summary.
-(defvar rmail-summary-buffer nil)
-(put 'rmail-summary-buffer 'permanent-local t)
-(defvar rmail-summary-vector nil)
-(put 'rmail-summary-vector 'permanent-local t)
-;; `Sticky' default variables.
-;; Last individual label specified to a or k.
-(defvar rmail-last-label nil)
-;; Last set of values specified to C-M-n, C-M-p, C-M-s or C-M-l.
-(defvar rmail-last-multi-labels nil)
-(defvar rmail-last-regexp nil)
-(defcustom rmail-default-file "~/xmail"
-"*Default file name for \\[rmail-output]."
-:type 'file
-:group 'rmail-files)
-(defcustom rmail-default-rmail-file "~/XMAIL"
-"*Default file name for \\[rmail-output-to-rmail-file]."
-:type 'file
-:group 'rmail-files)
-;;; Regexp matching the delimiter of messages in UNIX mail format
-;;; (UNIX From lines), minus the initial ^.  Note that if you change
-;;; this expression, you must change the code in rmail-nuke-pinhead-header
-;;; that knows the exact ordering of the \\( \\) subexpressions.
-(defvar rmail-unix-mail-delimiter
-(let ((time-zone-regexp
-	 (concat "\\([A-Z]?[A-Z]?[A-Z][A-Z]\\( DST\\)?"
-		 "\\|[-+]?[0-9][0-9][0-9][0-9]"
-		 "\\|"
-		 "\\) *")))
-(concat
-"From "
-;; Many things can happen to an RFC 822 mailbox before it is put into
-;; a `From' line.  The leading phrase can be stripped, e.g.
-;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
-;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
-;; can be removed, e.g.
-;;		From: joe@y.z (Joe	K
-;;			User)
-;; can yield `From joe@y.z (Joe 	K Fri Mar 22 08:11:15 1996', and
-;;		From: Joe User
-;;			<joe@y.z>
-;; can yield `From Joe User Fri Mar 22 08:11:15 1996'.
-;; The mailbox can be removed or be replaced by white space, e.g.
-;;		From: "Joe User"{space}{tab}
-;;			<joe@y.z>
-;; can yield `From {space}{tab} Fri Mar 22 08:11:15 1996',
-;; where {space} and {tab} represent the Ascii space and tab characters.
-;; We want to match the results of any of these manglings.
-;; The following regexp rejects names whose first characters are
-;; obviously bogus, but after that anything goes.
-"\\([^\0-\b\n-\r\^?].*\\)? "
-;; The time the message was sent.
-"\\([^\0-\r \^?]+\\) +"				; day of the week
-"\\([^\0-\r \^?]+\\) +"				; month
-"\\([0-3]?[0-9]\\) +"				; day of month
-"\\([0-2][0-9]:[0-5][0-9]\\(:[0-6][0-9]\\)?\\) *"	; time of day
-;; Perhaps a time zone, specified by an abbreviation, or by a
-;; numeric offset.
-time-zone-regexp
-;; The year.
-" \\([0-9][0-9]+\\) *"
-;; On some systems the time zone can appear after the year, too.
-time-zone-regexp
-;; Old uucp cruft.
-"\\(remote from .*\\)?"
-"\n"))
-nil)
 ;; Perform BODY in the summary buffer
 ;; in such a way that its cursor is properly updated in its own window.
 (defmacro rmail-select-summary (&rest body)
 (` (let ((total rmail-total-messages))
 (if (rmail-summary-displayed)
 	 (save-excursion
 	   (set-buffer rmail-summary-buffer)
 	   (let ((rmail-total-messages total))
 	     (,@ body))))
 (rmail-maybe-display-summary))))
-(defvar rmail-view-buffer nil
-"Buffer which holds RMAIL message for MIME displaying.")
-;; Mule and MIME related variables.
-;;;###autoload
-(defvar rmail-file-coding-system nil
-"Coding system used in RMAIL file.
-This is set to nil by default.")
-;;;###autoload
-(defcustom rmail-enable-mime nil
-"*If non-nil, RMAIL uses MIME feature.
-If the value is t, RMAIL automatically shows MIME decoded message.
-If the value is neither t nor nil, RMAIL does not show MIME decoded message
-until a user explicitly requires it."
-:type '(choice (const :tag "on" t)
-		 (const :tag "off" nil)
-		 (sexp :tag "when asked" :format "%t\n" ask))
-:group 'rmail)
-;;;###autoload
-(defvar rmail-show-mime-function nil
-"Function to show MIME decoded message of RMAIL file.")
-;;;###autoload
-(defvar rmail-mime-feature 'rmail-mime
-"Feature to provide for using MIME feature in RMAIL.
-When starting rmail, this feature is requrired if rmail-enable-mime
-is non-nil.")
 ;;;; *** Rmail Mode ***
 (defvar rmail-enable-multibyte nil)
 	    (setq count (1+ count)))
 	  (message "Decoding messages...done")
 	  (set-buffer-file-coding-system rmail-file-coding-system)
 	  (set-buffer-modified-p modifiedp)))))
+(defvar rmail-mode-map nil)
 (if rmail-mode-map
 nil
 (setq rmail-mode-map (make-keymap))
 (suppress-keymap rmail-mode-map)
 (define-key rmail-mode-map "a"      'rmail-add-label)
 (rmail-show-message rmail-total-messages)
 (run-hooks 'rmail-mode-hook))
 (defun rmail-mode-2 ()
 (kill-all-local-variables)
-;; Don't let a local variables list in a message cause confusion.
-(make-local-variable 'enable-local-variables)
-(setq enable-local-variables nil)
 (rmail-mode-1)
+(rmail-perm-variables)
 (rmail-variables))
 (defun rmail-mode-1 ()
 (setq major-mode 'rmail-mode)
 (setq mode-name "RMAIL")
 (setq mode-line-modified "--")
 (use-local-map rmail-mode-map)
 (set-syntax-table text-mode-syntax-table)
 (setq local-abbrev-table text-mode-abbrev-table))
-(defun rmail-variables ()
+;; Set up the permanent locals associated with an Rmail file.
-(make-local-variable 'revert-buffer-function)
+(defun rmail-perm-variables ()
-(setq revert-buffer-function 'rmail-revert)
-(make-local-variable 'font-lock-defaults)
-(setq font-lock-defaults
-'(rmail-font-lock-keywords t nil nil nil
-(font-lock-maximum-size . nil)
-(font-lock-fontify-buffer-function . rmail-fontify-buffer-function)
-(font-lock-unfontify-buffer-function . rmail-unfontify-buffer-function)
-(font-lock-inhibit-thing-lock . (lazy-lock-mode fast-lock-mode))))
 (make-local-variable 'rmail-last-label)
 (make-local-variable 'rmail-last-regexp)
 (make-local-variable 'rmail-deleted-vector)
 (make-local-variable 'rmail-buffer)
 (setq rmail-buffer (current-buffer))
 (setq rmail-view-buffer rmail-buffer)
 (make-local-variable 'rmail-summary-buffer)
 (make-local-variable 'rmail-summary-vector)
 (make-local-variable 'rmail-current-message)
 (make-local-variable 'rmail-total-messages)
-(make-local-variable 'require-final-newline)
-(setq require-final-newline nil)
 (make-local-variable 'rmail-overlay-list)
 (setq rmail-overlay-list nil)
-(make-local-variable 'version-control)
-(setq version-control 'never)
-(make-local-variable 'kill-buffer-hook)
-(add-hook 'kill-buffer-hook 'rmail-mode-kill-summary)
-(make-local-variable 'file-precious-flag)
-(setq file-precious-flag t)
 (make-local-variable 'rmail-message-vector)
 (make-local-variable 'rmail-msgref-vector)
 (make-local-variable 'rmail-inbox-list)
 (setq rmail-inbox-list (rmail-parse-file-inboxes))
 ;; Provide default set of inboxes for primary mail file ~/RMAIL.
 			   (concat rmail-spool-directory
 				   (user-login-name)))))))
 (make-local-variable 'rmail-keywords)
 ;; this gets generated as needed
 (setq rmail-keywords nil))
+;; Set up the non-permanent locals associated with Rmail mode.
+(defun rmail-variables ()
+;; Don't let a local variables list in a message cause confusion.
+(make-local-variable 'enable-local-variables)
+(setq enable-local-variables nil)
+(make-local-variable 'revert-buffer-function)
+(setq revert-buffer-function 'rmail-revert)
+(make-local-variable 'font-lock-defaults)
+(setq font-lock-defaults
+'(rmail-font-lock-keywords t nil nil nil
+(font-lock-maximum-size . nil)
+(font-lock-fontify-buffer-function . rmail-fontify-buffer-function)
+(font-lock-unfontify-buffer-function . rmail-unfontify-buffer-function)
+(font-lock-inhibit-thing-lock . (lazy-lock-mode fast-lock-mode))))
+(make-local-variable 'require-final-newline)
+(setq require-final-newline nil)
+(make-local-variable 'version-control)
+(setq version-control 'never)
+(make-local-variable 'kill-buffer-hook)
+(add-hook 'kill-buffer-hook 'rmail-mode-kill-summary)
+(make-local-variable 'file-precious-flag)
+(setq file-precious-flag t))
 ;; Handle M-x revert-buffer done in an rmail-mode buffer.
 (defun rmail-revert (arg noconfirm)
 (let ((revert-buffer-function (default-value 'revert-buffer-function)))
 ;; Call our caller again, but this time it does the default thing.
 (if (>= where (rmail-msgbeg high)) high low)))
 (defun rmail-message-recipients-p (msg recipients &optional primary-only)
 (save-restriction
 (goto-char (rmail-msgbeg msg))
-(search-forward "\n*** EOOH ***\n")
+(search-forward "\n*** EOOH ***\n" (point-max) t)
 (narrow-to-region (point) (progn (search-forward "\n\n") (point)))
 (or (string-match recipients (or (mail-fetch-field "To") ""))
 	(string-match recipients (or (mail-fetch-field "From") ""))
 	(if (not primary-only)
 	    (string-match recipients (or (mail-fetch-field "Cc") ""))))))
 (defun rmail-message-regexp-p (msg regexp)
 "Return t, if for message number MSG, regexp REGEXP matches in the header."
 (goto-char (rmail-msgbeg msg))
 (let ((end
 (save-excursion
-(search-forward "*** EOOH ***" (point-max)) (point))))
+(or (search-forward "\n*** EOOH ***\n" (point-max) t)
+	       (search-forward "\n\n" (point-max)))
+	   (point))))
 (re-search-forward regexp end t)))
 (defvar rmail-search-last-regexp nil)
 (defun rmail-search (regexp &optional n)
 "Show message containing next match for REGEXP (but not the current msg).

Mercurial > emacs

comparison lisp/mail/rmail.el @ 21435:41fa600fadc4