[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r99367: * message.el (message-mail):
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r99367: * message.el (message-mail): Just pass yank-action on to message-setup. |
Date: |
Sun, 17 Jan 2010 18:33:55 -0500 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 99367
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-01-17 18:33:55 -0500
message:
* message.el (message-mail): Just pass yank-action on to message-setup.
(message-setup): Handle (FUN . ARGS) form of yank-action.
(message-with-reply-buffer, message-widen-reply)
(message-yank-original): Handle non-buffer values of
message-reply-buffer (Bug#4080).
modified:
lisp/gnus/ChangeLog
lisp/gnus/message.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-01-17 02:25:53 +0000
+++ b/lisp/gnus/ChangeLog 2010-01-17 23:33:55 +0000
@@ -1,3 +1,11 @@
+2010-01-17 Chong Yidong <address@hidden>
+
+ * message.el (message-mail): Just pass yank-action on to message-setup.
+ (message-setup): Handle (FUN . ARGS) form of yank-action.
+ (message-with-reply-buffer, message-widen-reply)
+ (message-yank-original): Handle non-buffer values of
+ message-reply-buffer (Bug#4080).
+
2010-01-17 Juanma Barranquero <address@hidden>
* nnmairix.el (nnmairix-group-delete-recreate-this-group):
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/message.el 2010-01-17 23:33:55 +0000
@@ -1139,6 +1139,8 @@
(string :tag "name")
(sexp :tag "none" :format "%t" t)))
+;; This can be the name of a buffer, or a cons cell (FUNCTION . ARGS)
+;; for yanking the original buffer.
(defvar message-reply-buffer nil)
(defvar message-reply-headers nil
"The headers of the current replied article.
@@ -1997,7 +1999,7 @@
(defmacro message-with-reply-buffer (&rest forms)
"Evaluate FORMS in the reply buffer, if it exists."
- `(when (and message-reply-buffer
+ `(when (and (bufferp message-reply-buffer)
(buffer-name message-reply-buffer))
(with-current-buffer message-reply-buffer
,@forms)))
@@ -3179,7 +3181,7 @@
"Widen the reply to include maximum recipients."
(interactive)
(let ((follow-to
- (and message-reply-buffer
+ (and (bufferp message-reply-buffer)
(buffer-name message-reply-buffer)
(with-current-buffer message-reply-buffer
(message-get-reply-headers t)))))
@@ -3674,9 +3676,16 @@
(point-max)))
(delete-region (message-goto-body) (point-max)))
(set (make-local-variable 'message-cite-reply-above) nil)))
- (delete-windows-on message-reply-buffer t)
+ (if (bufferp message-reply-buffer)
+ (delete-windows-on message-reply-buffer t))
(push-mark (save-excursion
- (insert-buffer-substring message-reply-buffer)
+ (cond
+ ((bufferp message-reply-buffer)
+ (insert-buffer-substring message-reply-buffer))
+ ((and (consp message-reply-buffer)
+ (functionp (car message-reply-buffer)))
+ (apply (car message-reply-buffer)
+ (cdr message-reply-buffer))))
(unless (bolp)
(insert ?\n))
(point)))
@@ -6251,14 +6260,14 @@
nil
mua)))
-(defun message-setup (headers &optional replybuffer actions
+;; YANK-ACTION, if non-nil, can be a buffer or a yank action of the
+;; form (FUNCTION . ARGS).
+(defun message-setup (headers &optional yank-action actions
continue switch-function)
(let ((mua (message-mail-user-agent))
- subject to field yank-action)
+ subject to field)
(if (not (and message-this-is-mail mua))
- (message-setup-1 headers replybuffer actions)
- (if replybuffer
- (setq yank-action (list 'insert-buffer replybuffer)))
+ (message-setup-1 headers yank-action actions)
(setq headers (copy-sequence headers))
(setq field (assq 'Subject headers))
(when field
@@ -6275,7 +6284,11 @@
(format "%s" (car item))
(cdr item)))
headers)
- continue switch-function yank-action actions)))))
+ continue switch-function
+ (if (bufferp yank-action)
+ (list 'insert-buffer yank-action)
+ yank-action)
+ actions)))))
(defun message-headers-to-generate (headers included-headers excluded-headers)
"Return a list that includes all headers from HEADERS.
@@ -6302,12 +6315,12 @@
(push header result)))
(nreverse result)))
-(defun message-setup-1 (headers &optional replybuffer actions)
+(defun message-setup-1 (headers &optional yank-action actions)
(dolist (action actions)
(condition-case nil
(add-to-list 'message-send-actions
`(apply ',(car action) ',(cdr action)))))
- (setq message-reply-buffer replybuffer)
+ (setq message-reply-buffer yank-action)
(goto-char (point-min))
;; Insert all the headers.
(mail-header-format
@@ -6438,7 +6451,7 @@
to continue editing a message already being composed. SWITCH-FUNCTION
is a function used to switch to and display the mail buffer."
(interactive)
- (let ((message-this-is-mail t) replybuffer)
+ (let ((message-this-is-mail t))
(unless (message-mail-user-agent)
(message-pop-to-buffer
;; Search for the existing message buffer if `continue' is non-nil.
@@ -6449,15 +6462,11 @@
message-generate-new-buffers)))
(message-buffer-name "mail" to))
switch-function))
- ;; FIXME: message-mail should do something if YANK-ACTION is not
- ;; insert-buffer.
- (and (consp yank-action) (eq (car yank-action) 'insert-buffer)
- (setq replybuffer (nth 1 yank-action)))
(message-setup
(nconc
`((To . ,(or to "")) (Subject . ,(or subject "")))
(when other-headers other-headers))
- replybuffer send-actions continue switch-function)
+ yank-action send-actions continue switch-function)
;; FIXME: Should return nil if failure.
t))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r99367: * message.el (message-mail): Just pass yank-action on to message-setup.,
Chong Yidong <=