[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp/mh-e mh-comp.el ChangeLog
From: |
Bill Wohler |
Subject: |
[Emacs-commit] emacs/lisp/mh-e mh-comp.el ChangeLog |
Date: |
Mon, 09 Jan 2006 21:21:06 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch:
Changes by: Bill Wohler <address@hidden> 06/01/09 21:21:06
Modified files:
lisp/mh-e : mh-comp.el ChangeLog
Log message:
Use ";; Shush compiler." comment consistently per Mark's suggestion.
(mh-letter-mode): Derive from mail-mode and delete code copied from
mail-mode (closes SF #1385571). Mention mail-mode-hook in docstring.
(mh-fill-paragraph-function): Delete. Handled by mail-mode.
(mh-to-field-choices): For consistency with mail-mode, add "a" for
"Mail-Reply-To:", "l" for "Mail-Followup-To:", and "r" for
"Reply-To:". Change "r" to "m" for "From:" (closes SF #1400139).
(mh-to-fcc): Move setting of folder argument to interactive argument
as is the norm.
(mh-letter-complete-function-alist): Add mail-reply-to.
(mh-letter-mode-map): Add keys for mh-to-field (Mail-Reply-To,
Mail-Followup-To, Reply-To, From).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-comp.el.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.101 emacs/lisp/mh-e/ChangeLog:1.102
--- emacs/lisp/mh-e/ChangeLog:1.101 Mon Jan 9 20:47:55 2006
+++ emacs/lisp/mh-e/ChangeLog Mon Jan 9 21:21:06 2006
@@ -1,5 +1,20 @@
2006-01-09 Bill Wohler <address@hidden>
+ * mh-comp.el: Use ";; Shush compiler." comment consistently per
+ Mark's suggestion.
+ (mh-letter-mode): Derive from mail-mode and delete code copied
+ from mail-mode (closes SF #1385571). Mention mail-mode-hook in
+ docstring.
+ (mh-fill-paragraph-function): Delete. Handled by mail-mode.
+ (mh-to-field-choices): For consistency with mail-mode, add "a" for
+ "Mail-Reply-To:", "l" for "Mail-Followup-To:", and "r" for
+ "Reply-To:". Change "r" to "m" for "From:" (closes SF #1400139).
+ (mh-to-fcc): Move setting of folder argument to interactive
+ argument as is the norm.
+ (mh-letter-complete-function-alist): Add mail-reply-to.
+ (mh-letter-mode-map): Add keys for mh-to-field (Mail-Reply-To,
+ Mail-Followup-To, Reply-To, From).
+
* mh-customize.el: Use ";; Forward definition." consistently.
Comment declaration to remind programmer to update forward
definition if default changes.
Index: emacs/lisp/mh-e/mh-comp.el
diff -u emacs/lisp/mh-e/mh-comp.el:1.36 emacs/lisp/mh-e/mh-comp.el:1.37
--- emacs/lisp/mh-e/mh-comp.el:1.36 Mon Jan 9 06:28:49 2006
+++ emacs/lisp/mh-e/mh-comp.el Mon Jan 9 21:21:06 2006
@@ -158,9 +158,16 @@
"Regexp of header lines to remove before offering a message as a new
draft\\<mh-folder-mode-map>.
Used by the \\[mh-edit-again] and \\[mh-extract-rejected-mail] commands.")
-(defvar mh-to-field-choices '(("t" . "To:") ("s" . "Subject:") ("c" . "Cc:")
- ("b" . "Bcc:") ("f" . "Fcc:") ("r" . "From:")
- ("d" . "Dcc:"))
+(defvar mh-to-field-choices '(("a" . "Mail-Reply-To:")
+ ("b" . "Bcc:")
+ ("c" . "Cc:")
+ ("d" . "Dcc:")
+ ("f" . "Fcc:")
+ ("l" . "Mail-Followup-To:")
+ ("m" . "From:")
+ ("r" . "Reply-To:")
+ ("s" . "Subject:")
+ ("t" . "To:"))
"Alist of (final-character . field-name) choices for `mh-to-field'.")
(defvar mh-letter-mode-map (copy-keymap text-mode-map)
@@ -939,29 +946,15 @@
The substitutions described in `substitute-command-keys' are
performed as well.")
-;;;###mh-autoload
-(defun mh-fill-paragraph-function (arg)
- "Fill paragraph at or after point.
-Prefix ARG means justify as well. This function enables
-`fill-paragraph' to work better in MH-Letter mode (see
-`mh-letter-mode')."
- (interactive "P")
- (let ((fill-paragraph-function) (fill-prefix))
- (if (mh-in-header-p)
- (mail-mode-fill-paragraph arg)
- (fill-paragraph arg))))
-
;; Shush compiler.
(eval-when-compile
(defvar adaptive-fill-first-line-regexp)
- (defvar tool-bar-map)
- (defvar font-lock-defaults)
-)
+ (defvar tool-bar-map))
(defvar mh-letter-buttons-init-flag nil)
;;;###autoload
-(define-derived-mode mh-letter-mode text-mode "MH-Letter"
+(define-derived-mode mh-letter-mode mail-mode "MH-Letter"
"Mode for composing letters in MH-E\\<mh-letter-mode-map>.
When you have finished composing, type \\[mh-send-letter] to send
@@ -976,8 +969,9 @@
Options that control this mode can be changed with
\\[customize-group]; specify the \"mh-compose\" group.
-When a message is composed, the hooks `text-mode-hook' and
-`mh-letter-mode-hook' are run.
+When a message is composed, the hooks `text-mode-hook',
+`mail-mode-hook', and `mh-letter-mode-hook' are run (in that
+order).
\\{mh-letter-mode-map}"
(mh-find-path)
@@ -1004,32 +998,6 @@
(setq buffer-invisibility-spec '((vanish . t) t))
(set (make-local-variable 'line-move-ignore-invisible) t)
- ;; From sendmail.el for proper paragraph fill
- ;; sendmail.el also sets a normal-auto-fill-function (not done here)
- (make-local-variable 'paragraph-separate)
- (make-local-variable 'paragraph-start)
- (make-local-variable 'fill-paragraph-function)
- (setq fill-paragraph-function 'mh-fill-paragraph-function)
- (make-local-variable 'adaptive-fill-regexp)
- (setq adaptive-fill-regexp
- (concat adaptive-fill-regexp
- "\\|[ \t]*[-[:alnum:]]*>+[ \t]*"))
- (make-local-variable 'adaptive-fill-first-line-regexp)
- (setq adaptive-fill-first-line-regexp
- (concat adaptive-fill-first-line-regexp
- "\\|[ \t]*[-[:alnum:]]*>+[ \t]*"))
- ;; `-- ' precedes the signature. `-----' appears at the start of the
- ;; lines that delimit forwarded messages.
- ;; Lines containing just >= 3 dashes, perhaps after whitespace,
- ;; are also sometimes used and should be separators.
- (setq paragraph-start (concat (regexp-quote mail-header-separator)
- "\\|\t*\\([-|#;>* ]\\|(?[0-9]+[.)]\\)+$"
- "\\|[ \t]*[[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|"
- "-- $\\|---+$\\|"
- page-delimiter))
- (setq paragraph-separate paragraph-start)
- ;; --- End of code from sendmail.el ---
-
;; Enable undo since a show-mode buffer might have been reused.
(buffer-enable-undo)
(set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map)
@@ -1146,17 +1114,15 @@
This command will prompt you for the FOLDER name in which to file
a copy of the draft."
- (interactive)
- (or folder
- (setq folder (mh-prompt-for-folder
- "Fcc"
- (or (and mh-default-folder-for-message-function
- (save-excursion
- (goto-char (point-min))
- (funcall
- mh-default-folder-for-message-function)))
- "")
- t)))
+ (interactive (list (mh-prompt-for-folder
+ "Fcc"
+ (or (and mh-default-folder-for-message-function
+ (save-excursion
+ (goto-char (point-min))
+ (funcall
+ mh-default-folder-for-message-function)))
+ "")
+ t)))
(let ((last-input-char ?\C-f))
(expand-abbrev)
(save-excursion
@@ -1463,7 +1429,8 @@
unless (eq charset 'ascii) return nil
finally return t))
-(eval-when-compile (defvar sendmail-coding-system)) ;shush compiler
+;; Shush compiler.
+(eval-when-compile (defvar sendmail-coding-system))
;;;###mh-autoload
(defun mh-send-letter (&optional arg)
@@ -1853,12 +1820,13 @@
(mh-complete-word folder choices beg end)))
(defvar mh-letter-complete-function-alist
- '((cc . mh-alias-letter-expand-alias)
- (bcc . mh-alias-letter-expand-alias)
+ '((bcc . mh-alias-letter-expand-alias)
+ (cc . mh-alias-letter-expand-alias)
(dcc . mh-alias-letter-expand-alias)
(fcc . mh-folder-expand-at-point)
(from . mh-alias-letter-expand-alias)
(mail-followup-to . mh-alias-letter-expand-alias)
+ (mail-reply-to . mh-alias-letter-expand-alias)
(reply-to . mh-alias-letter-expand-alias)
(to . mh-alias-letter-expand-alias))
"Alist of header fields and completion functions to use.")
@@ -2124,17 +2092,23 @@
"\C-c\C-c" mh-send-letter
"\C-c\C-d" mh-insert-identity
"\C-c\C-e" mh-mh-to-mime
+ "\C-c\C-f\C-a" mh-to-field
"\C-c\C-f\C-b" mh-to-field
"\C-c\C-f\C-c" mh-to-field
"\C-c\C-f\C-d" mh-to-field
"\C-c\C-f\C-f" mh-to-fcc
+ "\C-c\C-f\C-l" mh-to-field
+ "\C-c\C-f\C-m" mh-to-field
"\C-c\C-f\C-r" mh-to-field
"\C-c\C-f\C-s" mh-to-field
"\C-c\C-f\C-t" mh-to-field
+ "\C-c\C-fa" mh-to-field
"\C-c\C-fb" mh-to-field
"\C-c\C-fc" mh-to-field
"\C-c\C-fd" mh-to-field
"\C-c\C-ff" mh-to-fcc
+ "\C-c\C-fl" mh-to-field
+ "\C-c\C-fm" mh-to-field
"\C-c\C-fr" mh-to-field
"\C-c\C-fs" mh-to-field
"\C-c\C-ft" mh-to-field
- [Emacs-commit] emacs/lisp/mh-e mh-comp.el ChangeLog,
Bill Wohler <=