GNU bug report logs - #44542
[PATCH] Only use nbutlast when we actually want to modify the original list

Previous Next

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

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

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

From: Steven Allen <steven <at> stebalien.com>
To: bug-gnu-emacs <at> gnu.org
Cc: Michael Albinus <michael.albinus <at> gmx.de>
Subject: [PATCH] Only use nbutlast when we actually want to modify the
 original list
Date: Mon,  9 Nov 2020 15:53:31 -0800

* lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-byte-array-to-string): Don't
modify the byte array.
lisp/net/tramp-integration.el (tramp-eshell-directory-change): Don't
modify the underlying exec-path.
---
 lisp/net/tramp-gvfs.el        | 2 +-
 lisp/net/tramp-integration.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 8f8e628ab9d..86fb45a43b7 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -876,7 +876,7 @@ Return nil for null BYTE-ARRAY."
 		  byte-array (car byte-array))))
     (dbus-byte-array-to-string
      (if (and (consp byte-array) (zerop (car (last byte-array))))
-	 (nbutlast byte-array) byte-array))))
+	 (butlast byte-array) byte-array))))
 
 (defun tramp-gvfs-stringify-dbus-message (message)
   "Convert a D-Bus MESSAGE into readable UTF8 strings, used for traces."
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index f712600072e..7e4a9bf05e5 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -132,7 +132,7 @@ been set up by `rfn-eshadow-setup-minibuffer'."
   ;; Use `path-separator' as it does eshell.
   (setq eshell-path-env
 	(mapconcat
-	 #'identity (nbutlast (tramp-compat-exec-path)) path-separator)))
+	 #'identity (butlast (tramp-compat-exec-path)) path-separator)))
 
 (with-eval-after-load 'esh-util
   (add-hook 'eshell-mode-hook
-- 
2.29.2

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

From: Michael Albinus <michael.albinus <at> gmx.de>
To: Steven Allen <steven <at> stebalien.com>
Cc: 44542-done <at> debbugs.gnu.org
Subject: Re: bug#44542: [PATCH] Only use nbutlast when we actually want to
 modify the original list
Date: Tue, 10 Nov 2020 10:08:18 +0100

Steven Allen <steven <at> stebalien.com> writes:

Hi Steven,

> * lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-byte-array-to-string): Don't
> modify the byte array.
> lisp/net/tramp-integration.el (tramp-eshell-directory-change): Don't
> modify the underlying exec-path.

Thanks for the patch, it fixes a thinko I've introduced recently. Also
reported as bug#44539.

I've applied the patch to master, closing both bugs.

Best regards, Michael.

Previous Next

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