[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-comp.el
From: |
Bill Wohler |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-comp.el |
Date: |
Mon, 03 Feb 2003 15:55:42 -0500 |
Index: emacs/lisp/mh-e/mh-comp.el
diff -c emacs/lisp/mh-e/mh-comp.el:1.1 emacs/lisp/mh-e/mh-comp.el:1.2
*** emacs/lisp/mh-e/mh-comp.el:1.1 Sat Jan 25 21:38:37 2003
--- emacs/lisp/mh-e/mh-comp.el Mon Feb 3 15:55:30 2003
***************
*** 30,36 ****
;;; Change Log:
! ;; $Id: mh-comp.el,v 1.1 2003/01/26 02:38:37 wohler Exp $
;;; Code:
--- 30,36 ----
;;; Change Log:
! ;; $Id: mh-comp.el,v 1.2 2003/02/03 20:55:30 wohler Exp $
;;; Code:
***************
*** 461,467 ****
"-component" "Resent:"
"-text" (format "\"%s %s\"" to cc))
(if mh-redist-background
! (mh-exec-cmd-daemon "/bin/sh" "-c"
(format "mhdist=1 mhaltmsg=%s %s %s %s"
(if mh-redist-full-contents
buffer-file-name
--- 461,467 ----
"-component" "Resent:"
"-text" (format "\"%s %s\"" to cc))
(if mh-redist-background
! (mh-exec-cmd-daemon "/bin/sh" nil "-c"
(format "mhdist=1 mhaltmsg=%s %s %s %s"
(if mh-redist-full-contents
buffer-file-name
***************
*** 1038,1049 ****
(let ((file-name buffer-file-name))
(save-buffer)
(message "Checking recipients...")
! (mh-in-show-buffer ("*Recipients*")
(bury-buffer (current-buffer))
(erase-buffer)
(mh-exec-cmd-output "whom" t file-name))
(message "Checking recipients...done")))
;;; Routines to compose and send a letter.
--- 1038,1055 ----
(let ((file-name buffer-file-name))
(save-buffer)
(message "Checking recipients...")
! (mh-in-show-buffer (mh-recipients-buffer)
(bury-buffer (current-buffer))
(erase-buffer)
(mh-exec-cmd-output "whom" t file-name))
(message "Checking recipients...done")))
+ (defun mh-tidy-draft-buffer ()
+ "Run when a draft buffer is destroyed."
+ (let ((buffer (get-buffer mh-recipients-buffer)))
+ (if buffer
+ (kill-buffer buffer))))
+
;;; Routines to compose and send a letter.
***************
*** 1067,1086 ****
;; Lazily initialize mh-x-mailer-string.
(when (null mh-x-mailer-string)
(save-window-excursion
! (mh-version)
! (set-buffer mh-temp-buffer)
! (if mh-nmh-flag
! (search-forward-regexp "^nmh-\\(\\S +\\)")
! (search-forward-regexp "^MH \\(\\S +\\)" nil t))
! (let ((x-mailer-mh (buffer-substring (match-beginning 1) (match-end
1))))
! (setq mh-x-mailer-string
! (format "MH-E %s; %s %s; %s %d.%d"
! mh-version (if mh-nmh-flag "nmh" "MH") x-mailer-mh
! (if mh-xemacs-flag
! "XEmacs"
! "Emacs")
! emacs-major-version emacs-minor-version)))
! (kill-buffer mh-temp-buffer)))
;; Insert X-Mailer, but only if it doesn't already exist.
(save-excursion
(when (null (mh-goto-header-field "X-Mailer"))
--- 1073,1101 ----
;; Lazily initialize mh-x-mailer-string.
(when (null mh-x-mailer-string)
(save-window-excursion
! ;; User would be confused if version info buffer disappeared magically,
! ;; so don't delete buffer if it already existed.
! (let ((info-buffer-exists-p (get-buffer mh-info-buffer)))
! (mh-version)
! (set-buffer mh-info-buffer)
! (if mh-nmh-flag
! (search-forward-regexp "^nmh-\\(\\S +\\)")
! (search-forward-regexp "^MH \\(\\S +\\)" nil t))
! (let ((x-mailer-mh (buffer-substring (match-beginning 1)
! (match-end 1))))
! (setq mh-x-mailer-string
! (format "MH-E %s; %s %s; %sEmacs %s"
! mh-version (if mh-nmh-flag "nmh" "MH") x-mailer-mh
! (if mh-xemacs-flag "X" "GNU ")
! (cond ((not mh-xemacs-flag) emacs-version)
! ((string-match "[0-9.]*\\( +\([
a-z]+[0-9]+\)\\)?"
! emacs-version)
! (match-string 0 emacs-version))
! (t (format "%s.%s"
! emacs-major-version
! emacs-minor-version))))))
! (if (not info-buffer-exists-p)
! (kill-buffer mh-info-buffer)))))
;; Insert X-Mailer, but only if it doesn't already exist.
(save-excursion
(when (null (mh-goto-header-field "X-Mailer"))
***************
*** 1152,1158 ****
(setq mh-annotate-char annotate-char)
(setq mh-annotate-field annotate-field)
(setq mh-previous-window-config config)
! (setq mode-line-buffer-identification (list "{%b}"))
(if (and (boundp 'mh-compose-letter-function)
mh-compose-letter-function)
;; run-hooks will not pass arguments.
--- 1167,1175 ----
(setq mh-annotate-char annotate-char)
(setq mh-annotate-field annotate-field)
(setq mh-previous-window-config config)
! (setq mode-line-buffer-identification (list " {%b}"))
! (mh-logo-display)
! (add-hook 'kill-buffer-hook 'mh-tidy-draft-buffer nil t)
(if (and (boundp 'mh-compose-letter-function)
mh-compose-letter-function)
;; run-hooks will not pass arguments.
***************
*** 1223,1229 ****
(recenter -1)
(set-buffer draft-buffer)) ; for annotation below
(t
! (mh-exec-cmd-daemon mh-send-prog "-nodraftfolder" "-noverbose"
mh-send-args file-name)))
(if mh-annotate-char
(mh-annotate-msg mh-sent-from-msg
--- 1240,1246 ----
(recenter -1)
(set-buffer draft-buffer)) ; for annotation below
(t
! (mh-exec-cmd-daemon mh-send-prog nil "-nodraftfolder" "-noverbose"
mh-send-args file-name)))
(if mh-annotate-char
(mh-annotate-msg mh-sent-from-msg
- [Emacs-diffs] Changes to emacs/lisp/mh-e/mh-comp.el,
Bill Wohler <=