;;; 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.5.3\r
;; Package-Requires: ((cl-lib "0.2"))\r
\r
;; This file is part of GNU Emacs.\r
'((default :inherit diff-header))\r
"Face used to highlight unregistered files.")\r
\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
:group 'diff-hl\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
(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