From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#15839: 24.3.50; `isearch-allow-scroll': be able to scroll point off screen temporarily Date: Thu, 29 Nov 2018 01:01:00 +0200 Organization: LINKOV.NET Message-ID: <87a7lsu7rn.fsf@mail.linkov.net> References: <51df60b6-e152-4989-a27e-70dadb9b7474@default> <8736rqgk6f.fsf@mail.linkov.net> <87y39gexdo.fsf@mail.linkov.net> <877egzmmyk.fsf@mail.linkov.net> <8af20443-841d-4211-99ae-269e042a9a33@default> <875zwidonq.fsf@mail.linkov.net> <178ca8ac-fb45-4cef-a48d-d916a60860be@default> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1543449137 21656 195.159.176.226 (28 Nov 2018 23:52:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Nov 2018 23:52:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 15839@debbugs.gnu.org To: Drew Adams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 29 00:52:12 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gS9cp-0005Wa-DD for geb-bug-gnu-emacs@m.gmane.org; Thu, 29 Nov 2018 00:52:11 +0100 Original-Received: from localhost ([::1]:50425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gS9ev-0005kG-SZ for geb-bug-gnu-emacs@m.gmane.org; Wed, 28 Nov 2018 18:54:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gS9ej-0005jz-Su for bug-gnu-emacs@gnu.org; Wed, 28 Nov 2018 18:54:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gS9ee-0005HD-C1 for bug-gnu-emacs@gnu.org; Wed, 28 Nov 2018 18:54:09 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gS9ec-0005Fy-MP for bug-gnu-emacs@gnu.org; Wed, 28 Nov 2018 18:54:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gS9ec-0003zY-EM for bug-gnu-emacs@gnu.org; Wed, 28 Nov 2018 18:54:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Nov 2018 23:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15839 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15839-submit@debbugs.gnu.org id=B15839.154344922615282 (code B ref 15839); Wed, 28 Nov 2018 23:54:02 +0000 Original-Received: (at 15839) by debbugs.gnu.org; 28 Nov 2018 23:53:46 +0000 Original-Received: from localhost ([127.0.0.1]:53904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gS9eL-0003yQ-L4 for submit@debbugs.gnu.org; Wed, 28 Nov 2018 18:53:45 -0500 Original-Received: from ostrich.birch.relay.mailchannels.net ([23.83.209.138]:30223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gS9eI-0003yH-Sb for 15839@debbugs.gnu.org; Wed, 28 Nov 2018 18:53:43 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 59C741231C0; Wed, 28 Nov 2018 23:53:41 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (unknown [100.96.19.74]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0DB20123A13; Wed, 28 Nov 2018 23:53:41 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Wed, 28 Nov 2018 23:53:41 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Glossy-Befitting: 3a71bc7e4ff5a721_1543449221193_1451276577 X-MC-Loop-Signature: 1543449221192:3536446828 X-MC-Ingress-Time: 1543449221192 Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a3.g.dreamhost.com (Postfix) with ESMTP id 473E680A2D; Wed, 28 Nov 2018 15:53:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=90p33M3VJsdN9g+7NuAwbRMaALk=; b= ny7u0FclTEL5ZLFWbmybQaBcZgi3nBTEH0/8VvjauGHFaIfiWRlIaniJhHe7ktSe yWLetFXeOSHbOmaxJdsXInzihg7VUJczTdVrkx16317F/4Q6vsfA0HzROGobq6D4 lHGIEVvlZrJ7AF+sxpectU+Ax1rJkN/AkdD1BHGCoYI= Original-Received: from mail.jurta.org (m91-129-107-242.cust.tele2.ee [91.129.107.242]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a3.g.dreamhost.com (Postfix) with ESMTPSA id CAE1980A22; Wed, 28 Nov 2018 15:53:38 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a3 In-Reply-To: <178ca8ac-fb45-4cef-a48d-d916a60860be@default> (Drew Adams's message of "Wed, 28 Nov 2018 07:15:11 -0800 (PST)") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedruddvvddgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhofhffjgfkfgggtgesmhdtreertdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrddutdejrddvgedvnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtjedrvdegvddprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegurhgvfidrrggurghmshesohhrrggtlhgvrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:152873 Archived-At: --=-=-= Content-Type: text/plain > But users should preferably not need to worry > about variable interactions. The doc for a given > variable should make clear just what it does, and > each variable should preferably have one behavior > (per value chosen). I agree that it's better to make it clear in the docstring. Fixed in a new patch below. > I'm guessing that nil `search-exit-option' does > not just have "the same effect". But (see above) > even if it does, that doesn't mean that option > `search-exit-option' has the same effect, because > setting it to non-nil, ONLY to NOT have the > effect of `unlimited' `isearch-allow-scroll', > would presumably also have some other effect > unrelated to allowing scrolling. I agree that `search-exit-option' is too confusing variable for such features. So we have to offload it from all unrelated features. As the first step, I moved the recently added shift-select feature from `search-exit-option' to its own clearly named customizable variable `isearch-allow-shift-select'. For the same reason, unlimited scrolling was moved to the new option `unlimited' of `isearch-allow-scroll'. Now finally everything looks right. Please try a new patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=isearch-allow-scroll-offscreen.2.patch diff --git a/lisp/isearch.el b/lisp/isearch.el index eb0b25f9b1..8c54ab92db 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -72,21 +72,11 @@ search-exit-option If t, random control and meta characters terminate the search and are then executed normally. If `edit', edit the search string instead of exiting. -If `move', extend the search string by motion commands -that have the `isearch-move' property on their symbols -equal to `enabled', or the shift-translated command is -not disabled by the value `disabled' of the same property. -If `shift-move', extend the search string by motion commands -while holding down the shift key. -Both `move' and `shift-move' extend the search string by yanking text -that ends at the new position after moving point in the current buffer. If `append', the characters which you type that are not interpreted by the incremental search are simply appended to the search string. If nil, run the command without exiting Isearch." :type '(choice (const :tag "Terminate incremental search" t) (const :tag "Edit the search string" edit) - (const :tag "Extend the search string by motion commands" move) - (const :tag "Extend the search string by shifted motion keys" shift-move) (const :tag "Append control characters to the search string" append) (const :tag "Don't terminate incremental search" nil)) :version "27.1") @@ -2747,8 +2737,12 @@ isearch-allow-scroll "Whether scrolling is allowed during incremental search. If non-nil, scrolling commands can be used in Isearch mode. However, the current match will never scroll offscreen. +If `unlimited', the current match can scroll offscreen. +You may want to enable `lazy-highlight-buffer' as well. If nil, scrolling commands will first cancel Isearch mode." - :type 'boolean + :type '(choice (const :tag "Disable scrolling" nil) + (const :tag "Allow scrolling within screen" t) + (const :tag "Allow scrolling offscreen" unlimited)) :group 'isearch) (defcustom isearch-allow-prefix t @@ -2812,6 +2806,21 @@ isearch-back-into-window (defvar isearch-pre-scroll-point nil) (defvar isearch-pre-move-point nil) +(defcustom isearch-allow-shift-select nil + "Whether motion is allowed to select text during incremental search. +If t, extend the search string by motion commands while holding down +the shift key. The search string is extended by yanking text that +ends at the new position after moving point in the current buffer. +If `move', extend the search string without the shift key pressed +by motion commands that have the `isearch-move' property on their +symbols equal to `enabled', or the shift-translated command is +not disabled by the value `disabled' of the same property." + :type '(choice (const :tag "Disable shift selection" nil) + (const :tag "Shifted motion keys extend the search string" t) + (const :tag "Motion keys extend the search string" move)) + :group 'isearch + :version "27.1") + (defun isearch-pre-command-hook () "Decide whether to exit Isearch mode before executing the command. Don't exit Isearch if the key sequence that invoked this command @@ -2845,7 +2854,7 @@ isearch-pre-command-hook (symbolp this-command) (or (eq (get this-command 'isearch-scroll) t) (eq (get this-command 'scroll-command) t)))) - (when isearch-allow-scroll + (when (and isearch-allow-scroll (not (eq isearch-allow-scroll 'unlimited))) (setq isearch-pre-scroll-point (point)))) ;; A mouse click on the isearch message starts editing the search string. ((and (eq (car-safe main-event) 'down-mouse-1) @@ -2854,13 +2863,13 @@ isearch-pre-command-hook (read-event) (setq this-command 'isearch-edit-string)) ;; Don't terminate the search for motion commands. - ((or (and (eq search-exit-option 'move) + ((or (and (eq isearch-allow-shift-select 'move) (symbolp this-command) (or (eq (get this-command 'isearch-move) 'enabled) (and (not (eq (get this-command 'isearch-move) 'disabled)) (stringp (nth 1 (interactive-form this-command))) (string-match-p "^^" (nth 1 (interactive-form this-command)))))) - (and (eq search-exit-option 'shift-move) + (and isearch-allow-shift-select (not (eq isearch-allow-shift-select 'move)) this-command-keys-shift-translated)) (setq this-command-keys-shift-translated nil) (setq isearch-pre-move-point (point))) @@ -2883,7 +2892,7 @@ isearch-post-command-hook (goto-char isearch-pre-scroll-point))) (setq isearch-pre-scroll-point nil) (isearch-update)) - ((memq search-exit-option '(move shift-move)) + (isearch-allow-shift-select (when (and isearch-pre-move-point (not (eq isearch-pre-move-point (point)))) (let ((string (buffer-substring-no-properties --=-=-=--