procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Info-dir-remove-duplicates): Move point to the

Browse source 
beginning of the current line after deleting the entries from
redundant heading.  Use marker for `limit' and compare it with
point before calling `re-search-forward'.
This commit is contained in:
Juri Linkov 2006-03-11 22:35:51 +00:00
parent c93b1b4b30
commit 2d19a2a436
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2006-03-12 Juri Linkov <juri@jurta.org>
* battery.el (battery-linux-proc-acpi): Check `capacity' for non-nil
before comparing with `low' and `warn'.
* info.el (Info-dir-remove-duplicates): Move point to the
beginning of the current line after deleting the entries from
redundant heading. Use marker for `limit' and compare it with
point before calling `re-search-forward'.
2006-03-11 Luc Teirlinck <teirllm@auburn.edu>
* simple.el (yank): Fix typo in docstring.

11
lisp/info.el
View file

@ -1196,7 +1196,9 @@ a case-insensitive match is tried."
(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 @@ a case-insensitive match is tried."
;; 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)