GNU bug report logs - #52119
29.0.50; Blank lines in vc-git-stash-pop with fido-vertical-mode

Previous Next

Package: emacs;

Reported by: Manuel Uberti <manuel.uberti <at> inventati.org>

Date: Fri, 26 Nov 2021 07:52:01 UTC

Severity: normal

Found in version 29.0.50

Fixed in version 29.1

Done: Dmitry Gutov <dgutov <at> yandex.ru>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 52119 in the body.
You can then email your comments to 52119 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to bug-gnu-emacs <at> gnu.org:
bug#52119; Package emacs. (Fri, 26 Nov 2021 07:52:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Manuel Uberti <manuel.uberti <at> inventati.org>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs <at> gnu.org. (Fri, 26 Nov 2021 07:52:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Manuel Uberti <manuel.uberti <at> inventati.org>
To: bug-gnu-emacs <at> gnu.org
Subject: 29.0.50; Blank lines in vc-git-stash-pop with fido-vertical-mode
Date: Fri, 26 Nov 2021 08:51:08 +0100
[Message part 1 (text/plain, inline)]
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

In GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.18, cairo 
version 1.16.0)
 of 2021-11-26 built on hathaway
Repository revision: 62d7ddb57c3db8f1e5cb20c6d82566b644faaa8c
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12009000
System Description: Ubuntu 20.04 LTS

Configured using:
 'configure --with-harfbuzz --with-native-compilation'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES
NATIVE_COMP NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF
TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM GTK3 ZLIB

Important settings:
  value of $LC_MESSAGES: en_GB.UTF-8
  value of $LC_MONETARY: it_IT.UTF-8
  value of $LC_NUMERIC: it_IT.UTF-8
  value of $LC_TIME: it_IT.UTF-8
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix

Major mode: VC dir

Minor modes in effect:
  fido-vertical-mode: t
  icomplete-vertical-mode: t
  icomplete-mode: t
  fido-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  buffer-read-only: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message mailcap yank-media rmc puny
dired dired-loaddefs rfc822 mml mml-sec epa derived epg rfc6068
epg-config gnus-util rmail rmail-loaddefs auth-source eieio eieio-core
eieio-loaddefs password-cache json map text-property-search time-date
mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils
mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr
mail-utils vc-dir ewoc vc-mtn vc-hg vc-git diff-mode easy-mmode vc-bzr
vc-src vc-sccs vc-svn vc-cvs vc-rcs vc vc-dispatcher project cus-start
comp comp-cstr warnings rx cl-seq cl-macs cl-extra seq gv subr-x
byte-opt bytecomp byte-compile cconv cus-load icomplete help-mode
cl-loaddefs cl-lib iso-transl tooltip eldoc paren electric uniquify
ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode lisp-mode prog-mode register
page tab-bar menu-bar rfn-eshadow isearch easymenu timer select
scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors
frame minibuffer cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button
loaddefs faces cus-face macroexp files window text-properties overlay
sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo
move-toolbar gtk x-toolkit x multi-tty make-network-process
native-compile emacs)

Memory information:
((conses 16 118096 10168)
 (symbols 48 10430 1)
 (strings 32 29841 2616)
 (string-bytes 1 942631)
 (vectors 16 20331)
 (vector-slots 8 342268 14584)
 (floats 8 42 379)
 (intervals 56 356 0)
 (buffers 992 13))

-- 
Manuel Uberti
www.manueluberti.eu
[Screenshot from 2021-11-26 08-48-09.png (image/png, attachment)]

Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#52119; Package emacs. (Fri, 26 Nov 2021 07:54:01 GMT) Full text and rfc822 format available.

Message #8 received at 52119 <at> debbugs.gnu.org (full text, mbox):

From: Manuel Uberti <manuel.uberti <at> inventati.org>
To: 52119 <at> debbugs.gnu.org
Subject: Re: 29.0.50; Blank lines in vc-git-stash-pop with fido-vertical-mode
Date: Fri, 26 Nov 2021 08:53:17 +0100
FTR, the same happens with vc-git-stash-delete.

-- 
Manuel Uberti
www.manueluberti.eu




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#52119; Package emacs. (Fri, 26 Nov 2021 12:41:02 GMT) Full text and rfc822 format available.

Message #11 received at 52119 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Manuel Uberti <manuel.uberti <at> inventati.org>, 52119 <at> debbugs.gnu.org
Subject: Re: 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
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")




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#52119; Package emacs. (Fri, 26 Nov 2021 12:49:01 GMT) Full text and rfc822 format available.

Message #14 received at 52119 <at> debbugs.gnu.org (full text, mbox):

From: Manuel Uberti <manuel.uberti <at> inventati.org>
To: Dmitry Gutov <dgutov <at> yandex.ru>, 52119 <at> debbugs.gnu.org
Subject: Re: bug#52119: 29.0.50; Blank lines in vc-git-stash-pop with
 fido-vertical-mode
Date: Fri, 26 Nov 2021 13:48:20 +0100
[Message part 1 (text/plain, inline)]
On 26/11/21 13:40, Dmitry Gutov wrote:
> 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")

Yes, see attached screenshot.

Thanks a lot.

-- 
Manuel Uberti
www.manueluberti.eu
[Screenshot from 2021-11-26 13-47-57.png (image/png, attachment)]

Reply sent to Dmitry Gutov <dgutov <at> yandex.ru>:
You have taken responsibility. (Fri, 26 Nov 2021 13:05:01 GMT) Full text and rfc822 format available.

Notification sent to Manuel Uberti <manuel.uberti <at> inventati.org>:
bug acknowledged by developer. (Fri, 26 Nov 2021 13:05:02 GMT) Full text and rfc822 format available.

Message #19 received at 52119-done <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Manuel Uberti <manuel.uberti <at> inventati.org>, 52119-done <at> debbugs.gnu.org
Subject: Re: bug#52119: 29.0.50; Blank lines in vc-git-stash-pop with
 fido-vertical-mode
Date: Fri, 26 Nov 2021 16:04:04 +0300
Version: 29.1

On 26.11.2021 15:48, Manuel Uberti via Bug reports for GNU Emacs, the 
Swiss army knife of text editors wrote:
> Yes, see attached screenshot.
> 
> Thanks a lot.

Pushed, thanks for checking.




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 25 Dec 2021 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 84 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.