[gnus git] branch master updated: n0-15-13-gde65ae0 =1= Fix `message-yank-original' so the CL functions are seen by the byte-compiler.
Ted Zlatanov <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via de65ae06bf60c9a99b6e001575f14560ca5056d2 (commit)
from d3501cd48b4be3ca6bf1f322b6cd5754747faab5 (commit)
- Log -----------------------------------------------------------------
commit de65ae06bf60c9a99b6e001575f14560ca5056d2
Author: Stefan Monnier <[email protected]>
Date: Tue Mar 29 09:50:11 2011 -0500
Fix `message-yank-original' so the CL functions are seen by the byte-compiler.
* message.el (message--yank-original-internal): New function to do the
insertion cleanly inside eval in `message-yank-original'.
(message-yank-original): Use it.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82db122..ad8cf6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-29 Stefan Monnier <[email protected]>
+
+ * message.el (message--yank-original-internal): New function to do the
+ insertion cleanly inside eval in `message-yank-original'.
+ (message-yank-original): Use it.
+
2011-03-29 Julien Danjou <[email protected]>
* mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
diff --git a/lisp/message.el b/lisp/message.el
index 3dc5647..59989f3 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3756,22 +3756,9 @@ To use this automatically, you may add this function to
(while (re-search-forward citexp nil t)
(replace-match (if remove "" "\n"))))))
-(defun message-yank-original (&optional arg)
- "Insert the message being replied to, if any.
-Puts point before the text and mark after.
-Normally indents each nonblank line ARG spaces (default 3). However,
-if `message-yank-prefix' is non-nil, insert that prefix on each line.
-
-This function uses `message-cite-function' to do the actual citing.
-
-Just \\[universal-argument] as argument means don't indent, insert no
-prefix, and don't delete any headers."
- (interactive "P")
+(defun message--yank-original-internal (arg)
(let ((modified (buffer-modified-p))
body-text)
- ;; eval the let forms contained in message-cite-style
- (eval
- `(let ,message-cite-style
(when (and message-reply-buffer
message-cite-function)
(when (equal message-cite-reply-position 'above)
@@ -3811,7 +3798,23 @@ prefix, and don't delete any headers."
;; Add a `message-setup-very-last-hook' here?
;; Add `gnus-article-highlight-citation' here?
(unless modified
- (setq message-checksum (message-checksum))))))))
+ (setq message-checksum (message-checksum))))))
+
+(defun message-yank-original (&optional arg)
+ "Insert the message being replied to, if any.
+Puts point before the text and mark after.
+Normally indents each nonblank line ARG spaces (default 3). However,
+if `message-yank-prefix' is non-nil, insert that prefix on each line.
+
+This function uses `message-cite-function' to do the actual citing.
+
+Just \\[universal-argument] as argument means don't indent, insert no
+prefix, and don't delete any headers."
+ (interactive "P")
+ ;; eval the let forms contained in message-cite-style
+ (eval
+ `(let ,message-cite-style
+ (message--yank-original-internal ',arg))))
(defun message-yank-buffer (buffer)
"Insert BUFFER into the current buffer and quote it."
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 6 ++++++
lisp/message.el | 33 ++++++++++++++++++---------------
2 files changed, 24 insertions(+), 15 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project