mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/diff-mode.el (diff-filename-drop-dir): Match backslashes.

Browse source
This commit is contained in:
Sean Whitton 2025-11-29 18:21:31 +00:00
parent 9f2b1c43c9
commit c499c2f67b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/diff-mode.el
View file

@ -1055,7 +1055,7 @@ them, instead."
(defvar diff-remembered-defdir nil) (defvar diff-remembered-defdir nil)
(defun diff-filename-drop-dir (file) (defun diff-filename-drop-dir (file)
(and (string-match "/" file) (substring file (match-end 0)))) (and (string-match "[/\\]" file) (substring file (match-end 0))))
(defun diff-merge-strings (ancestor from to) (defun diff-merge-strings (ancestor from to)
"Merge the diff between ANCESTOR and FROM into TO. "Merge the diff between ANCESTOR and FROM into TO.