2 files changed, 21 insertions, 19 deletions
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 3ba52e61ea6..207fcf2f213 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -498,8 +498,9 @@ try to replace the {DATA} with an abbreviation."
         (assoc name r2b-proceedings-list)
         (let ((match (assoc name r2b-booktitle-abbrevs)))
            (and match
-               (string-match "proceedings\\|conference" (car (cdr match)))))
+                 (string-match "proceedings\\|conference" (car (cdr match))))))
-      )))
+      t
+      ))
 (defun r2b-isa-university (name)
   "Return t if NAME is a university or similar organization,
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 134f82b14e0..e2a0ed9af6f 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -410,23 +410,24 @@ and to the end of the menu region for the level.
 Return t if the node is found, else nil.  Leave point at the beginning
 of the node if one is found; else do not move point."
  (let ((case-fold-search t))
-    (if (and (< (point) region-end)
+    (when (and (< (point) region-end)
-             (re-search-forward
+               (re-search-forward
-              (concat
+                (concat
-               "\\(^@node\\).*\n"         ; match node line
+                 "\\(^@node\\).*\n"         ; match node line
-               "\\(\\(\\(^@c\\).*\n\\)"   ; match comment line, if any
+                 "\\(\\(\\(^@c\\).*\n\\)"   ; match comment line, if any
-               "\\|"                      ; or
+                 "\\|"                      ; or
-               "\\(^@ifinfo[ ]*\n\\)"     ; ifinfo line, if any
+                 "\\(^@ifinfo[ ]*\n\\)"     ; ifinfo line, if any
-               "\\|"                      ; or
+                 "\\|"                      ; or
-               "\\(^@ifnottex[ ]*\n\\)"   ; ifnottex line, if any
+                 "\\(^@ifnottex[ ]*\n\\)"   ; ifnottex line, if any
-               "\\)?"                     ; end of expression
+                 "\\)?"                     ; end of expression
-               (eval (cdr (assoc level texinfo-update-menu-lower-regexps))))
+                 (eval (cdr (assoc level texinfo-update-menu-lower-regexps))))
-              ;; the next higher level node marks the end of this
+                ;; the next higher level node marks the end of this
-              ;; section, and no lower level node will be found beyond
+                ;; section, and no lower level node will be found beyond
-              ;; this position even if region-end is farther off
+                ;; this position even if region-end is farther off
-              (texinfo-update-menu-region-end level)
+                (texinfo-update-menu-region-end level)
-              t))
+                t))
-        (goto-char (match-beginning 1)))))
+      (goto-char (match-beginning 1))
+      t)))
 (defun texinfo-find-higher-level-node (level region-end)
  "Search forward from point for node at any higher level than argument LEVEL.

diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 3ba52e61ea6..207fcf2f213 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el
@@ -498,8 +498,9 @@ try to replace the {DATA} with an abbreviation."
498	(assoc name r2b-proceedings-list)	498	(assoc name r2b-proceedings-list)
499	(let ((match (assoc name r2b-booktitle-abbrevs)))	499	(let ((match (assoc name r2b-booktitle-abbrevs)))
500	(and match	500	(and match
501	(string-match "proceedings\\\|conference" (car (cdr match)))))	501	(string-match "proceedings\\\|conference" (car (cdr match))))))
502	)))	502	t
		503	))
503		504
504	(defun r2b-isa-university (name)	505	(defun r2b-isa-university (name)
505	"Return t if NAME is a university or similar organization,	506	"Return t if NAME is a university or similar organization,


diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 134f82b14e0..e2a0ed9af6f 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el
@@ -410,23 +410,24 @@ and to the end of the menu region for the level.
410	Return t if the node is found, else nil. Leave point at the beginning	410	Return t if the node is found, else nil. Leave point at the beginning
411	of the node if one is found; else do not move point."	411	of the node if one is found; else do not move point."
412	(let ((case-fold-search t))	412	(let ((case-fold-search t))
413	(if (and (< (point) region-end)	413	(when (and (< (point) region-end)
414	(re-search-forward	414	(re-search-forward
415	(concat	415	(concat
416	"\\(^@node\\).*\n" ; match node line	416	"\\(^@node\\).*\n" ; match node line
417	"\\(\\(\\(^@c\\).*\n\\)" ; match comment line, if any	417	"\\(\\(\\(^@c\\).*\n\\)" ; match comment line, if any
418	"\\\|" ; or	418	"\\\|" ; or
419	"\\(^@ifinfo[ ]*\n\\)" ; ifinfo line, if any	419	"\\(^@ifinfo[ ]*\n\\)" ; ifinfo line, if any
420	"\\\|" ; or	420	"\\\|" ; or
421	"\\(^@ifnottex[ ]*\n\\)" ; ifnottex line, if any	421	"\\(^@ifnottex[ ]*\n\\)" ; ifnottex line, if any
422	"\\)?" ; end of expression	422	"\\)?" ; end of expression
423	(eval (cdr (assoc level texinfo-update-menu-lower-regexps))))	423	(eval (cdr (assoc level texinfo-update-menu-lower-regexps))))
424	;; the next higher level node marks the end of this	424	;; the next higher level node marks the end of this
425	;; section, and no lower level node will be found beyond	425	;; section, and no lower level node will be found beyond
426	;; this position even if region-end is farther off	426	;; this position even if region-end is farther off
427	(texinfo-update-menu-region-end level)	427	(texinfo-update-menu-region-end level)
428	t))	428	t))
429	(goto-char (match-beginning 1)))))	429	(goto-char (match-beginning 1))
		430	t)))
430		431
431	(defun texinfo-find-higher-level-node (level region-end)	432	(defun texinfo-find-higher-level-node (level region-end)
432	"Search forward from point for node at any higher level than argument LEVEL.	433	"Search forward from point for node at any higher level than argument LEVEL.