Subject: [PATCH] Only use nbutlast when we actually want to modify the original list
From: Steven Allen <[email-masked]>
To: [email-masked]
Cc: Michael Albinus <[email-masked]>
Date: Mon, 9 Nov 2020 15:53:31 -0800
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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