X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=texi%2Fgnus-news.el;h=5ccd3f44be58a5ff64b23b85b5bfe7e0f9289706;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hp=65c59d45fafe8d93bbc2cd3543707288a97f7373;hpb=e67f1fe76688c90b978018d0f2059e68c5ad4dbc;p=gnus

diff --git a/texi/gnus-news.el b/texi/gnus-news.el
index 65c59d45f..5ccd3f44b 100644
--- a/texi/gnus-news.el
+++ b/texi/gnus-news.el
@@ -1,15 +1,15 @@
 ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source
-;; Copyright (C)  2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib  <Reiner.Steib@gmx.de>
 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -27,41 +25,40 @@
 
 (defvar gnus-news-header-disclaimer
 "GNUS NEWS -- history of user-visible changes.
-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\".
+Copyright (C) 1999-2016 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-
-* Changes in No Gnus
-
-")
+Please send Gnus bug reports to bugs@gnus.org.
+For older news, see Gnus info node \"New Features\".\n\n")
 
 (defvar gnus-news-trailer
 "
 * For older news, see Gnus info node \"New Features\".
 
 ----------------------------------------------------------------------
-Copyright information:
+
+This file is part of GNU Emacs.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+\(at your option) any later version.
 
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them.
 \nLocal variables:\nmode: outline
 paragraph-separate: \"[ 	]*$\"\nend:\n")
 
 (defvar gnus-news-makeinfo-command "makeinfo")
 
-(defvar gnus-news-fill-column 72)
+(defvar gnus-news-fill-column 80)
 
 (defvar gnus-news-makeinfo-switches
   (concat " --no-headers --paragraph-indent=0"
@@ -88,7 +85,7 @@ paragraph-separate: \"[ 	]*$\"\nend:\n")
 	 (infile (concat dir infile))
 	 (buffer (find-file-noselect (concat dir outfile))))
     (with-temp-buffer
-      ;; Could be done using `texinfmt' stuff as in `infohack.el'.
+      ;; Could be done using 'texinfmt' stuff as in 'infohack.el'.
       (insert
        (shell-command-to-string
 	(concat gnus-news-makeinfo-command " "
@@ -96,21 +93,23 @@ paragraph-separate: \"[ 	]*$\"\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 "\f\n* ")))
+      (save-excursion
+	(while (re-search-forward "^        \\* " nil t)
 	  (replace-match "** ")))
       (save-excursion
 	(while (re-search-forward "^     " nil t)
 	  (replace-match "")))
+      ;; Avoid '*' from @ref at beginning of line:
+      (save-excursion
+	(while (re-search-forward "^\\*Note" nil t)
+	  (replace-match " \\&")))
       (goto-char (point-min))
       (insert gnus-news-header-disclaimer)
       (goto-char (point-max))
       (insert gnus-news-trailer)
       (write-region (point-min) (point-max) outfile))))
 
-;;; arch-tag: e23cdd27-eafd-4ba0-816f-98f5edb0dc29
 ;;; gnus-news.el ends here