[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104732: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104732: Merge changes made in Gnus trunk. |
Date: |
Sun, 26 Jun 2011 12:41:14 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104732
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-26 12:41:14 +0000
message:
Merge changes made in Gnus trunk.
gnus.texi (Summary Mail Commands): Document
`gnus-summary-reply-to-list-with-original'.
auth-source.el (with-auth-source-epa-overrides): Fix compilation error with
`find-file-hooks' on Emacs 22.
(with-auth-source-epa-overrides): Ugly hack to Wrap the `find-file-hook'
things in `symbol-value' to avoid compilation warnings on all architectures.
spam.el (spam-stat): Require in a normal fashion without binding
`spam-stat-install-hooks' to avoid compilation warnings.
spam-stat.el (spam-stat-install-hooks): Removed.
(spam-stat-install-hooks): Don't run automatically.
gnus-msg.el (gnus-summary-reply-to-list-with-original): New command and
keystroke.
modified:
doc/misc/ChangeLog
doc/misc/gnus.texi
lisp/gnus/ChangeLog
lisp/gnus/auth-source.el
lisp/gnus/gnus-msg.el
lisp/gnus/spam-stat.el
lisp/gnus/spam.el
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2011-06-20 16:14:01 +0000
+++ b/doc/misc/ChangeLog 2011-06-26 12:41:14 +0000
@@ -1,3 +1,8 @@
+2011-06-26 Lars Magne Ingebrigtsen <address@hidden>
+
+ * gnus.texi (Summary Mail Commands): Document
+ `gnus-summary-reply-to-list-with-original'.
+
2011-06-20 Stefan Monnier <address@hidden>
* eshell.texi (Known problems): Fix typo.
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2011-05-31 22:08:51 +0000
+++ b/doc/misc/gnus.texi 2011-06-26 12:41:14 +0000
@@ -5568,6 +5568,13 @@
the process/prefix convention, but only uses the headers from the
first article to determine the recipients.
address@hidden S L
address@hidden S L (Summary)
address@hidden gnus-summary-reply-to-list-with-original
+When replying to a message from a mailing list, send a reply to that
+message to the mailing list, and include the original message
+(@code{gnus-summary-reply-to-list-with-original}).
+
@item S v
@kindex S v (Summary)
@findex gnus-summary-very-wide-reply
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-06-23 23:17:26 +0000
+++ b/lisp/gnus/ChangeLog 2011-06-26 12:41:14 +0000
@@ -1,3 +1,25 @@
+2011-06-26 Lars Magne Ingebrigtsen <address@hidden>
+
+ * dgnushack.el: Bind `gnutls-available-p' to `ignore' on XEmacs to
+ avoid compiler warnings.
+
+ * auth-source.el (with-auth-source-epa-overrides): Fix compilation
+ error with `find-file-hooks' on Emacs 22.
+ (with-auth-source-epa-overrides): Ugly hack to Wrap the
+ `find-file-hook' things in `symbol-value' to avoid compilation warnings
+ on all architectures.
+
+ * spam.el (spam-stat): Require in a normal fashion without binding
+ `spam-stat-install-hooks' to avoid compilation warnings.
+
+ * spam-stat.el (spam-stat-install-hooks): Removed.
+ (spam-stat-install-hooks): Don't run automatically.
+
+2011-06-26 Timo Juhani Lindfors <address@hidden> (tiny change)
+
+ * gnus-msg.el (gnus-summary-reply-to-list-with-original): New command
+ and keystroke.
+
2011-06-23 Katsumi Yamaoka <address@hidden>
* auth-source.el (auth-source-netrc-cache): Move forward.
=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el 2011-06-23 23:17:26 +0000
+++ b/lisp/gnus/auth-source.el 2011-06-26 12:41:14 +0000
@@ -971,7 +971,9 @@
(,(if (boundp 'find-file-hook) 'find-file-hook 'find-file-hooks)
',(remove
'epa-file-find-file-hook
- (if (boundp 'find-file-hook) 'find-file-hook 'find-file-hooks)))
+ (if (boundp 'find-file-hook)
+ (symbol-value 'find-file-hook)
+ (symbol-value 'find-file-hooks))))
(auto-mode-alist
',(if (boundp 'epa-file-auto-mode-alist-entry)
(remove (symbol-value 'epa-file-auto-mode-alist-entry)
=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el 2011-02-23 13:35:35 +0000
+++ b/lisp/gnus/gnus-msg.el 2011-06-26 12:41:14 +0000
@@ -351,6 +351,7 @@
"r" gnus-summary-reply
"y" gnus-summary-yank-message
"R" gnus-summary-reply-with-original
+ "L" gnus-summary-reply-to-list-with-original
"w" gnus-summary-wide-reply
"W" gnus-summary-wide-reply-with-original
"v" gnus-summary-very-wide-reply
@@ -1154,6 +1155,16 @@
(interactive "P")
(gnus-summary-reply (gnus-summary-work-articles n) wide))
+(defun gnus-summary-reply-to-list-with-original (n &optional wide)
+ "Start composing a reply mail to the current message.
+The reply goes only to the mailing list.
+The original article will be yanked."
+ (interactive "P")
+ (let ((message-reply-to-function
+ (lambda nil
+ `((To . ,(gnus-mailing-list-followup-to))))))
+ (gnus-summary-reply (gnus-summary-work-articles n) wide)))
+
(defun gnus-summary-reply-broken-reply-to (&optional yank wide very-wide)
"Like `gnus-summary-reply' except removing reply-to field.
If prefix argument YANK is non-nil, the original article is yanked
=== modified file 'lisp/gnus/spam-stat.el'
--- a/lisp/gnus/spam-stat.el 2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/spam-stat.el 2011-06-26 12:41:14 +0000
@@ -138,12 +138,6 @@
:type 'file
:group 'spam-stat)
-(defcustom spam-stat-install-hooks t
- "Whether spam-stat should install its hooks in Gnus.
-This is set to nil if you use spam-stat through spam.el."
- :type 'boolean
- :group 'spam-stat)
-
(defcustom spam-stat-unknown-word-score 0.2
"The score to use for unknown words.
Also used for words that don't appear often enough."
@@ -658,9 +652,6 @@
(add-hook 'gnus-select-article-hook
'spam-stat-store-gnus-article-buffer))
-(when spam-stat-install-hooks
- (spam-stat-install-hooks-function))
-
(defun spam-stat-unload-hook ()
"Uninstall the spam-stat function hooks."
(interactive)
=== modified file 'lisp/gnus/spam.el'
--- a/lisp/gnus/spam.el 2011-04-05 22:35:05 +0000
+++ b/lisp/gnus/spam.el 2011-06-26 12:41:14 +0000
@@ -2260,51 +2260,44 @@
(autoload 'spam-stat-save "spam-stat")
(autoload 'spam-stat-split-fancy "spam-stat"))
-(eval-and-compile
- (when (condition-case nil
- (let ((spam-stat-install-hooks nil))
- (require 'spam-stat))
- (file-error
- (defalias 'spam-stat-register-ham-routine 'ignore)
- (defalias 'spam-stat-register-spam-routine 'ignore)
- nil))
-
- (defun spam-check-stat ()
- "Check the spam-stat backend for the classification of this message"
- (let ((spam-stat-split-fancy-spam-group spam-split-group) ; override
- (spam-stat-buffer (buffer-name)) ; stat the current buffer
- category return)
- (spam-stat-split-fancy)))
-
- (defun spam-stat-register-spam-routine (articles &optional unregister)
- (dolist (article articles)
- (let ((article-string (spam-get-article-as-string article)))
- (with-temp-buffer
- (insert article-string)
- (if unregister
- (spam-stat-buffer-change-to-non-spam)
- (spam-stat-buffer-is-spam))))))
-
- (defun spam-stat-unregister-spam-routine (articles)
- (spam-stat-register-spam-routine articles t))
-
- (defun spam-stat-register-ham-routine (articles &optional unregister)
- (dolist (article articles)
- (let ((article-string (spam-get-article-as-string article)))
- (with-temp-buffer
- (insert article-string)
- (if unregister
- (spam-stat-buffer-change-to-spam)
- (spam-stat-buffer-is-non-spam))))))
-
- (defun spam-stat-unregister-ham-routine (articles)
- (spam-stat-register-ham-routine articles t))
-
- (defun spam-maybe-spam-stat-load ()
- (when spam-use-stat (spam-stat-load)))
-
- (defun spam-maybe-spam-stat-save ()
- (when spam-use-stat (spam-stat-save)))))
+(require 'spam-stat)
+
+(defun spam-check-stat ()
+ "Check the spam-stat backend for the classification of this message"
+ (let ((spam-stat-split-fancy-spam-group spam-split-group) ; override
+ (spam-stat-buffer (buffer-name)) ; stat the current buffer
+ category return)
+ (spam-stat-split-fancy)))
+
+(defun spam-stat-register-spam-routine (articles &optional unregister)
+ (dolist (article articles)
+ (let ((article-string (spam-get-article-as-string article)))
+ (with-temp-buffer
+ (insert article-string)
+ (if unregister
+ (spam-stat-buffer-change-to-non-spam)
+ (spam-stat-buffer-is-spam))))))
+
+(defun spam-stat-unregister-spam-routine (articles)
+ (spam-stat-register-spam-routine articles t))
+
+(defun spam-stat-register-ham-routine (articles &optional unregister)
+ (dolist (article articles)
+ (let ((article-string (spam-get-article-as-string article)))
+ (with-temp-buffer
+ (insert article-string)
+ (if unregister
+ (spam-stat-buffer-change-to-spam)
+ (spam-stat-buffer-is-non-spam))))))
+
+(defun spam-stat-unregister-ham-routine (articles)
+ (spam-stat-register-ham-routine articles t))
+
+(defun spam-maybe-spam-stat-load ()
+ (when spam-use-stat (spam-stat-load)))
+
+(defun spam-maybe-spam-stat-save ()
+ (when spam-use-stat (spam-stat-save)))
;;}}}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104732: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=