From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#52119: 29.0.50; Blank lines in vc-git-stash-pop with fido-vertical-mode Date: Fri, 26 Nov 2021 15:40:10 +0300 Message-ID: <3e62c885-b9aa-c8ea-541c-9e9fca6da740@yandex.ru> References: <8f8cf7c9-1b15-5d4b-add3-05559fad16e2@inventati.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8602"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 To: Manuel Uberti , 52119@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 26 13:42:03 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqaYE-00025K-MC for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 26 Nov 2021 13:42:02 +0100 Original-Received: from localhost ([::1]:43432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqaYD-0000Yz-I3 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 26 Nov 2021 07:42:01 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqaXY-0000WK-FB for bug-gnu-emacs@gnu.org; Fri, 26 Nov 2021 07:41:20 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqaXG-0007GI-Co for bug-gnu-emacs@gnu.org; Fri, 26 Nov 2021 07:41:19 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqaXG-0002GB-BV for bug-gnu-emacs@gnu.org; Fri, 26 Nov 2021 07:41:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Nov 2021 12:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52119 X-GNU-PR-Package: emacs Original-Received: via spool by 52119-submit@debbugs.gnu.org id=B52119.16379304538664 (code B ref 52119); Fri, 26 Nov 2021 12:41:02 +0000 Original-Received: (at 52119) by debbugs.gnu.org; 26 Nov 2021 12:40:53 +0000 Original-Received: from localhost ([127.0.0.1]:58899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqaX6-0002Ff-Ux for submit@debbugs.gnu.org; Fri, 26 Nov 2021 07:40:53 -0500 Original-Received: from mail-lf1-f42.google.com ([209.85.167.42]:37494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqaX2-0002FO-Lz for 52119@debbugs.gnu.org; Fri, 26 Nov 2021 07:40:51 -0500 Original-Received: by mail-lf1-f42.google.com with SMTP id c32so24043326lfv.4 for <52119@debbugs.gnu.org>; Fri, 26 Nov 2021 04:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=6sOS0cGObpRczoz6res1hU9smLi7GGgwac9oeaFmtpM=; b=o00gI69SRZI6+XNJ4mdxmGkQ0ZnR3KmYb7Rh+dt0lrlzx1ybGPoijlXGEoBZwTsLeQ 48yQf9vygrA3aU3AxC8nrEEr2Ap1jtt5DoHG2bb9CCsGpIZyBg+PhFIm/A1AR45Wz0U4 BHxiXH9lIkAWmScJhJ177UsWxBAHNBIyNJ/W/TbPH8FlkSO/LamgiEi5HHBVJ0ps0RM7 sWPgJUeMKzIXTKUARPH7NHaUyPBQvEdSE7q6GbU75OHxZHudOQix+ybkZFSikOlSPQEo 6q201YsffJ2ja1zC+5+m2lE8DGL2rbDv6NsqsK0l45Pvv1ELCXP4C13IxKuUtMWIf3ts 6aYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6sOS0cGObpRczoz6res1hU9smLi7GGgwac9oeaFmtpM=; b=CJQ/aqsV1JAe0mQ6f6nMYKEFofaPdPotQIf7UFGHI+qpWv1SFXe8I4ZSmEgQo1SefE CUc+AELK2Lyy6mKNClsT4/HIG6Phd4jQFasfXH1wPjWPaPOJ6b1QX+3P8NiC5Th4Yjad 2gynttUhVuV/1KXV8/2YEHWh4VkfOpcKsomqKUCNUG0crBrFADUBaFphk0mZyVX0JkSQ 5sG+oEYbIfmo+HJWTsTxanpKfLQhmIZ/9o1sI30m512PZ2XszZ9+VP5n8HHXNbhkKKcG SiZ6pucr8lwC8PkUufEvemMjM3PT/1RGMt5SyIsn5yvXPV7baOcbEQuXxqlBe+ztYPhh vEDw== X-Gm-Message-State: AOAM531rdiadkHQ6VDsZxbvaZbqzm06oaI2SZkfa9mEpsenh25x7RmVh hnt2IzE+Tz3yYWWdntLp1l+9NqzmTnVUJg== X-Google-Smtp-Source: ABdhPJwuin3TEM9m3zPX+l7N53Tl5pc0IH4svJLeCfXNESy8n5XSi02IU/u+g56vKGAU/nDjC5NQ9g== X-Received: by 2002:a05:6512:2033:: with SMTP id s19mr30039160lfs.290.1637930442483; Fri, 26 Nov 2021 04:40:42 -0800 (PST) Original-Received: from [192.168.0.103] ([5.18.158.28]) by smtp.googlemail.com with ESMTPSA id f17sm495186lfl.117.2021.11.26.04.40.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Nov 2021 04:40:42 -0800 (PST) In-Reply-To: <8f8cf7c9-1b15-5d4b-add3-05559fad16e2@inventati.org> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:220867 Archived-At: On 26.11.2021 10:51, Manuel Uberti via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > This is what I did from emacs -Q: > > - M-x fido-vertical-mode > - C-x p p and I picked a project where I had previously stashed a change > with vc-git-stash > - hit v for VC-Dir > - M-x vc-git-stash-pop > - See attached screenshot Hi! Does this help? diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3f89fad235..24c4535ed1 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1685,7 +1685,7 @@ vc-git-stash-read (let ((stash (completing-read prompt (split-string - (or (vc-git--run-command-string nil "stash" "list") "") "\n") + (or (vc-git--run-command-string nil "stash" "list") "") "\n" t) nil :require-match nil 'vc-git-stash-read-history))) (if (string-equal stash "") (user-error "Not a stash")