Merge remote branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 075036a..d415e97 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -160,6 +160,20 @@
 
 2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+2012-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-msg.el (gnus-inews-insert-gcc): Don't do the alist stuff when we
+       don't have a current group.
+
+2012-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       pgg-def.el, pgg-gpg.el, pgg-parse.el, pgg-pgp.el, pgg-pgp5.el, pgg.el:
+       Remove.
+
+       dgnushack.el (pgg-snarf-keys-region): Remove autoload.
+
+       lpath.el (pgg-parse-crc24-string, pgg-parse-crc24): Remove declaration.
+
 2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't
@@ -278,13 +292,6 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -296,6 +303,13 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 8d16a42..9583ff9 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1764,7 +1764,7 @@ this is a reply."
           ((functionp var)
            ;; A function.
            (funcall var group))
-          (t
+          (group
            ;; An alist of regexps/functions/forms.
            (while (and var
                        (not

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 82f6e36..5d9bb81 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -41,6 +41,14 @@
        * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook
        and gnus-gcc-post-body-encode-hook.
 
+2012-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * epa.texi: New file imported from Emacs.
+
+       * pgg.texi: Remove.
+
+       * Makefile.in: Replace pgg.* with epa.*.
+
 2012-04-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * auth.texi (Secret Service API): Edit further and give examples.