From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Drew Adams" Newsgroups: gmane.emacs.bugs Subject: bug#12253: Restore window start position Date: Wed, 16 Jan 2013 08:57:18 -0800 Message-ID: References: <878vd7vqji.fsf@mail.jurta.org> <50348568.5060401@gmx.at><87haru8rxr.fsf@mail.jurta.org> <5035EE75.9090809@gmx.at><877gsp9sl2.fsf@mail.jurta.org> <50374D30.7090401@gmx.at><8762874wyk.fsf@mail.jurta.org> <5038D5CA.5000502@gmx.at> <87r4qun7u1.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_001D_01CDF3C7.7D4A1160" X-Trace: ger.gmane.org 1358355459 28468 80.91.229.3 (16 Jan 2013 16:57:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Jan 2013 16:57:39 +0000 (UTC) Cc: 12253@debbugs.gnu.org To: "'Juri Linkov'" , "'martin rudalics'" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 16 17:57:55 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 1TvWJA-0003nF-Dn for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jan 2013 17:57:48 +0100 Original-Received: from localhost ([::1]:59915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWIu-0007C3-3I for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Jan 2013 11:57:32 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:49713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWIr-0007BX-Hb for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2013 11:57:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWIo-0007ME-DI for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2013 11:57:28 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWIo-0007MA-7N for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2013 11:57:26 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TvWJN-0006kY-VO for bug-gnu-emacs@gnu.org; Wed, 16 Jan 2013 11:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Drew Adams" Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Jan 2013 16:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12253 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12253-submit@debbugs.gnu.org id=B12253.135835548025939 (code B ref 12253); Wed, 16 Jan 2013 16:58:01 +0000 Original-Received: (at 12253) by debbugs.gnu.org; 16 Jan 2013 16:58:00 +0000 Original-Received: from localhost ([127.0.0.1]:35503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TvWJL-0006kK-Us for submit@debbugs.gnu.org; Wed, 16 Jan 2013 11:58:00 -0500 Original-Received: from aserp1040.oracle.com ([141.146.126.69]:30941) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TvWJK-0006kB-21 for 12253@debbugs.gnu.org; Wed, 16 Jan 2013 11:57:59 -0500 Original-Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0GGvKDM007390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Jan 2013 16:57:20 GMT Original-Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0GGvJYK021626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Jan 2013 16:57:19 GMT Original-Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0GGvJAR013111; Wed, 16 Jan 2013 10:57:19 -0600 Original-Received: from dradamslap1 (/130.35.178.8) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 16 Jan 2013 08:57:18 -0800 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <87r4qun7u1.fsf@mail.jurta.org> Thread-Index: Ac2C+0nK9NpFW8R+Ts2vfezQ83sDyRxDxSgw X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-Source-IP: acsinet21.oracle.com [141.146.126.237] 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:69871 Archived-At: This is a multi-part message in MIME format. ------=_NextPart_000_001D_01CDF3C7.7D4A1160 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit The attached patch seems to fix the Isearch problem generally, restoring the original position of point within the window. ------=_NextPart_000_001D_01CDF3C7.7D4A1160 Content-Type: application/octet-stream; name="isearch-2011-05-16.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="isearch-2011-05-16.patch" diff -cw isearch.el isearch-patched-2011-05-16.el=0A= *** isearch.el Mon May 16 11:38:22 2011=0A= --- isearch-patched-2011-05-16.el Mon May 16 14:21:04 2011=0A= ***************=0A= *** 1060,1065 ****=0A= --- 1060,1080 ----=0A= =0A= (defvar minibuffer-history-symbol) ;; from external package gmhist.el=0A= =0A= + (defun isearch-fail-pos ()=0A= + "Position of first mismatch in search string, or its length if none."=0A= + (let ((cmds isearch-cmds)=0A= + succ-msg)=0A= + (if (and isearch-success (not isearch-error))=0A= + (length isearch-message)=0A= + (while (or (not (isearch-success-state (car cmds)))=0A= + (isearch-error-state (car cmds)))=0A= + (pop cmds))=0A= + (setq succ-msg (and cmds (isearch-message-state (car cmds))))=0A= + (if (and (stringp succ-msg) (< (length succ-msg) (length = isearch-message))=0A= + (equal succ-msg (substring isearch-message 0 (length = succ-msg))))=0A= + (length succ-msg)=0A= + 0))))=0A= + =0A= (defun isearch-edit-string ()=0A= "Edit the search string in the minibuffer.=0A= The following additional command keys are active while editing.=0A= ***************=0A= *** 1139,1145 ****=0A= (setq isearch-new-string=0A= (read-from-minibuffer=0A= (isearch-message-prefix nil nil = isearch-nonincremental)=0A= ! isearch-string=0A= minibuffer-local-isearch-map nil=0A= (if isearch-regexp=0A= (cons 'regexp-search-ring=0A= --- 1154,1160 ----=0A= (setq isearch-new-string=0A= (read-from-minibuffer=0A= (isearch-message-prefix nil nil = isearch-nonincremental)=0A= ! (cons isearch-string (1+ (isearch-fail-pos)))=0A= minibuffer-local-isearch-map nil=0A= (if isearch-regexp=0A= (cons 'regexp-search-ring=0A= =0A= Diff finished. Mon May 16 14:23:06 2011=0A= ------=_NextPart_000_001D_01CDF3C7.7D4A1160--