diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 18:50:20 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 18:50:20 +0800 |
| commit | 0fef2018445b257bf26814e6659bc2ff5b270d77 (patch) | |
| tree | 2310ce1fd8781a6203ec56e2f985f6adfcc2278d /lisp/eshell/em-dirs.el | |
| parent | 3a8546615a38337dc991f6546ade63a372edc2ca (diff) | |
| parent | 49f76dcc17055e60569b6096e8ea3c9961ebbf63 (diff) | |
| download | emacs-0fef2018445b257bf26814e6659bc2ff5b270d77.tar.gz | |
Merge branch 'athena/unstable' into athena/bookworm-backports
Diffstat (limited to 'lisp/eshell/em-dirs.el')
| -rw-r--r-- | lisp/eshell/em-dirs.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index cf90a8bb230..07063afc286 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -262,6 +262,7 @@ Thus, this does not include the current directory.") (defun eshell-parse-user-reference () "An argument beginning with ~ is a filename to be expanded." (when (and (not eshell-current-argument) + (not eshell-current-quoted) (eq (char-after) ?~)) ;; Apply this modifier fairly early so it happens before things ;; like glob expansion. @@ -316,7 +317,7 @@ Thus, this does not include the current directory.") (`(boundaries . ,suffix) `(boundaries 0 . ,(string-search "/" suffix)))))))))) -(defun eshell/pwd (&rest _args) +(defun eshell/pwd () "Change output from `pwd' to be cleaner." (let* ((path default-directory) (len (length path))) |