Synch to No Gnus 200512021820.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 95b3795..e9beb66 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-news.el: Update Copyright.
+       (gnus-news-translate-file): Avoid "*Note" at beginning of line.
+
 2005-12-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * emacs-mime.texi (Non-MIME): x-gnus-verbatim -> x-verbatim.

diff --git a/texi/gnus-news.el b/texi/gnus-news.el
index 4e5cdc6..f401b2e 100644 (file)
--- a/texi/gnus-news.el
+++ b/texi/gnus-news.el
@@ -1,5 +1,5 @@
 ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source
-;; Copyright (C)  2004  Free Software Foundation, Inc.
+;; Copyright (C)  2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib  <Reiner.Steib@gmx.de>
 ;; Keywords: tools
@@ -27,13 +27,12 @@
 
 (defvar gnus-news-header-disclaimer
 "GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs\@gnus.org.
 For older news, see Gnus info node \"New Features\".
 
-
 \f
 * Changes in No Gnus
 
@@ -46,7 +45,7 @@ For older news, see Gnus info node \"New Features\".
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -97,6 +96,10 @@ paragraph-separate: \"[      \f]*$\"\nend:\n")
       (goto-char (point-max))
       (delete-char -1)
       (goto-char (point-min))
+      ;; Avoid `*' from @ref at beginning of line:
+      (save-excursion
+       (while (re-search-forward "^\\*Note" nil t)
+         (replace-match " \\&")))
       (save-excursion
        (while (re-search-forward "^   \\* " nil t)
          (replace-match "** ")))