(Info-validate, Info-validate-node-name): Use buffer-substring-no-properties.

(Info-tagify, batch-info-validate, Info-validate-tags-table): Likewise.

1 files changed, 11 insertions, 8 deletions

diff --git a/lisp/informat.el b/lisp/informat.el
index 2d923a1570d..7d7d73725bf 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -55,7 +55,7 @@
                   (forward-line 2)
                   (if (re-search-backward regexp beg t)
                       (setq list
-                            (cons (list (buffer-substring
+                            (cons (list (buffer-substring-no-properties
                                           (match-beginning 1)
                                           (match-end 1))
                                         beg)
@@ -175,7 +175,7 @@ Check that every node pointer points to an existing node."
             (forward-line 1)
             (if (re-search-backward regexp beg t)
                 (let ((name (downcase
-                              (buffer-substring
+                              (buffer-substring-no-properties
                                 (match-beginning 1)
                                 (progn
                                   (goto-char (match-end 1))
@@ -208,7 +208,7 @@ Check that every node pointer points to an existing node."
                   (search-forward "\n\^_" nil 'move)
                   (narrow-to-region beg (point))
                   (setq thisnode (downcase
-                                   (buffer-substring
+                                   (buffer-substring-no-properties
                                      (match-beginning 1)
                                      (progn
                                        (goto-char (match-end 1))
@@ -302,7 +302,7 @@ Check that every node pointer points to an existing node."
     (if (= (following-char) ?\()
         nil
       (setq name
-            (buffer-substring
+            (buffer-substring-no-properties
              (point)
              (progn
               (skip-chars-forward "^,\t\n")
@@ -338,7 +338,7 @@ Check that every node pointer points to an existing node."
                (setq tem (cdr tem)))
              (goto-char (1+ start))
              (while (looking-at ".*Node: \\(.*\\)\177\\([0-9]+\\)$")
-               (setq tem (downcase (buffer-substring
+               (setq tem (downcase (buffer-substring-no-properties
                                      (match-beginning 1)
                                      (match-end 1))))
                (setq tem (assoc tem allnodes))
@@ -348,8 +348,10 @@ Check that every node pointer points to an existing node."
                                  (setq tem (- (car (cdr (cdr tem)))
                                               (read (current-buffer))))
                                  (if (> tem 0) tem (- tem)))))
-                   (throw 'losing 'y)))
-             (forward-line 1))
+                   (throw 'losing 'y))
+               (forward-line 1)))
+           (if (looking-at "\^_\n")
+               (forward-line 1))
            (or (looking-at "End tag table\n")
                (throw 'losing 'z))
            nil))))
@@ -412,7 +414,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\""
                     (message ">> PROBLEMS IN INFO FILE %s" file)
                     (save-excursion
                       (set-buffer loss-name)
-                      (princ (buffer-substring (point-min) (point-max))))
+                      (princ (buffer-substring-no-properties
+                              (point-min) (point-max))))
                     (message "----------------------------------------------------------------------")
                     (setq error 1 lose t)))
                 (if (and (buffer-modified-p)