[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 8dab389 09/25: Add separate set of faces for diff-hl-margi
From: |
Dmitry Gutov |
Subject: |
[elpa] master 8dab389 09/25: Add separate set of faces for diff-hl-margin-mode |
Date: |
Sat, 8 Dec 2018 19:19:37 -0500 (EST) |
branch: master
commit 8dab38972461869d2b72088dc8473cca3ad650de
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Add separate set of faces for diff-hl-margin-mode
Closes #87.
---
diff-hl-margin.el | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index e6d0b94..4ca2a7e 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -1,6 +1,6 @@
;;; diff-hl-margin.el --- Highlight buffer changes on margins -*-
lexical-binding: t -*-
-;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -44,6 +44,18 @@
"Highlight buffer changes on margin"
:group 'diff-hl)
+(defface diff-hl-margin-insert
+ '((default :inherit diff-hl-insert))
+ "Face used to highlight inserted lines on the margin.")
+
+(defface diff-hl-margin-delete
+ '((default :inherit diff-hl-delete))
+ "Face used to highlight deleted lines on the margin.")
+
+(defface diff-hl-margin-change
+ '((default :inherit diff-hl-change))
+ "Face used to highlight changed lines on the margin.")
+
(defcustom diff-hl-margin-symbols-alist
'((insert . "+") (delete . "-") (change . "!")
(unknown . "?") (ignored . "i"))
@@ -121,7 +133,7 @@ You probably shouldn't use this function directly."
" " 'display
`((margin ,(intern (format "%s-margin" side)))
,(propertize char 'face
- (intern (format "diff-hl-%s" type)))))))))
+ (intern (format "diff-hl-margin-%s"
type)))))))))
(defun diff-hl-highlight-on-margin (ovl type _shape)
(let ((spec (cdr (assoc (cons type diff-hl-side)
- [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, 2018/12/08
- [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 <=
- [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
- [elpa] master 9ef21e4 15/25: Merge pull request #93 from Wilfred/handle_file_move, Dmitry Gutov, 2018/12/08
- [elpa] master 027b0d2 20/25: diff-hl-revert-hunk: Emphasize the hunk, Dmitry Gutov, 2018/12/08
- [elpa] master 069a925 24/25: Bump the version, Dmitry Gutov, 2018/12/08
- [elpa] master a626bf8 23/25: Merge pull request #109 from edkolev/revert-hunk-in-narrowed-buffer, Dmitry Gutov, 2018/12/08