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

(Info-isearch-search): Emulate word search in

Browse source 
isearching through multiple Info nodes with Info-search.
(Info-isearch-wrap): Allow isearch-word.
This commit is contained in:
Juri Linkov 2005-03-08 21:51:48 +00:00
parent 15a420bd3f
commit 9553cf63a5
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lisp/ChangeLog
View file

@ -1,3 +1,33 @@
2005-03-08 Juri Linkov <juri@jurta.org>
* textmodes/sgml-mode.el (sgml-tag, html-tag-alist)
(html-horizontal-rule, html-line, html-image, html-checkboxes)
(html-radio-buttons): Add a space before the trailing `/>' where
sgml-xml-mode is non-nil.
(sgml-delete-tag): Check if the tag ends with `/>' to not delete
the subsequent tag of the empty XML tag.
(html-href-anchor): Don't set initial input to "http:".
(html-image): Ask for the image URL and set point inside alt="".
(html-name-anchor): Duplicate the name in the `id' attribute when
sgml-xml-mode is non-nil.
(html-paragraph): Remove \n before <p>.
(html-checkboxes, html-radio-buttons): Insert `checked="checked"'
instead of `checked' when sgml-xml-mode is non-nil.
* facemenu.el (list-colors-print): Print #RRGGBB in default face.
Remove 1 space before #RRGGBB to not truncate it on terminal
windows w/o fringes. Remove 1 space between bg and fg examples
to get more space.
(list-colors-duplicates): Replace `and' with `if' for `boundp' to
avoid byte-compile warnings.
* image-file.el (image-file-handler): Put `safe-magic' property to
`image-file-handler'.
* info.el (Info-isearch-search): Emulate word search in
isearching through multiple Info nodes with Info-search.
(Info-isearch-wrap): Allow isearch-word.
2005-03-08 Lute Kamstra <lute@gnu.org>
* emacs-lisp/debug.el (debugger-step-through): Make sure that

12
lisp/info.el
View file

@ -1646,10 +1646,16 @@ If DIRECTION is `backward', search in the reverse direction."
(Info-search regexp bound noerror count 'backward))
(defun Info-isearch-search ()
(if (and Info-isearch-search (not isearch-word))
(if Info-isearch-search
(lambda (string &optional bound noerror count)
(condition-case nil
(progn
(if isearch-word
(Info-search (concat "\\b" (replace-regexp-in-string
"\\W+" "\\\\W+"
(replace-regexp-in-string
"^\\W+\\|\\W+$" "" string)) "\\b")
bound noerror count
(unless isearch-forward 'backward))
(Info-search (if isearch-regexp string (regexp-quote string))
bound noerror count
(unless isearch-forward 'backward))
@ -1659,7 +1665,7 @@ If DIRECTION is `backward', search in the reverse direction."
(isearch-search-fun))))
(defun Info-isearch-wrap ()
(when (and Info-isearch-search (not isearch-word))
(when Info-isearch-search
(if isearch-forward (Info-top-node) (Info-final-node))
(goto-char (if isearch-forward (point-min) (point-max)))))