From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#29821: Ensure quick substitution only occurs at start of line Date: Tue, 02 Jan 2018 20:51:36 -0500 Message-ID: <87o9mbso9j.fsf@users.sourceforge.net> References: <87fu8272h6.fsf@gmail.com> <87shbqto33.fsf@users.sourceforge.net> <87wp11rqtr.fsf@users.sourceforge.net> <871sj96lgu.fsf@gmail.com> <87tvw4syi9.fsf@users.sourceforge.net> <87wp105ezz.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1514944222 27817 195.159.176.226 (3 Jan 2018 01:50:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Jan 2018 01:50:22 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.90 (gnu/linux) Cc: 29821@debbugs.gnu.org, Andreas Schwab To: Jay Kamat Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 03 02:50:17 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 1eWYC3-0006O6-Rk for geb-bug-gnu-emacs@m.gmane.org; Wed, 03 Jan 2018 02:50:12 +0100 Original-Received: from localhost ([::1]:34770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWYE1-00041d-54 for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jan 2018 20:52:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWYDv-00041E-7v for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 20:52:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWYDq-0007NV-Cc for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 20:52:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWYDq-0007NK-8G for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 20:52:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eWYDp-0007UL-Sp for bug-gnu-emacs@gnu.org; Tue, 02 Jan 2018 20:52:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 03 Jan 2018 01:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29821 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29821-submit@debbugs.gnu.org id=B29821.151494430728765 (code B ref 29821); Wed, 03 Jan 2018 01:52:01 +0000 Original-Received: (at 29821) by debbugs.gnu.org; 3 Jan 2018 01:51:47 +0000 Original-Received: from localhost ([127.0.0.1]:33638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWYDb-0007Tt-Fr for submit@debbugs.gnu.org; Tue, 02 Jan 2018 20:51:47 -0500 Original-Received: from mail-it0-f49.google.com ([209.85.214.49]:35003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWYDa-0007Tg-1w for 29821@debbugs.gnu.org; Tue, 02 Jan 2018 20:51:46 -0500 Original-Received: by mail-it0-f49.google.com with SMTP id f143so214910itb.0 for <29821@debbugs.gnu.org>; Tue, 02 Jan 2018 17:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=JlMfH6vEQ5AFDNnNg1P5SmiHGsTxKPTwgL0Zj+UvU4E=; b=TafijPCHFcaaYw0Aj+erzMGvvbdGuKQH02N3sOkwLQOBfLS/OV1lzoMSGRVjrmRxX0 hf6PkFM5II8jX6qw1T1SM4eMZKP6TmVAAVDqzrOsjkoUR1arMhJP7TAzrL2cYRoS3CKL t9uHyFxazafTYZzAm8LtbmN+JD2VTe3NzfGPHhGlfLl6UNhWC/zn4vC+2LgMqEPHqtjo Ld++dkZNajgaLYeoeBrqYmEuYGEpau+nmADJqhqpb0v/X50vW5UAkOYqoVHfUtie60ai XLSj5S7LwrEJWwl9VjkQRBX8HTTcZsYf/2l9lF2vrwGBEVDW+izFmo06tM9xohmGh1ap IQzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=JlMfH6vEQ5AFDNnNg1P5SmiHGsTxKPTwgL0Zj+UvU4E=; b=edgtk/lwb2jTOkOuDoeWPuFCIulbbfBCvOaV6xXeEDgxA/CxQjxzzLThohcoIoWrPI kCHNrWPNLO75HvOzbLzMXqBNKR78hHTtSDurHa6JSKLpZ1tqpzWC9hGzCM/6QHDeoZXu 8d/PRTWJRp1xymzQ/ab6Zk0iBDWZMYxOpdaUAiIvkPK4UqvKAF7gyZfLcJLbbSzbnPBq BZySfGr2IRmfCVHms9lE5o9D5JU3kW4mSbrRGfJObMR3BLiAcb/I9PJlMcxtaDs2hBLf /dw759YLar8vqMorVMMtYGfVwjiMd+HrA3GMy9hdrCSIjwq7tlCIhIEgX1BtBfsPiZGP +a7Q== X-Gm-Message-State: AKGB3mL8YDgOODc41S+HTTCFiAOWxeuya/7Kj7Fqe5XfrbhZa3EJj+ox N8MMXyRWjXLSM1/ODGpFE54= X-Google-Smtp-Source: ACJfBotbKWvpBbOxBK2Wxzp0XrQkMsa9Lr+STmxMu0IQTyLKNTDVGnSfFBMkyfyKSRDOCPXvYPo9EQ== X-Received: by 10.36.170.14 with SMTP id b14mr200409itf.13.1514944300262; Tue, 02 Jan 2018 17:51:40 -0800 (PST) Original-Received: from zebian ([45.2.119.34]) by smtp.googlemail.com with ESMTPSA id 1sm2965095ion.51.2018.01.02.17.51.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jan 2018 17:51:38 -0800 (PST) In-Reply-To: <87wp105ezz.fsf@gmail.com> (Jay Kamat's message of "Tue, 02 Jan 2018 09:48:00 -0800") 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:141734 Archived-At: Jay Kamat writes: > Noam Postavsky writes: > >> Couldn't you error here (if the line matches ^...^...^) instead of >> returning nil, and then avoid affecting the other substitution? >> (although I agree signaling an error in the other place is probably >> acceptable) > > I could be missing something, but I don't think this is that easy. In > the case of a failed search for something like '!!:s/a/b/', > `eshell-history-reference' previously returned the previous line, > unmodified. Oh, yes, I was confused by your docstring. By "if no match found" you meant when the line doesn't match ^foo^bar^ at all; I had somehow got the impression you meant that there was no match for "foo". > +(defun eshell-history-substitution (line) > + "Expand whole-line history substitutions by converting them to > +!!:s/a/b/ syntax. > +Returns nil if no match found." > + ;; `^string1^string2^' > + ;; Quick Substitution. Repeat the last command, replacing > + ;; STRING1 with STRING2. Equivalent to `!!:s/string1/string2/' > + (when (and (eshell-using-module 'eshell-pred) > + (string-match "^\\^\\([^^]+\\)\\^\\([^^]+\\)\\^?\\s-*$" > + line)) > + (let* ((reference (format "!!:s/%s/%s/" > + (match-string 1 line) > + (match-string 2 line))) > + (result (eshell-history-reference reference))) > + (unless (eq result reference) This eq test will always be nil, right? Because the only time it's t is when you pass something that's not a history reference, but the thing we passed is a history reference by construction. So this could be simplified to (when (and (eshell-using-module 'eshell-pred) (string-match "^\\^\\([^^]+\\)\\^\\([^^]+\\)\\^?\\s-*$" line)) (eshell-history-reference (format "!!:s/%s/%s/" (match-string 1 line) (match-string 2 line)))) That, plus rephrasing the docstring so the first sentence fits on one line (it should probably also mention ^foo^bar^ syntax), and I think the patch is good to go (for master).