Synch to No Gnus 200603291617.

diff --git a/ChangeLog b/ChangeLog
index 7941083..a738616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (release-bump-version): Consider named Gnus versions
+       in replacements.
+
+       * todo: Update "tool bar icons".
+
 2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * Makefile.in (release-revert-files): Replace

diff --git a/Makefile.in b/Makefile.in
index 722a1d0..1acb616 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,11 +275,15 @@ release-check-settings:
 
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:  release-check-settings
-       sed -i -e '/^(defconst gnus-version-number /s|"$(OLD_PATTERN)"|"$(VERSION)"|' lisp/gnus.el
-       sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi
-       sed -i -e '/^This manual corresponds to Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi
-       sed -i -e '/^This manual corresponds to Message v/s|$(OLD_PATTERN)|$(VERSION)|' texi/message.texi
-       sed -i -e '/The current release ($(OLD_PATTERN)) should/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus-faq.texi
+       sed -i -e '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el
+       sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+       sed -i -e '/^This manual corresponds to [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+       sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnusv/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+       if [ "x$(CODENAME)" = "x" ]; then \
+         sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
+       else \
+         true; \
+       fi
        @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \
          echo "texi/ChangeLog is already updated"; \
        else \

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d55e779..94e430d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-29  Daiki Ueno  <ueno@unixuser.org>
+
+       * pgg-gpg.el (pgg-gpg-start-process): Don't bind
+       default-enable-multibyte-characters.  This reverts the change from
+       revision 6.17 which is no longer necessary because the passphrase
+       is sent separately now.  GnuPG messages are unreadable under
+       multibyte locales with default-enable-multibyte-characters set to
+       nil.
+
 2006-03-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-tool-bar-gnome): Move "spell".

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b9ac7f9..1eeba75 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Top): Add comment about version line.
+
+       * message.texi (Top): Ditto.  Change to take named versions into
+       account.
+
+       * gnus-news.texi: Add customizable tool bar.
+
 2006-03-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Posting Styles): Add x-face-file to example.

diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi
index 142c6be..d1a6957 100644 (file)
--- a/texi/gnus-news.texi
+++ b/texi/gnus-news.texi
@@ -162,6 +162,11 @@ intermediate host @samp{bar.example.com} from next time.
 @item You can change the location of XEmacs' toolbars in Gnus buffers.
 See @code{gnus-use-toolbar} and @code{message-use-toolbar}.
 
+@item The tool bar has been updated to use GNOME icons.
+You can also customize the tool bar.  There's no documentation in the
+manual yet, but @kbd{M-x customize-apropos RET -tool-bar$} should get
+you started.  (Only for Emacs, not in XEmacs.)
+
 @item The nnml back end allows other compression programs beside @file{gzip}
 for compressed message files.  @xref{Mail Spool}.
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fff2f83..99aaafa 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -51,6 +51,7 @@ license to the document, as described in section 6 of the license.
 \makeindex
 \begin{document}
 
+% Adjust ../Makefile.in if you change the following line:
 \newcommand{\gnusversionname}{T-gnus v6.17}
 \newcommand{\gnuschaptername}{}
 \newcommand{\gnussectionname}{}
@@ -367,6 +368,7 @@ internationalization/localization and multiscript features based on MULE
 API.  So T-gnus does not discriminate various language communities.  Oh,
 if you are a Klingon, please wait Unicode Next Generation.
 
+@c Adjust ../Makefile.in if you change the following line:
 This manual corresponds to T-gnus 6.17.
 
 @end ifinfo

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 2969401..037373c 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -89,8 +89,8 @@ gnus \e$B$N$9$Y$F$N%a%C%;!<%8$N:n@.\e(B (\e$B%a!<%k$H%K%e!<%9$NN>J}\e(B) \e$B$O!"%a%C
 * Key Index::         \e$B%a%C%;!<%8%b!<%I$N%-!<$N0lMw\e(B
 @end menu
 
-\e$B$3$N%^%K%e%"%k$O\e(B T-gnus 6.17 Message \e$B$KBP1~$7$^$9!#\e(BMessage \e$B$O$3$N%^%K%e\e(B
-\e$B%"%k$HF1$8HGHV9f$N5-:\$,$"$k\e(B T-gnus \e$B$NG[I[$H6&$KG[I[$5$l$^$9!#\e(B
+Message \e$B$O\e(B Gnus \e$B$H$H$b$KG[I[$5$l$^$9!#$3$N%^%K%e%"%k$KBP1~$9$k\e(B Gnus \e$B$NHG\e(B
+\e$B$O\e(B T-gnus 6.17 \e$B$G$9!#\e(B
 
 @node Interface
 @chapter \e$B%$%s%?!<%U%'!<%9\e(B

diff --git a/texi/message.texi b/texi/message.texi
index 9ad681b..fb3de3c 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -67,9 +67,10 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to T-gnus 6.17 Message.  Message is distributed
-with the Gnus distribution bearing the same version number as this
-manual.
+@c Adjust ../Makefile.in if you change the following lines:
+Message is distributed with Gnus.  The Gnus distribution
+@c
+corresponding to this manual is T-gnus 6.17.
 
 
 @node Interface

diff --git a/todo b/todo
index dee61bb..9c6123a 100644 (file)
--- a/todo
+++ b/todo
@@ -13,12 +13,27 @@
 * Add Message-IDs or URLs refering to relevant discussions on lists and
   newsgroups.
 
-* Use nicer icons, especially group, summary and message mode
+* Use nicer tool bar icons from GNOME
 
-  Only basic and frequently used commands should have an icons.
-  Maybe use Gnome icons if we can (copyright assignment?). See
-  http://theotp1.physik.uni-ulm.de/~ste/comp/emacs/gnus/tool-bar/ for a
-  suggestion.
+  Done for Emacs (The GNOME icons won't fit into standard XEmacs icons,
+  IMHO. -- rsteib) in group, summary and message mode.
+
+  Some modes might also deserve improved tool bars:
+  
+  - gnus-draft-mode
+  
+  - mml-preview buffer:
+  
+    . zap most buttons; except print, customize (?) and help
+  
+    . "exit" should just kill the buffer
+  
+  - gnus-server-mode: Add some commands from the Connections and Server
+    menu.
+  
+  - gnus-browse-mode (could borrow some icons from gnus-group-mode)
+  
+  (See http://article.gmane.org/gmane.emacs.gnus.general/62147).
 
 * Maybe Gnus should support the LIST SUBSCRIPTIONS, see RFC 2980.