[Emacs-diffs] /srv/bzr/emacs/trunk r109506: * lisp/info.el (Info-isearch-search): Doc fix.

[Juri Linkov]

------------------------------------------------------------
revno: 109506
fixes bug: http://debbugs.gnu.org/12078
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-08 11:05:58 +0300
message:
  * lisp/info.el (Info-isearch-search): Doc fix.
  (Info-search): Change search-failed message from "initial node" to
  "end of node".
  (Info-isearch-search): Change `isearch-string-state' to
  `isearch--state-string'.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-08 07:19:58 +0000
+++ b/lisp/ChangeLog    2012-08-08 08:05:58 +0000
@@ -1,3 +1,11 @@
+2012-08-08  Juri Linkov  <address@hidden>
+
+       * info.el (Info-isearch-search): Doc fix.
+       (Info-search): Change search-failed message from "initial node" to
+       "end of node" (bug#12078).
+       (Info-isearch-search): Change `isearch-string-state' to
+       `isearch--state-string'.
+
 2012-08-08  Glenn Morris  <address@hidden>
 
        * language/persian.el: Remove file.

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2012-08-07 16:12:20 +0000
+++ b/lisp/info.el      2012-08-08 08:05:58 +0000
@@ -342,12 +342,12 @@
 (defcustom Info-isearch-search t
   "If non-nil, isearch in Info searches through multiple nodes.
 Before leaving the initial Info node, where isearch was started,
-it fails once with the error message [initial node], and with
+it fails once with the error message [end of node], and with
 subsequent C-s/C-r continues through other nodes without failing
 with this error message in other nodes.  When isearch fails for
-the rest of the manual, it wraps around the whole manual and
-restarts the search from the top/final node depending on
-search direction.
+the rest of the manual, it displays the error message [end of manual],
+wraps around the whole manual and restarts the search from the top/final
+node depending on search direction.
 
 Setting this option to nil restores the default isearch behavior
 with wrapping around the current Info node."
@@ -1863,7 +1863,7 @@
                 (not bound)
                 (or give-up (and found (not (and (> found opoint-min)
                                                  (< found opoint-max))))))
-       (signal 'search-failed (list regexp "initial node")))
+       (signal 'search-failed (list regexp "end of node")))
 
       ;; If no subfiles, give error now.
       (if give-up
@@ -2006,7 +2006,7 @@
           ;; Lax version of word search
           (let ((lax (not (or isearch-nonincremental
                               (eq (length string)
-                                  (length (isearch-string-state
+                                  (length (isearch--state-string
                                            (car isearch-cmds))))))))
             (if (functionp isearch-word)
                 (funcall isearch-word string lax)