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

isearching through multiple Info nodes with Info-search.
(Info-isearch-wrap): Allow isearch-word.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bceac3d75970ca39fec4a6ee8c0346dce7085c03..0f3bb47ce9bdad5d4933b6267ffa96b5e1379f4e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/info.el b/lisp/info.el
index 4905bf0844e85e9de1e03bcaf872933860553f61..fcc423959674194efa38c5f51e78ddcb82e56100 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -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)))))