Changes committed gnus/texi (ChangeLog infohack.el)

Modified: ChangeLog infohack.el

(infohack): Insert @include files before performing texinfo-every-node-update.


Index: ChangeLog
diff -u gnus/texi/ChangeLog:7.423 gnus/texi/ChangeLog:7.424
--- ChangeLog:7.423	Wed Sep 24 02:36:52 2008
+++ ChangeLog	Wed Sep 24 08:45:00 2008
@@ -1,5 +1,8 @@
 2008-09-24  Katsumi Yamaoka  <[email protected]>
 
+	* infohack.el (infohack): Insert @include files before performing
+	texinfo-every-node-update.
+
 	* gnus.texi (The Gnus Registry): Don't give argument to @item used in
 	@enumerate section so as to be able to be formatted with MAKEINFO=no.
 
Index: infohack.el
diff -u gnus/texi/infohack.el:7.7 gnus/texi/infohack.el:7.8
--- infohack.el:7.7	Mon Mar 10 01:53:10 2008
+++ infohack.el	Wed Sep 24 08:45:00 2008
@@ -80,6 +80,28 @@
     (find-file file)
     (setq buffer-read-only nil)
     (setq coding-system buffer-file-coding-system)
+
+    ;; Insert @include files before performing `texinfo-every-node-update'.
+    (set-syntax-table texinfo-format-syntax-table)
+    (let (start texinfo-command-end filename)
+      (while (re-search-forward "^@include" nil t)
+	(setq start (match-beginning 0)
+	      texinfo-command-end (point)
+	      filename (texinfo-parse-line-arg))
+	(delete-region start (point-at-bol 2))
+	(message "Reading included file: %s" filename)
+	(save-excursion
+	  (save-restriction
+	    (narrow-to-region
+	     (point)
+	     (+ (point) (car (cdr (insert-file-contents filename)))))
+	    (goto-char (point-min))
+	    ;; Remove `@setfilename' line from included file, if any,
+	    ;; so @setfilename command not duplicated.
+	    (if (re-search-forward "^@setfilename" (point-at-eol 100) t)
+		(delete-region (point-at-bol 1)
+			       (point-at-bol 2)))))))
+
     (infohack-remove-unsupported)
     (texinfo-every-node-update) 
     (texinfo-format-buffer t) ;; Don't save any file.