[Emacs-diffs] Changes to emacs/lisp/info.el

[Juri Linkov]

Index: emacs/lisp/info.el
diff -u emacs/lisp/info.el:1.480 emacs/lisp/info.el:1.481
--- emacs/lisp/info.el:1.480    Thu Feb 23 21:41:41 2006
+++ emacs/lisp/info.el  Sat Mar 11 22:35:18 2006
@@ -1196,7 +1196,9 @@
                  (point)
                  (if (re-search-forward "^[^* \n\t]" nil t)
                      (match-beginning 0)
-                   (or limit (point-max)))) entries))))
+                   (or limit (point-max))))
+                entries)
+               (forward-line 0))))
          ;; Insert the entries just found.
          (while (= (line-beginning-position 0) (1- (point)))
            (backward-char))
@@ -1207,10 +1209,11 @@
 
          ;; Now remove duplicate entries under the same heading.
          (let ((seen nil)
-               (limit (point)))
+               (limit (point-marker)))
            (goto-char start)
-           (while (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)"
-                                     limit 'move)
+           (while (and (> limit (point))
+                       (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)"
+                                          limit 'move))
              ;; Fold case straight away; `member-ignore-case' here wasteful.
              (let ((x (downcase (match-string 1))))
                (if (member x seen)