From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#36034: [PATCH] Zsh extended_history shows up in comint input ring Date: Sun, 23 Jun 2019 18:53:54 +0200 Message-ID: References: <87woi6e58r.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="170701"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 36034@debbugs.gnu.org To: Matthew Bauer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jun 23 18:54:10 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hf5ko-000iF3-8P for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Jun 2019 18:54:10 +0200 Original-Received: from localhost ([::1]:45744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hf5km-0006v8-RS for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Jun 2019 12:54:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59940) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hf5kh-0006v2-EI for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 12:54:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hf5kg-000657-FA for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 12:54:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hf5kg-00064x-BB for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 12:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hf5kg-0003G5-81 for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Jun 2019 16:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36034 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 36034-submit@debbugs.gnu.org id=B36034.156130884012516 (code B ref 36034); Sun, 23 Jun 2019 16:54:02 +0000 Original-Received: (at 36034) by debbugs.gnu.org; 23 Jun 2019 16:54:00 +0000 Original-Received: from localhost ([127.0.0.1]:54366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hf5ke-0003Fo-CI for submit@debbugs.gnu.org; Sun, 23 Jun 2019 12:54:00 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:43560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hf5kc-0003Fa-3S for 36034@debbugs.gnu.org; Sun, 23 Jun 2019 12:53:58 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hf5kY-000882-TK; Sun, 23 Jun 2019 18:53:57 +0200 In-Reply-To: <87woi6e58r.fsf@gmail.com> (Matthew Bauer's message of "Fri, 31 May 2019 16:30:44 -0400") 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: 209.51.188.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:161131 Archived-At: Matthew Bauer writes: > The format of this line looks like this: > > : :; > > This patch just skips those timestamp to get the part. [...] > --- a/lisp/comint.el > +++ b/lisp/comint.el > @@ -976,7 +976,11 @@ See also `comint-input-ignoredups' and `comint-write-input-ring'." > (setq start > (if (re-search-backward comint-input-ring-separator > nil t) > - (match-end 0) > + (progn > + ;; Skip zsh extended_history stamps > + (re-search-forward ": [[:digit:]]+:[[:digit:]]+;" nil t) > + > + (match-end 0)) > (point-min))) > (setq history (buffer-substring start end)) > (goto-char start) I'm not that familiar with the comint/shell code... but this is done in the central comint code, so it would do this for all the modes that use comint? Couldn't that lead to problems in these other modes that aren't doing this timestamp thing? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no