Synch with Gnus and

* lisp/dgnushack.el (dgnushack-texi-format): Remove @ignore'd areas before
processing.

diff --git a/ChangeLog b/ChangeLog
index 1c22c99..9053ed4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-11-01  Katsumi Yamaoka <yamaoka@jpl.org>
 
+       * lisp/dgnushack.el (dgnushack-texi-format): Remove @ignore'd areas
+       before processing.
+
+2000-11-01  Katsumi Yamaoka <yamaoka@jpl.org>
+
        * lisp/gnus-vers.el (gnus-revision-number): Increment to 06.
 
        * lisp/gnus.el (gnus-product-variable-file-list): Check for

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index ce4eb3d..706c24a 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -390,16 +390,26 @@ You must specify the name of the package path as follows:
            (progn
              (if buffer-file-name (kill-buffer (current-buffer)))
              (find-file file)
+             (buffer-disable-undo (current-buffer))
              (if (boundp 'MULE)
                  (setq output-coding-system (symbol-value
                                              'file-coding-system))
                (setq coding-system-for-write buffer-file-coding-system))
+             ;; Remove ignored areas first.
+             (while (re-search-forward "^@ignore[\t\r ]*$" nil t)
+               (delete-region (match-beginning 0)
+                              (if (re-search-forward
+                                   "^@end[\t ]+ignore[\t\r ]*$" nil t)
+                                  (1+ (match-end 0))
+                                (point-max))))
+             (goto-char (point-min))
+             ;; Add suffix if it is needed.
              (when (and addsuffix
                         (re-search-forward
                          "^@setfilename[\t ]+\\([^\t\n ]+\\)" nil t)
                         (not (string-match "\\.info$" (match-string 1))))
-               (insert ".info"))
-             (buffer-disable-undo (current-buffer))
+               (insert ".info")
+               (goto-char (point-min)))
              ;; process @include before updating node
              ;; This might produce some problem if we use @lowersection or
              ;; such.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 7e4f077..7fb7c1c 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -22,6 +22,7 @@
               find-image font-create-object gnus-mule-get-coding-system
               font-lock-set-defaults
               image-size image-type-available-p insert-image
+              make-temp-file
               mail-aliases-setup mm-copy-tree
               mule-write-region-no-coding-system put-image
               rmail-select-summary rmail-summary-exists rmail-update-summary