diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/minibuffer.el | 1 | ||||
| -rw-r--r-- | lisp/org/org-macro.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/shell.el | 14 |
4 files changed, 11 insertions, 8 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 13da7f99a38..bc21f027b6e 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -3214,7 +3214,6 @@ See `read-file-name' for the meaning of the arguments." (unless val (error "No file name specified")) (if (and default-filename - (not (file-remote-p dir)) (string-equal val (if (consp insdef) (car insdef) insdef))) (setq val default-filename)) (setq val (substitute-in-file-name val)) diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el index b8d3373418d..1259430ae44 100644 --- a/lisp/org/org-macro.el +++ b/lisp/org/org-macro.el @@ -125,7 +125,7 @@ previous one, unless VALUE is nil. Return the updated list." "Collect macro definitions in current buffer and setup files. Return an alist containing all macro templates found." (let ((templates - `(("author" . ,(org-macro--find-keyword-value "AUTHOR")) + `(("author" . ,(org-macro--find-keyword-value "AUTHOR" t)) ("email" . ,(org-macro--find-keyword-value "EMAIL")) ("title" . ,(org-macro--find-keyword-value "TITLE" t)) ("date" . ,(org-macro--find-date))))) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 4464459695f..55f186b4712 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.5-57-g9bc3a2")) + (let ((org-git-version "release_9.5-59-g52e6f1")) org-git-version)) (provide 'org-version) diff --git a/lisp/shell.el b/lisp/shell.el index b575024e016..cb4afe6dea8 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -766,12 +766,16 @@ Make the shell buffer the current buffer, and return it. (called-interactively-p 'any) (null explicit-shell-file-name) (null (getenv "ESHELL"))) + ;; `expand-file-name' shall not add the MS Windows volume letter + ;; (Bug#49229). (setq-local explicit-shell-file-name - (file-local-name - (expand-file-name - (read-file-name "Remote shell path: " default-directory - shell-file-name t shell-file-name - #'file-remote-p))))) + (replace-regexp-in-string + "^[[:alpha:]]:" "" + (file-local-name + (expand-file-name + (read-file-name "Remote shell path: " default-directory + shell-file-name t shell-file-name + #'file-remote-p)))))) ;; Rain or shine, BUFFER must be current by now. (unless (comint-check-proc buffer) |