bug#60083: 29.0.60; eshell-elecslash when in the root directory of a remote host

[montag451 via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]

Le dimanche 18 décembre 2022 à 12:04 -0800, Jim Porter a écrit :
> On 12/18/2022 2:34 AM, Eli Zaretskii wrote:
> > > Date: Thu, 15 Dec 2022 00:46:50 +0100
> > > From:  montag451 via "Bug reports for GNU Emacs,
> > >   the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
> > > 
> > > While testing the new eshell module 'eshell-elecslash' I found a
> > > bug
> > > when the default-directory is the root of a remote host. To
> > > reproduce
> > > the problem type the following in a eshell buffer (replacing
> > > "method"
> > > and "host" by appropriate values):
> > > 
> > > $ cd /method:host:/
> > > $ cd / <--- here the "/" should be replaced by "/method:host:/"
> > > but
> > > instead nothing happen
> > > 
> > > I've attached a patch to this email which fixes this issue.
> > 
> > Jim, are you looking into this issue?
> 
> Thanks. I missed the original message. The patch looks good to me, 
> although it compiles with the following warning:
> 
>    In eshell-electric-forward-slash:
>    ../../lisp/eshell/em-elecslash.el:98:18: Warning: Unused lexical 
> variable `localname'
> 
> Looking through the code, I think we can just remove that variable.
> 
> Since this is a small change, and fixes a corner case in a new
> feature, 
> I think it would make sense to go on the release branch, though I'll 
> defer to you on this, Eli. The fact that the new code (with the
> removal 
> of 'localname') is a bit simpler helps too.

Thanks for looking into this. I've attached to this email a new patch
which fixes the compilation warning.

[-- Attachment #2: eshell-elecslash.patch --]
[-- Type: text/x-patch, Size: 1571 bytes --]

diff --git a/lisp/eshell/em-elecslash.el b/lisp/eshell/em-elecslash.el
index 091acb9a86..0ce3a4cc96 100644
--- a/lisp/eshell/em-elecslash.el
+++ b/lisp/eshell/em-elecslash.el
@@ -74,8 +74,9 @@ eshell-electric-forward-slash
           (command (save-excursion
                      (eshell-bol)
                      (skip-syntax-forward " ")
-                     (thing-at-point 'sexp))))
-      (if (and (file-remote-p default-directory)
+                     (thing-at-point 'sexp)))
+          (prefix (file-remote-p default-directory)))
+      (if (and prefix
                ;; We can't formally parse the input.  But if there is
                ;; one of these operators behind us, then looking at
                ;; the first command would not be sensible.  So be
@@ -93,14 +94,9 @@ eshell-electric-forward-slash
 			         (or eshell-prefer-lisp-functions
 				     (not (eshell-search-path command))))))))
 	  (let ((map (make-sparse-keymap))
-	        (start (if tilde-before (1- (point)) (point)))
-                (localname
-                 (tramp-file-name-localname
-                  (tramp-dissect-file-name default-directory))))
+	        (start (if tilde-before (1- (point)) (point))))
 	    (when tilde-before (delete-char -1))
-	    (insert
-             (substring default-directory 0
-                        (string-search localname default-directory)))
+	    (insert prefix)
 	    (unless tilde-before (insert "/"))
 	    ;; Typing a second slash undoes the insertion, for when
 	    ;; you really do want to type a local absolute file name.