From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#13348: 24.3.50; `C-s', `C-r', `RET' in `minibuffer-local-isearch-map' Date: Tue, 07 May 2013 11:49:18 +0300 Organization: JURTA Message-ID: <87a9o7duul.fsf@mail.jurta.org> References: <7482F5EE927A40CFB51A25788D9E5305@us.oracle.com> <87a9spu7t7.fsf@mail.jurta.org> <1D518890DCE34548A5A5BEC043950771@us.oracle.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1367917812 19305 80.91.229.3 (7 May 2013 09:10:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 May 2013 09:10:12 +0000 (UTC) Cc: 13348@debbugs.gnu.org To: "Drew Adams" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 07 11:10:08 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UZduR-0004ch-2z for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 May 2013 11:10:07 +0200 Original-Received: from localhost ([::1]:54338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZduQ-00008n-Hd for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 May 2013 05:10:06 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZduM-00006y-Fk for bug-gnu-emacs@gnu.org; Tue, 07 May 2013 05:10:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZduL-00013B-2h for bug-gnu-emacs@gnu.org; Tue, 07 May 2013 05:10:02 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZduK-000135-Vn for bug-gnu-emacs@gnu.org; Tue, 07 May 2013 05:10:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UZdvK-0007UD-0q for bug-gnu-emacs@gnu.org; Tue, 07 May 2013 05:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 May 2013 09:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 13348 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 13348-submit@debbugs.gnu.org id=B13348.136791780228500 (code B ref 13348); Tue, 07 May 2013 09:11:01 +0000 Original-Received: (at 13348) by debbugs.gnu.org; 7 May 2013 09:10:02 +0000 Original-Received: from localhost ([127.0.0.1]:60598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UZduL-0007PP-3A for submit@debbugs.gnu.org; Tue, 07 May 2013 05:10:01 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:36927 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UZduJ-0007PC-LF for 13348@debbugs.gnu.org; Tue, 07 May 2013 05:10:00 -0400 Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 976B2258B9E93C; Tue, 7 May 2013 02:08:56 -0700 (PDT) In-Reply-To: <1D518890DCE34548A5A5BEC043950771@us.oracle.com> (Drew Adams's message of "Thu, 3 Jan 2013 16:42:04 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:74046 Archived-At: >> Is this what you expected? > >> (defun isearch-forward-exit-minibuffer () >> + "Resume isearching forward." >> >> (defun isearch-reverse-exit-minibuffer () >> + "Resume isearching backward." > > Sure, but why not say also what the searching is resuming _from_? It would be more helpful if you wrote these docstrings as you want instead of explaining your wishes. Now I added your additions below. Also I noticed that `isearch-nonincremental-exit-minibuffer' has no effect, so I removed it instead of adding a docstring to this unused function: === modified file 'lisp/isearch.el' --- lisp/isearch.el 2013-05-01 08:10:12 +0000 +++ lisp/isearch.el 2013-05-07 08:48:31 +0000 @@ -528,7 +528,7 @@ (defvar isearch-mode-map (defvar minibuffer-local-isearch-map (let ((map (make-sparse-keymap))) (set-keymap-parent map minibuffer-local-map) - (define-key map "\r" 'isearch-nonincremental-exit-minibuffer) + (define-key map "\r" 'exit-minibuffer) (define-key map "\M-\t" 'isearch-complete-edit) (define-key map "\C-s" 'isearch-forward-exit-minibuffer) (define-key map "\C-r" 'isearch-reverse-exit-minibuffer) @@ -1273,7 +1274,6 @@ (defun isearch-edit-string () The following additional command keys are active while editing. \\ \\[exit-minibuffer] to resume incremental searching with the edited string. -\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. \\[isearch-forward-exit-minibuffer] to resume isearching forward. \\[isearch-reverse-exit-minibuffer] to resume isearching backward. \\[isearch-complete-edit] to complete the search string using the search ring." @@ -1303,17 +1303,14 @@ (defun isearch-edit-string () (mapconcat 'isearch-text-char-description isearch-new-string ""))))) -(defun isearch-nonincremental-exit-minibuffer () - (interactive) - (setq isearch-nonincremental t) - (exit-minibuffer)) - (defun isearch-forward-exit-minibuffer () + "Resume isearching forward from the minibuffer that edits the search string." (interactive) (setq isearch-new-forward t) (exit-minibuffer)) (defun isearch-reverse-exit-minibuffer () + "Resume isearching backward from the minibuffer that edits the search string." (interactive) (setq isearch-new-forward nil) (exit-minibuffer))