From 91c0bcd5c5688d4774a32e8b9bdb7e0e8b83a410 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 3 Sep 2021 13:04:41 -0700 Subject: [PATCH] commit-patch-buffer.el: Fix buffers not getting reverted after committing to git Two issues caused detection of buffers from patch filenames to fail: 1. git uses a/some/file where cvs used some/file. 2. (find-buffer-visiting) doesn't seem to work with relative paths. Closes #14 --- commit-patch-buffer.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/commit-patch-buffer.el b/commit-patch-buffer.el index a156cc9..e5470d9 100644 --- a/commit-patch-buffer.el +++ b/commit-patch-buffer.el @@ -91,7 +91,10 @@ one." (log-buffer-name (if amend "*amend*" "*commit*")) (f patch-files) visiting-buffers) (while (car f) - (let ((buf (find-buffer-visiting (car f)))) + (let* ((default-directory directory) + (buf (or + (find-buffer-visiting (expand-file-name (car f))) + (find-buffer-visiting (expand-file-name (diff-filename-drop-dir (car f))))))) (when buf (with-current-buffer buf (vc-buffer-sync)) (add-to-list 'visiting-buffers buf))) -- 2.51.2