Importing Pterodactyl Gnus v0.96.

[elisp/gnus.git-] / lisp / nndoc.el

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 81b0fea..66e24cb 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -290,7 +290,7 @@ from the document.")
        (mm-enable-multibyte)
        (erase-buffer)
        (if (stringp nndoc-address)
-           (mm-insert-file-contents nndoc-address)
+           (nnheader-insert-file-contents nndoc-address)
          (insert-buffer-substring nndoc-address))
        (run-hooks 'nndoc-open-document-hook))))
     ;; Initialize the nndoc structures according to this new document.
@@ -341,6 +341,9 @@ from the document.")
                (setq entry (pop alist)))
       (when (memq subtype (or (cdr (assq 'subtype entry)) '(guess)))
        (goto-char (point-min))
+       ;; Remove blank lines.
+       (while (eq (following-char) ?\n)
+         (delete-char 1))
        (when (numberp (setq result (funcall (intern
                                              (format "nndoc-%s-type-p"
                                                      (car entry))))))
@@ -581,6 +584,9 @@ from the document.")
     (save-excursion
       (set-buffer nndoc-current-buffer)
       (goto-char (point-min))
+      ;; Remove blank lines.
+      (while (eq (following-char) ?\n)
+       (delete-char 1))
       ;; Find the beginning of the file.
       (when nndoc-file-begin
        (nndoc-search nndoc-file-begin))