[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master fa74f2f 04/25: Merge pull request #80 from ryuslash/master
From: |
Dmitry Gutov |
Subject: |
[elpa] master fa74f2f 04/25: Merge pull request #80 from ryuslash/master |
Date: |
Sat, 8 Dec 2018 19:19:36 -0500 (EST) |
branch: master
commit fa74f2f513351464f01a133b145339014811d042
Merge: 0c8bf49 1f864d6
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #80 from ryuslash/master
Fix revert prompt
---
diff-hl.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff-hl.el b/diff-hl.el
index d60fce6..4f8d474 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -418,7 +418,7 @@ in the source file, or the last line of the hunk above it."
(recenter 1)))
(when diff-auto-refine-mode
(diff-refine-hunk))
- (unless (yes-or-no-p (format "Revert current hunk in %s?"
+ (unless (yes-or-no-p (format "Revert current hunk in %s? "
,(cl-caadr fileset)))
(error "Revert canceled"))
(let ((diff-advance-after-apply-hunk nil))
- [elpa] master updated (cd8bbda -> 7964c46), Dmitry Gutov, 2018/12/08
- [elpa] master 0c8bf49 02/25: New option: diff-hl-margin-symbols-alist, Dmitry Gutov, 2018/12/08
- [elpa] master 1f864d6 03/25: Fix revert prompt, Dmitry Gutov, 2018/12/08
- [elpa] master f8ce39d 01/25: Solve the "cloned indirect buffer" problem, Dmitry Gutov, 2018/12/08
- [elpa] master fa74f2f 04/25: Merge pull request #80 from ryuslash/master,
Dmitry Gutov <=
- [elpa] master 6a09f77 06/25: Merge pull request #81 from Wilfred/user_error_no_hunks, Dmitry Gutov, 2018/12/08
- [elpa] master 04c3b01 05/25: Use `user-error' when we can't proceed., Dmitry Gutov, 2018/12/08
- [elpa] master c476e40 07/25: Update the Requirements section, Dmitry Gutov, 2018/12/08
- [elpa] master 8dab389 09/25: Add separate set of faces for diff-hl-margin-mode, Dmitry Gutov, 2018/12/08
- [elpa] master 1d672dd 11/25: Clarify diff-hl-flydiff-mode docstring, Dmitry Gutov, 2018/12/08
- [elpa] master 3e9d264 08/25: Clean up diff-hl-dired process buffers, Dmitry Gutov, 2018/12/08
- [elpa] master 09b9354 12/25: Add a variable for the diff-hl-mode lighter, Dmitry Gutov, 2018/12/08
- [elpa] master bec9889 13/25: Define diff-hl-margin-unknown and diff-hl-margin-ignored, Dmitry Gutov, 2018/12/08
- [elpa] master f0b945a 14/25: Don't call vc-state unless the file exists, Dmitry Gutov, 2018/12/08
- [elpa] master ce93571 19/25: Add some FIXMEs related to #71, Dmitry Gutov, 2018/12/08