[Emacs-diffs] Changes to emacs/lisp/isearch.el

[Kim F. Storm]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.201 emacs/lisp/isearch.el:1.202
*** emacs/lisp/isearch.el:1.201 Wed Nov 28 17:34:20 2001
--- emacs/lisp/isearch.el       Sat Dec  1 20:12:16 2001
***************
*** 186,191 ****
--- 186,196 ----
    :type 'boolean 
    :group 'isearch)
  
+ (defcustom isearch-resume-enabled t
+   "*If non-nil, `isearch-resume' commands are added to the command history."
+   :type 'boolean
+   :group 'isearch)
+ 
  (defvar isearch-mode-hook nil
    "Function(s) to call after starting up an incremental search.")
  
***************
*** 647,658 ****
    (setq disable-point-adjustment t))
  
  (defun isearch-done (&optional nopush edit)
!   (let ((command `(isearch-resume ,isearch-string ,isearch-regexp
!                                 ,isearch-word ,isearch-forward
!                                 ,isearch-message
!                                 ',isearch-case-fold-search)))
!     (unless (equal (car command-history) command)
!       (setq command-history (cons command command-history))))
  
    (remove-hook 'mouse-leave-buffer-hook 'isearch-done)
    (remove-hook 'kbd-macro-termination-hook 'isearch-done)
--- 652,664 ----
    (setq disable-point-adjustment t))
  
  (defun isearch-done (&optional nopush edit)
!   (if isearch-resume-enabled
!       (let ((command `(isearch-resume ,isearch-string ,isearch-regexp
!                                     ,isearch-word ,isearch-forward
!                                     ,isearch-message
!                                     ',isearch-case-fold-search)))
!       (unless (equal (car command-history) command)
!         (setq command-history (cons command command-history)))))
  
    (remove-hook 'mouse-leave-buffer-hook 'isearch-done)
    (remove-hook 'kbd-macro-termination-hook 'isearch-done)