(diary-face, holiday-face): Add dark-background variants.

[bpt/emacs.git] / lisp / mh-e.el

diff --git a/lisp/mh-e.el b/lisp/mh-e.el
index f4ef521..619556d 100644 (file)
--- a/lisp/mh-e.el
+++ b/lisp/mh-e.el
@@ -2,10 +2,10 @@
 
 ;;; Copyright (C) 1985, 86, 87, 88, 90, 92, 93 Free Software Foundation
 
-(defconst mh-e-time-stamp "Time-stamp: <93/05/27 18:02:50 gildea>")
+(defconst mh-e-time-stamp "Time-stamp: <93/05/30 18:37:43 gildea>")
 
 ;; Maintainer: Stephen Gildea <gildea@lcs.mit.edu>
-;; Version: 3.8.1
+;; Version: 3.8.2
 ;; Keywords: mail
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -48,7 +48,7 @@
 ;;; Modified by James Larus, BBN, July 1984 and UCB, 1984 & 1985.
 ;;; Rewritten for GNU Emacs, James Larus 1985.  larus@ginger.berkeley.edu
 ;;; Modified by Stephen Gildea 1988.  gildea@bbn.com
-(defconst mh-e-RCS-id "$Header: mh-e.el,v 3.9 93/01/11 11:49:18 gildea Exp $")
+(defconst mh-e-RCS-id "$Header: /home/fsf/rms/e19/lisp/RCS/mh-e.el,v 1.15 1993/07/20 04:35:00 rms Exp rms $")
 
 ;;; Code:
 
@@ -99,7 +99,7 @@ It is passed three arguments: TO recipients, SUBJECT, and CC recipients.")
     (save-excursion
       (goto-char (point))
       (or (bolp) (forward-line 1))
-      (while (< (point) (mark))
+      (while (< (point) (mark t))
        (insert mh-ins-string)
        (forward-line 1))))
   "Hook to run citation function.
@@ -174,6 +174,10 @@ value and it should be one of \"from\", \"to\", or \"cc\".")
 (defvar mh-unshar-default-directory ""
   "*Default for directory name prompted for by mh-unshar-msg.")
 
+(defvar mh-signature-file-name "~/.signature"
+  "*Name of file containing the user's signature.
+Inserted into message by \\<mh-letter-mode-map>\\[mh-insert-signature].")
+
 
 ;;; Parameterize mh-e to work with different scan formats.  The defaults work
 ;;; with the standard MH scan listings.
@@ -191,7 +195,7 @@ value and it should be one of \"from\", \"to\", or \"cc\".")
   "String whose first character is used to notate redistributed messages.")
 
 (defvar mh-good-msg-regexp  "^....[^D^]"
-  "Regexp specifiying the scan lines that are 'good' messages.")
+  "Regexp specifying the scan lines that are 'good' messages.")
 
 (defvar mh-deleted-msg-regexp "^....D"
   "Regexp matching scan lines of deleted messages.")
@@ -1405,7 +1409,7 @@ Assumes mh-e has already been initialized."
     (set-buffer (get-buffer-create " *mh-temp*"))
     (erase-buffer)
     (mh-exec-cmd-output "mhpath" nil mh-draft-folder "new")
-    (buffer-substring (point) (1- (mark)))))
+    (buffer-substring (point) (1- (mark t)))))
 
 
 (defun mh-next-msg ()
@@ -1442,7 +1446,7 @@ Assumes mh-e has already been initialized."
 ;;; The folder data abstraction.
 
 (defvar mh-current-folder nil "Name of current folder, a string.")
-(defvar mh-show-buffer nil "Buffer that displays mesage for this folder.")
+(defvar mh-show-buffer nil "Buffer that displays message for this folder.")
 (defvar mh-folder-filename nil "Full path of directory for this folder.")
 (defvar mh-showing nil "If non-nil, show the message in a separate window.")
 (defvar mh-next-seq-num nil "Index of free sequence id.")
@@ -1824,6 +1828,9 @@ Variables controlling this mode (defaults in parentheses):
     If nil, only the portion of the message following the point will be yanked.
     If there is a region, this variable is ignored.
 
+ mh-signature-file-name (\"~/.signature\")
+    File to be inserted into message by \\[mh-insert-signature].
+
 Upon invoking mh-letter-mode, text-mode-hook and mh-letter-mode-hook are
 invoked with no args, if those values are non-nil.
 
@@ -1913,9 +1920,9 @@ Prompt for the field name with a completion list of the current folders."
 
 
 (defun mh-insert-signature ()
-  "Insert the file ~/.signature at the current point."
+  "Insert the file named by mh-signature-file-name at the current point."
   (interactive)
-  (insert-file-contents "~/.signature")
+  (insert-file-contents mh-signature-file-name)
   (set-buffer-modified-p (buffer-modified-p))) ; force mode line update
 
 
@@ -2148,7 +2155,7 @@ yanked message will be deleted."
        (if mh-delete-yanked-msg-window
            (delete-windows-on mh-show-buffer))
        (set-buffer mh-show-buffer)     ; Find displayed message
-       (let ((mh-ins-str (cond ((mark)
+       (let ((mh-ins-str (cond (mark-active
                                 (buffer-substring (region-beginning)
                                                   (region-end)))
                                ((eq 'body mh-yank-from-start-of-msg)
@@ -2924,4 +2931,3 @@ Assumes that any filename that starts with '+' is a folder name."
 (provide 'mh-e)
 
 ;;; mh-e.el ends here
-