;;; diff-hl.el --- Highlight uncommitted changes -*- lexical-binding: t -*-\r
\r
-;; Copyright (C) 2012-2013 Free Software Foundation, Inc.\r
+;; Copyright (C) 2012-2014 Free Software Foundation, Inc.\r
\r
;; Author: Dmitry Gutov <dgutov@yandex.ru>\r
;; URL: https://github.com/dgutov/diff-hl\r
;; Keywords: vc, diff\r
-;; Version: 1.5.1\r
+;; Version: 1.6.0\r
;; Package-Requires: ((cl-lib "0.2"))\r
\r
;; This file is part of GNU Emacs.\r
\r
;;; Code:\r
\r
+(require 'fringe)\r
(require 'diff-mode)\r
(require 'vc)\r
(require 'vc-dir)\r
"Face used to highlight changed lines."\r
:group 'diff-hl)\r
\r
-(defface diff-hl-unknown\r
- '((default :inherit diff-header))\r
- "Face used to highlight unregistered files.")\r
+(defcustom diff-hl-command-prefix (kbd "C-x v")\r
+ "The prefix for all `diff-hl' commands."\r
+ :group 'diff-hl\r
+ :type 'string)\r
\r
(defcustom diff-hl-draw-borders t\r
"Non-nil to draw borders around fringe indicators."\r
(const diff-hl-fringe-bmp-from-type)\r
function))\r
\r
+(defcustom diff-hl-fringe-face-function 'diff-hl-fringe-face-from-type\r
+ "Function to choose the fringe face for a given change type\r
+ and position within a hunk. Should accept two arguments."\r
+ :group 'diff-hl\r
+ :type 'function)\r
+\r
(defvar diff-hl-reference-revision nil\r
"Revision to diff against. nil means the most recent one.")\r
\r
(numberp text-scale-mode-amount))\r
(expt text-scale-mode-step text-scale-mode-amount)\r
1))\r
- (spacing (or (default-value 'line-spacing) 0))\r
- (h (round (+ (* (frame-char-height) scale)\r
- (if (floatp spacing)\r
- (* (frame-char-height) spacing)\r
- spacing))))\r
+ (spacing (or (and (display-graphic-p) (default-value 'line-spacing)) 0))\r
+ (h (+ (ceiling (* (frame-char-height) scale))\r
+ (if (floatp spacing)\r
+ (truncate (* (frame-char-height) spacing))\r
+ spacing)))\r
(w (frame-parameter nil 'left-fringe))\r
(middle (make-vector h (expt 2 (1- w))))\r
(ones (1- (expt 2 w)))\r
(aset insert-bmp (1+ middle-pos) delete-row)\r
(aset insert-bmp (1- w2) 0)\r
(define-fringe-bitmap 'diff-hl-bmp-insert insert-bmp w2 w2)\r
- (define-fringe-bitmap 'diff-hl-bmp-change (make-vector\r
- w2 (* 3 middle-bit)) w2 w2))))\r
+ )))\r
\r
(defun diff-hl-maybe-define-bitmaps ()\r
(when (window-system) ;; No fringes in the console.\r
(let* ((key (list type pos diff-hl-fringe-bmp-function))\r
(val (gethash key diff-hl-spec-cache)))\r
(unless val\r
- (let* ((face-sym (intern (format "diff-hl-%s" type)))\r
+ (let* ((face-sym (funcall diff-hl-fringe-face-function type pos))\r
(bmp-sym (funcall diff-hl-fringe-bmp-function type pos)))\r
(setq val (propertize " " 'display `((left-fringe ,bmp-sym ,face-sym))))\r
(puthash key val diff-hl-spec-cache)))\r
val))\r
\r
-(defun diff-hl-fringe-bmp-from-pos (type pos)\r
+(defun diff-hl-fringe-face-from-type (type _pos)\r
+ (intern (format "diff-hl-%s" type)))\r
+\r
+(defun diff-hl-fringe-bmp-from-pos (_type pos)\r
(intern (format "diff-hl-bmp-%s" pos)))\r
\r
-(defun diff-hl-fringe-bmp-from-type (type pos)\r
- (if (eq type 'unknown)\r
- 'question-mark\r
- (intern (format "diff-hl-bmp-%s" type))))\r
+(defun diff-hl-fringe-bmp-from-type (type _pos)\r
+ (cl-case type\r
+ (unknown 'question-mark)\r
+ (change 'exclamation-mark)\r
+ (ignored 'filled-square)\r
+ (t (intern (format "diff-hl-bmp-%s" type)))))\r
+\r
+(defvar vc-svn-diff-switches)\r
\r
(defmacro diff-hl-with-diff-switches (body)\r
`(let ((vc-git-diff-switches nil)\r
(interactive)\r
(diff-hl-next-hunk t))\r
\r
+(define-prefix-command 'diff-hl-command-map)\r
+\r
+(let ((map diff-hl-command-map))\r
+ (define-key map "n" 'diff-hl-revert-hunk)\r
+ (define-key map "[" 'diff-hl-previous-hunk)\r
+ (define-key map "]" 'diff-hl-next-hunk)\r
+ map)\r
+\r
;;;###autoload\r
(define-minor-mode diff-hl-mode\r
"Toggle VC diff highlighting."\r
:lighter "" :keymap `(([remap vc-diff] . diff-hl-diff-goto-hunk)\r
- (,(kbd "C-x v n") . diff-hl-revert-hunk)\r
- (,(kbd "C-x v [") . diff-hl-previous-hunk)\r
- (,(kbd "C-x v ]") . diff-hl-next-hunk))\r
+ (,diff-hl-command-prefix . diff-hl-command-map))\r
(if diff-hl-mode\r
(progn\r
(diff-hl-maybe-define-bitmaps)\r
(add-hook 'after-save-hook 'diff-hl-update nil t)\r
(add-hook 'after-change-functions 'diff-hl-edit nil t)\r
- (if vc-mode\r
- (diff-hl-update)\r
- (add-hook 'find-file-hook 'diff-hl-update t t))\r
+ (add-hook (if vc-mode\r
+ ;; Defer until the end of this hook, so that its\r
+ ;; elements can modify the update behavior.\r
+ 'diff-hl-mode-on-hook\r
+ ;; If we're only opening the file now,\r
+ ;; `vc-find-file-hook' likely hasn't run yet, so\r
+ ;; let's wait until the state information is\r
+ ;; saved, in order not to fetch it twice.\r
+ 'find-file-hook)\r
+ 'diff-hl-update t t)\r
(add-hook 'vc-checkin-hook 'diff-hl-update nil t)\r
(add-hook 'after-revert-hook 'diff-hl-update nil t)\r
+ ;; Magit does call `auto-revert-handler', but it usually\r
+ ;; doesn't do much, because `buffer-stale--default-function'\r
+ ;; doesn't care about changed VC state.\r
+ ;; https://github.com/magit/magit/issues/603\r
+ (add-hook 'magit-revert-buffer-hook 'diff-hl-update nil t)\r
(add-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))\r
(remove-hook 'after-save-hook 'diff-hl-update t)\r
(remove-hook 'after-change-functions 'diff-hl-edit t)\r
(remove-hook 'find-file-hook 'diff-hl-update t)\r
(remove-hook 'vc-checkin-hook 'diff-hl-update t)\r
(remove-hook 'after-revert-hook 'diff-hl-update t)\r
+ (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)\r
(remove-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps t)\r
(diff-hl-remove-overlays)))\r
\r
(when (characterp event)\r
(push (cons (string event) binding) smart-keys))))\r
map)))\r
- (scan diff-hl-mode-map)\r
- (smartrep-define-key diff-hl-mode-map "C-x v" smart-keys))))\r
+ (scan diff-hl-command-map)\r
+ (smartrep-define-key diff-hl-mode-map diff-hl-command-prefix smart-keys))))\r
\r
(defun diff-hl-dir-update ()\r
(dolist (pair (if (vc-dir-marked-files)\r