Only use nbutlast when we actually want to modify the original list

* 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.

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 8f8e628ab9d9f1cc04358b95612d7b20a6429ff2..86fb45a43b755e24f1e7a4954b6e1e0e58da11d6 100644 (file)
--- 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 f712600072ea64ec3e0445b9101c483ebbfc8639..7e4a9bf05e53b7d9914047a2336b437c0852e0ac 100644 (file)
--- 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