From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Search minibuffer history Date: Thu, 12 Jul 2007 01:55:05 +0300 Organization: JURTA Message-ID: <874pka4khu.fsf@jurta.org> References: <87myy5thsa.fsf@jurta.org> <87odikbdtl.fsf@jurta.org> <87fy3v7uwp.fsf@jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1184196100 21695 80.91.229.12 (11 Jul 2007 23:21:40 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 11 Jul 2007 23:21:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 12 01:21:38 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1I8lUz-0004T1-7U for ged-emacs-devel@m.gmane.org; Thu, 12 Jul 2007 01:21:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I8lUy-0007lo-L2 for ged-emacs-devel@m.gmane.org; Wed, 11 Jul 2007 19:21:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I8lUF-00061o-GR for emacs-devel@gnu.org; Wed, 11 Jul 2007 19:20:47 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I8lUD-0005wX-9A for emacs-devel@gnu.org; Wed, 11 Jul 2007 19:20:46 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I8lUC-0005vt-V4 for emacs-devel@gnu.org; Wed, 11 Jul 2007 19:20:45 -0400 Original-Received: from relay02.kiev.sovam.com ([62.64.120.197]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1I8lUA-0002b6-Jo; Wed, 11 Jul 2007 19:20:43 -0400 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay02.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1I8lU6-000GI1-KZ; Thu, 12 Jul 2007 02:20:39 +0300 In-Reply-To: (Richard Stallman's message of "Wed\, 11 Jul 2007 17\:04\:23 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-Scanner-Signature: a23323cccf2928426538b0cd011d9d82 X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 1209 [July 11 2007] X-SpamTest-Info: helo_type=3 X-SpamTest-Method: none X-SpamTest-Rate: 0 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release X-detected-kernel: FreeBSD 4.8-5.1 (or MacOS X 10.2-10.3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:74670 Archived-At: > Please write the comments now -- we don't want to install it without them. Below is a new patch with added comprehensive comments necessary to understand how this feature works (I suppose that docstrings are not needed, since new minibuffer-specific functions and variables are purely internal and are not intended for calling directly by the user). Index: lisp/simple.el =================================================================== RCS file: /sources/emacs/emacs/lisp/simple.el,v retrieving revision 1.865 diff -c -r1.865 simple.el *** lisp/simple.el 7 Jul 2007 11:17:51 -0000 1.865 --- lisp/simple.el 11 Jul 2007 22:50:40 -0000 *************** *** 1300,1311 **** (defvar minibuffer-temporary-goal-position nil) ! (defun next-history-element (n) "Puts next element of the minibuffer history in the minibuffer. ! With argument N, it uses the Nth following element." (interactive "p") ! (or (zerop n) ! (let ((narg (- minibuffer-history-position n)) (minimum (if minibuffer-default -1 0)) elt minibuffer-returned-to-present) (if (and (zerop minibuffer-history-position) --- 1300,1313 ---- (defvar minibuffer-temporary-goal-position nil) ! (defun next-history-element (n &optional narg) "Puts next element of the minibuffer history in the minibuffer. ! With argument N, it uses the Nth following element. ! The optional argument NARG overrides the argument N and specifies the ! absolute history position instead of relative position specified by N." (interactive "p") ! (or (and (zerop n) (not narg)) ! (let ((narg (or narg (- minibuffer-history-position n))) (minimum (if minibuffer-default -1 0)) elt minibuffer-returned-to-present) (if (and (zerop minibuffer-history-position) *************** *** 1344,1354 **** elt)) (goto-char (or minibuffer-temporary-goal-position (point-max)))))) ! (defun previous-history-element (n) "Puts previous element of the minibuffer history in the minibuffer. ! With argument N, it uses the Nth previous element." (interactive "p") ! (next-history-element (- n))) (defun next-complete-history-element (n) "Get next history element which completes the minibuffer before the point. --- 1346,1358 ---- elt)) (goto-char (or minibuffer-temporary-goal-position (point-max)))))) ! (defun previous-history-element (n &optional narg) "Puts previous element of the minibuffer history in the minibuffer. ! With argument N, it uses the Nth previous element. ! The optional argument NARG overrides the argument N and specifies the ! absolute history position instead of relative position specified by N." (interactive "p") ! (next-history-element (- n) narg)) (defun next-complete-history-element (n) "Get next history element which completes the minibuffer before the point. *************** *** 1381,1386 **** --- 1385,1506 ---- ;; the buffer; this should be 0 for normal buffers. (1- (minibuffer-prompt-end))) + ;; isearch minibuffer history + (add-hook 'minibuffer-setup-hook 'minibuffer-history-isearch-setup) + + (defvar minibuffer-history-isearch-message-overlay) + (make-variable-buffer-local 'minibuffer-history-isearch-message-overlay) + + (defun minibuffer-history-isearch-setup () + (set (make-local-variable 'isearch-search-fun-function) + 'minibuffer-history-isearch-search) + (set (make-local-variable 'isearch-message-function) + 'minibuffer-history-isearch-message) + (set (make-local-variable 'isearch-wrap-function) + 'minibuffer-history-isearch-wrap) + (set (make-local-variable 'isearch-push-state-function) + 'minibuffer-history-isearch-push-state) + (add-hook 'isearch-mode-end-hook 'minibuffer-history-isearch-end nil t)) + + (defun minibuffer-history-isearch-end () + (if minibuffer-history-isearch-message-overlay + (delete-overlay minibuffer-history-isearch-message-overlay))) + + (defun minibuffer-history-isearch-search () + (cond + (isearch-word + (if isearch-forward 'word-search-forward 'word-search-backward)) + (t + (lambda (string bound noerror) + (let ((search-fun + ;; Use standard functions to search within minibuffer text + (cond + (isearch-regexp + (if isearch-forward 're-search-forward 're-search-backward)) + (t + (if isearch-forward 'search-forward 'search-backward)))) + found) + ;; Avoid lazy-highlighting matches in the minibuffer prompt when + ;; searching forward. Lazy-highlight calls this lambda with the + ;; bound arg, so skip the minibuffer prompt. + (if (and bound isearch-forward (< (point) (minibuffer-prompt-end))) + (goto-char (minibuffer-prompt-end))) + (or + ;; 1. First try searching in the initial minibuffer text + (funcall search-fun string + (if isearch-forward bound (minibuffer-prompt-end)) + noerror) + ;; 2. If the above search fails, start putting next/prev history + ;; elements in the minibuffer successively, and search the string + ;; in them. Do this only when bound is nil (i.e. not while + ;; lazy-highlighting search strings in the current minibuffer text). + (unless bound + (condition-case nil + (progn + (while (not found) + (cond (isearch-forward + (next-history-element 1) + (goto-char (minibuffer-prompt-end))) + (t + (previous-history-element 1) + (goto-char (point-max)))) + (setq isearch-barrier (point) isearch-opoint (point)) + ;; After putting the next/prev history element, search + ;; the string in them again, until next-history-element + ;; or previous-history-element raises an error at the + ;; beginning/end of history. + (setq found (funcall search-fun string + (unless isearch-forward + ;; For backward search, don't search + ;; in the minibuffer prompt + (minibuffer-prompt-end)) + noerror))) + ;; Return point of the new search result + (point)) + ;; Return nil when next(prev)-history-element fails + (error nil))))))))) + + (defun minibuffer-history-isearch-message (&optional c-q-hack ellipsis) + (if (not (and (minibufferp) isearch-success (not isearch-error))) + ;; Use standard function `isearch-message' when not in the minibuffer, + ;; or search fails, or has an error (like incomplete regexp). + ;; This function overwrites minibuffer text with isearch message, + ;; so it's possible to see what is wrong in the search string. + (isearch-message c-q-hack ellipsis) + ;; Otherwise, put the overlay with the standard isearch prompt over + ;; the initial minibuffer prompt. + (if (overlayp minibuffer-history-isearch-message-overlay) + (move-overlay minibuffer-history-isearch-message-overlay + (point-min) (minibuffer-prompt-end)) + (setq minibuffer-history-isearch-message-overlay + (make-overlay (point-min) (minibuffer-prompt-end))) + (overlay-put minibuffer-history-isearch-message-overlay 'evaporate t)) + (overlay-put minibuffer-history-isearch-message-overlay + 'display (isearch-message-prefix c-q-hack ellipsis)) + ;; And clear any previous isearch message. + (message ""))) + + (defun minibuffer-history-isearch-wrap () + ;; When `minibuffer-history-isearch-search' fails on reaching the + ;; beginning/end of the history, wrap the search to the first/last + ;; minibuffer history element. + (unless isearch-word + (if isearch-forward + (next-history-element 0 (length (symbol-value minibuffer-history-variable))) + (next-history-element 0 0)) + (setq isearch-success t)) + (goto-char (if isearch-forward (minibuffer-prompt-end) (point-max)))) + + (defun minibuffer-history-isearch-push-state () + ;; Save minibuffer-history-position to the additional state parameter. + `(lambda (cmd) + (minibuffer-history-isearch-pop-state cmd ,minibuffer-history-position))) + + (defun minibuffer-history-isearch-pop-state (cmd hist-pos) + ;; Go to the history element by the absolute history position `hist-pos'. + (next-history-element 0 hist-pos)) + + ;Put this on C-x u, so we can force that rather than C-_ into startup msg (defalias 'advertised-undo 'undo) Index: lisp/isearch.el =================================================================== RCS file: /sources/emacs/emacs/lisp/isearch.el,v retrieving revision 1.298 diff -c -r1.298 isearch.el *** lisp/isearch.el 9 Jul 2007 14:45:01 -0000 1.298 --- lisp/isearch.el 11 Jul 2007 22:50:17 -0000 *************** *** 164,169 **** --- 164,173 ---- (defvar isearch-mode-end-hook-quit nil "Non-nil while running `isearch-mode-end-hook' if user quit the search.") + (defvar isearch-message-function nil + "Function to call to display the search prompt. + If nil, use `isearch-message'.") + (defvar isearch-wrap-function nil "Function to call to wrap the search when search is failed. If nil, move point to the beginning of the buffer for a forward search, *************** *** 715,721 **** (null executing-kbd-macro)) (progn (if (not (input-pending-p)) ! (isearch-message)) (if (and isearch-slow-terminal-mode (not (or isearch-small-window (pos-visible-in-window-p)))) --- 725,733 ---- (null executing-kbd-macro)) (progn (if (not (input-pending-p)) ! (if isearch-message-function ! (funcall isearch-message-function) ! (isearch-message))) (if (and isearch-slow-terminal-mode (not (or isearch-small-window (pos-visible-in-window-p)))) *************** *** 2020,2026 **** (defun isearch-search () ;; Do the search with the current search string. ! (isearch-message nil t) (if (and (eq isearch-case-fold-search t) search-upper-case) (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string isearch-regexp))) --- 2035,2043 ---- (defun isearch-search () ;; Do the search with the current search string. ! (if isearch-message-function ! (funcall isearch-message-function nil t) ! (isearch-message nil t)) (if (and (eq isearch-case-fold-search t) search-upper-case) (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string isearch-regexp))) -- Juri Linkov http://www.jurta.org/emacs/