[Emacs-diffs] emacs/lisp info.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/12/19 00:18:54

Modified files:
        lisp           : info.el 

Log message:
        (Info-isearch-search): Implement lax version of
        incremental word search in Info.
        (Info-isearch-start): Set Info-isearch-initial-node to the
        current node when search is nonincremental to not stop at the
        initial node in this case.
        (Info-mode-map): Unbind "\M-s" from `Info-search'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.553&r2=1.554

Patches:
Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -b -r1.553 -r1.554
--- info.el     3 Dec 2008 05:48:28 -0000       1.553
+++ info.el     19 Dec 2008 00:18:52 -0000      1.554
@@ -1815,7 +1815,12 @@
                                        (replace-regexp-in-string
                                         "^\\W+\\|\\W+$" "" string)
                                        nil t)
-                                "\\b")
+                                ;; Lax version of word search
+                                (if (or isearch-nonincremental
+                                        (eq (length string)
+                                            (length (isearch-string-state
+                                                     (car isearch-cmds)))))
+                                    "\\b"))
                         bound noerror count
                         (unless isearch-forward 'backward))
          (Info-search (if isearch-regexp string (regexp-quote string))
@@ -1845,7 +1850,10 @@
       (progn (Info-find-node file node) (sit-for 0))))
 
 (defun Info-isearch-start ()
-  (setq Info-isearch-initial-node nil))
+  (setq Info-isearch-initial-node
+       ;; Don't stop at initial node for nonincremental search.
+       ;; Otherwise this variable is set after first search failure.
+       (and isearch-nonincremental Info-current-node)))
 
 (defun Info-isearch-filter-predicate (beg-found found)
   "Skip invisible text, node header line and Tag Table node."
@@ -3241,8 +3249,6 @@
     (define-key map "r" 'Info-history-forward)
     (define-key map "s" 'Info-search)
     (define-key map "S" 'Info-search-case-sensitively)
-    ;; For consistency with Rmail.
-    (define-key map "\M-s" 'Info-search)
     (define-key map "\M-n" 'clone-buffer)
     (define-key map "t" 'Info-top-node)
     (define-key map "T" 'Info-toc)