Fix problems caused by new implementation of sub-word mode

[gnu-emacs] / lisp / textmodes / texnfo-upd.el

diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 8f4013234455ffc65fc01f3892c5a0d28da072d9..b01c678ffec515279ff95afcb521940545277e53 100644 (file)
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -519,7 +519,7 @@ line.  If there is no node name, returns an empty string."
 
   (save-excursion
     (buffer-substring
-     (progn (forward-word 1)              ; skip over node command
+     (progn (forward-word-strictly 1)     ; skip over node command
            (skip-chars-forward " \t")    ; and over spaces
            (point))
      (if (search-forward "," (line-end-position) t) ; bound search
@@ -542,7 +542,7 @@ must have been done by `texinfo-menu-locate-entry-p'."
   (goto-char (match-beginning 7))       ; match section name
 
   (buffer-substring
-   (progn (forward-word 1)              ; skip over section type
+   (progn (forward-word-strictly 1)     ; skip over section type
          (skip-chars-forward " \t")    ; and over spaces
          (point))
    (progn (end-of-line) (point))))
@@ -794,7 +794,7 @@ complements the node name rather than repeats it as a title does."
           (setq title
                (buffer-substring
                 ;; skip over section type
-                (progn (forward-word 1)
+                (progn (forward-word-strictly 1)
                        ;; and over spaces
                        (skip-chars-forward " \t")
                        (point))
@@ -1104,7 +1104,7 @@ point."
           t)
          (progn
            (beginning-of-line)
-           (forward-word 1)              ; skip over section type
+           (forward-word-strictly 1)     ; skip over section type
            (skip-chars-forward " \t")    ; and over spaces
            (buffer-substring
             (point)
@@ -1167,7 +1167,7 @@ error if the node is not the top node and a section is not found."
          (setq sec-name (buffer-substring-no-properties
                          (progn (beginning-of-line) ; copy its name
                                 (1+ (point)))
-                         (progn (forward-word 1)
+                         (progn (forward-word-strictly 1)
                                 (point))))))
     (cond
      ((or sec-pos top-pos)
@@ -1374,7 +1374,7 @@ Point must be at beginning of node line.  Does not move point."
   (save-excursion
     (let ((initial (texinfo-copy-next-section-title)))
       ;; This is not clean.  Use `interactive' to read the arg.
-      (forward-word 1)                    ; skip over node command
+      (forward-word-strictly 1)           ; skip over node command
       (skip-chars-forward " \t")          ; and over spaces
       (if (not (looking-at "[^,\t\n ]+")) ; regexp based on what Info looks for
                                          ; alternatively, use "[a-zA-Z]+"
@@ -1700,7 +1700,7 @@ node names in pre-existing `@node' lines that lack names."
       (if title-p
          (progn
            (beginning-of-line)
-           (forward-word 1)
+           (forward-word-strictly 1)
            (skip-chars-forward " \t")
            (setq title (buffer-substring
                         (point)
@@ -1713,7 +1713,7 @@ node names in pre-existing `@node' lines that lack names."
               (line-beginning-position -1))
           t)
          ;;  @node is present, and point at beginning of that line
-         (forward-word 1)          ; Leave point just after @node.
+         (forward-word-strictly 1) ; Leave point just after @node.
        ;; Else @node missing; insert one.
        (beginning-of-line)         ; Beginning of `@section' line.
        (insert "@node\n")
@@ -1728,7 +1728,7 @@ node names in pre-existing `@node' lines that lack names."
            (if (not (looking-at "[^,\t\n ]+"))
                (progn
                  (beginning-of-line)
-                 (forward-word 1)
+                 (forward-word-strictly 1)
                  (insert " " title)
                  (message "Inserted title %s ... " title)))))
       ;; Go forward beyond current section title.
@@ -1813,7 +1813,7 @@ same place.  If there is no title, returns an empty string."
            ;; copy title
            (let ((title
                   (buffer-substring
-                   (progn (forward-word 1)           ; skip over section type
+                   (progn (forward-word-strictly 1)  ; skip over section type
                           (skip-chars-forward " \t") ; and over spaces
                           (point))
                    (progn (end-of-line) (point)))))