I've included the diffs from Emacs that I've merged into our code
and am just about to check in. A couple of general observations can
be made:
- Error messages do not end in a period.
- (error "A prior draft exists."))
+ (error "A prior draft exists"))
- All files have an "end of file" indicator:
+
+;;; mh-comp.el ends here
Index: mh-comp.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-comp.el,v
retrieving revision 1.13
diff -u -r1.13 mh-comp.el
--- mh-comp.el 2001/11/09 14:19:08 1.13
+++ mh-comp.el 2001/11/11 16:46:09
@@ -1,5 +1,5 @@
-;;; mh-comp --- mh-e functions for composing messages
-;; Time-stamp: <95/08/19 17:48:59 gildea>
+;;; mh-comp.el --- mh-e functions for composing messages
+;; Time-stamp: <2001-07-15 09:36:30 pavel>
;; Copyright (C) 1993,1995,1997,2000 Free Software Foundation, Inc.
@@ -7,7 +7,7 @@
;; Keywords: mail
;; Bug-reports: include `M-x mh-version' output in any correspondence
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -600,7 +600,7 @@
(if (y-or-n-p
(format "A draft exists. Use for %s? " use))
(if mh-error-if-no-draft
- (error "A prior draft exists."))
+ (error "A prior draft exists"))
t)))
(erase-buffer)
(insert-file-contents initial-contents)
@@ -1216,3 +1216,5 @@
(autoload 'mh-revert-mhn-edit "mh-mime"
"Undoes the effect of \\[mh-edit-mhn] by reverting to the backup file.
Optional non-nil argument means don't ask for confirmation." t)
+
+;;; mh-comp.el ends here
Index: mh-e.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-e.el,v
retrieving revision 1.13
diff -u -r1.13 mh-e.el
--- mh-e.el 2001/11/07 04:38:15 1.13
+++ mh-e.el 2001/11/11 16:46:10
@@ -7,7 +7,7 @@
;; Keywords: mail
;; Bug-reports: include `M-x mh-version' output in any correspondence
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -742,7 +742,7 @@
(save-excursion
(mh-goto-msg msg nil t)
(if (looking-at mh-refiled-msg-regexp)
- (error "Message %d is refiled. Undo refile before deleting." msg))
+ (error "Message %d is refiled. Undo refile before deleting" msg))
(if (looking-at mh-deleted-msg-regexp)
nil
(mh-set-folder-modified-p t)
@@ -756,7 +756,7 @@
(save-excursion
(mh-goto-msg msg nil t)
(cond ((looking-at mh-deleted-msg-regexp)
- (error "Message %d is deleted. Undo delete before moving." msg))
+ (error "Message %d is deleted. Undo delete before moving" msg))
((looking-at mh-refiled-msg-regexp)
(if (y-or-n-p
(format "Message %d already refiled. Copy to %s as well? "
Index: mh-funcs.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-funcs.el,v
retrieving revision 1.4
diff -u -r1.4 mh-funcs.el
--- mh-funcs.el 2001/11/06 00:49:52 1.4
+++ mh-funcs.el 2001/11/11 16:46:10
@@ -1,9 +1,9 @@
-;;; mh-funcs --- mh-e functions not everyone will use right away
-;; Time-stamp: <95/08/19 16:44:06 gildea>
+;;; mh-funcs.el --- mh-e functions not everyone will use right away
+;; Time-stamp: <2001-07-14 13:08:45 pavel>
;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -355,3 +355,4 @@
(mh-handle-process-error command value))
(insert "\n(mh-store finished)\n")))
+;;; mh-funcs.el ends here
Index: mh-mime.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-mime.el,v
retrieving revision 1.6
diff -u -r1.6 mh-mime.el
--- mh-mime.el 2001/11/09 19:40:58 1.6
+++ mh-mime.el 2001/11/11 16:46:10
@@ -1,9 +1,9 @@
-;; mh-mime --- mh-e support for composing MIME messages
-;; Time-stamp: <95/08/19 16:45:17 gildea>
+;;; mh-mime.el --- mh-e support for composing MIME messages
+;; Time-stamp: <2001-07-15 09:52:45 pavel>
;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -278,8 +278,10 @@
(or noconfirm
(yes-or-no-p (format "Revert buffer from file %s? "
backup-file))
- (error "mhn edit revert not confirmed."))
+ (error "mhn edit revert not confirmed"))
(let ((buffer-read-only nil))
(erase-buffer)
(insert-file-contents backup-file))
(after-find-file nil)))
+
+;;; mh-mime.el ends here
Index: mh-pick.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-pick.el,v
retrieving revision 1.3
diff -u -r1.3 mh-pick.el
--- mh-pick.el 2001/10/20 20:00:36 1.3
+++ mh-pick.el 2001/11/11 16:46:11
@@ -1,9 +1,9 @@
-;;; mh-pick --- make a search pattern and search for a message in mh-e
-;; Time-stamp: <95/08/19 16:45:16 gildea>
+;;; mh-pick.el --- make a search pattern and search for a message in mh-e
+;; Time-stamp: <2001-07-14 13:09:34 pavel>
;; Copyright (C) 1993, 1995 Free Software Foundation, Inc.
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -202,3 +202,5 @@
mh-pick-menu mh-pick-mode-map "Menu for mh-e pick-mode"
'("Pick"
["Execute the search" mh-do-pick-search t]))))
+
+;;; mh-pick.el ends here
Index: mh-seq.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-seq.el,v
retrieving revision 1.2
diff -u -r1.2 mh-seq.el
--- mh-seq.el 2001/11/07 04:06:18 1.2
+++ mh-seq.el 2001/11/11 16:46:11
@@ -1,9 +1,9 @@
-;;; mh-seq --- mh-e sequences support
-;; Time-stamp: <95/08/19 16:45:15 gildea>
+;;; mh-seq.el --- mh-e sequences support
+;; Time-stamp: <2001-07-14 13:10:33 pavel>
;; Copyright (C) 1993, 1995, 2001 Free Software Foundation, Inc.
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -235,7 +235,6 @@
(goto-char location)
(insert-buffer-substring (current-buffer) beginning-of-line end))))
-
(defun mh-region-to-sequence (beg end)
"Define sequence 'region as the messages in selected region."
(interactive "r")
@@ -245,3 +244,5 @@
(while (<= (point) end)
(mh-add-msgs-to-seq (mh-get-msg-num t) 'region t)
(forward-line 1))))
+
+;;; mh-seq.el ends here
Index: mh-utils.el
===================================================================
RCS file: /cvsroot/mh-e/src/mh-utils.el,v
retrieving revision 1.12
diff -u -r1.12 mh-utils.el
--- mh-utils.el 2001/11/09 16:38:01 1.12
+++ mh-utils.el 2001/11/11 16:46:11
@@ -1,9 +1,8 @@
;;; mh-utils.el --- mh-e code needed for both sending and reading
-;; Time-stamp: <95/10/22 17:58:16 gildea>
-;; Copyright (C) 1993, 1995, 1997, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-;; This file is part of mh-e, part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; 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
@@ -24,6 +23,10 @@
;; Internal support for mh-e package.
+;;; Change Log:
+
+;; $Id: mh-seq.el,v 1.2 2001/11/07 04:06:18 psg Exp $
+
;;; Code:
;;; Set for local environment:
@@ -663,7 +666,7 @@
(if (not (mh-folder-name-p mh-draft-folder))
(setq mh-draft-folder (format "+%s" mh-draft-folder)))
(if (not (file-exists-p (mh-expand-file-name mh-draft-folder)))
- (error "Draft folder \"%s\" not found. Create it and try again."
+ (error "Draft folder \"%s\" not found. Create it and try again"
(mh-expand-file-name mh-draft-folder)))))
(setq mh-inbox (mh-get-profile-field "Inbox:"))
(cond ((not mh-inbox)
@@ -721,8 +724,8 @@
;; components, then look for lib/mh or mh/lib.
(or (mh-path-search
(mapcar (lambda (p) (expand-file-name p mh-base))
- '("etc" "lib/mh" "etc/nmh" "/etc/nmh" "mh/lib"
- "nmh/etc"))
+ '("etc" "lib" "lib/mh" "mh/lib"
+ "etc/nmh" "/etc/nmh" "nmh/etc"))
"components"
'file-exists-p))))
(or (and mh-lib-progs
@@ -730,8 +733,8 @@
(setq mh-lib-progs
(or (mh-path-search
(mapcar (lambda (p) (expand-file-name p mh-base))
- '("lib" "lib/mh" "libexec/nmh" "lib/nmh"
- "mh/lib" "nmh/lib"))
+ '("lib" "lib/mh" "mh/lib"
+ "libexec/nmh" "lib/nmh" "nmh/lib"))
"mhl")
(mh-path-search '("/usr/local/bin/mh/") "mhl")
(mh-path-search exec-path "mhl") ;unlikely
@@ -810,6 +813,7 @@
(setq mode-name mode-name-string)
(force-mode-line-update t))
+(defvar mh-folder-hist nil)
(defun mh-prompt-for-folder (prompt default can-create)
;; Prompt for a folder name with PROMPT. Returns the folder's name as a
@@ -824,8 +828,8 @@
read-name folder-name)
(if (null mh-folder-list)
(mh-set-folder-list))
- (while (and (setq read-name (completing-read prompt mh-folder-list
- nil nil "+"))
+ (while (and (setq read-name (completing-read prompt mh-folder-list nil nil
+ "+" 'mh-folder-hist default))
(equal read-name "")
(equal default "")))
(cond ((or (equal read-name "") (equal read-name "+"))
@@ -1062,7 +1066,7 @@
(end-of-line)
(point))))
(display-buffer (current-buffer))
- (error "%s failed with status %d. See error message in other window."
+ (error "%s failed with status %d. See error message in other window"
command status)))))))
|