diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-11 08:04:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-11 08:04:57 -0700 |
| commit | 98f10f47a7da964d75a23f6912b35b6ef472b123 (patch) | |
| tree | 330ea5d7ec33eda7412ce86097ac1e87464d8058 /lisp/vc | |
| parent | cc8c114b168e52dfb5a6091372c8a057b81c2f95 (diff) | |
| parent | ac066088780d473f883e2afe8d178e2bf2c964fd (diff) | |
| download | emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.tar.gz emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.tar.bz2 emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.zip | |
Merge from origin/emacs-28
ac06608878 (origin/emacs-28) Release ERC 5.4
a1a589d07b * etc/ERC-NEWS: Announce ERC's addition to GNU ELPA.
6c7947f0a1 * etc/ERC-NEWS: Fix outline level for the recent additions.
c480b68644 Add ERC entries for 'customize-package-emacs-version-alist'
4afff515c8 Expand the full file name
36a485a1af Obsolete XEmacs compat convention in 'erc-button-press-but...
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-git.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index eca8d547a90..35c0838dd6f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -242,15 +242,14 @@ included in the completions." ;;;###autoload (load "vc-git" nil t) ;;;###autoload (vc-git-registered file)))) +;; Good example of file name that needs this: "test[56].xx". (defun vc-git--literal-pathspec (file) "Prepend :(literal) path magic to FILE." - ;; Good example of file name that needs this: "test[56].xx". (when file - (let ((lname (file-local-name file))) - ;; Expand abbreviated file names. - (when (file-name-absolute-p lname) - (setq lname (expand-file-name lname))) - (concat ":(literal)" lname)))) + ;; Expand abbreviated file names. + (when (file-name-absolute-p file) + (setq file (expand-file-name file))) + (concat ":(literal)" (file-local-name file)))) (defun vc-git--literal-pathspecs (files) "Prepend :(literal) path magic to FILES." |