;;; diff-hl-margin.el --- Highlight buffer changes on margins -*- lexical-binding: t -*-
-;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
(require 'diff-hl)
(require 'diff-hl-dired)
+(defvar diff-hl-margin-side)
+
(defvar diff-hl-margin-old-highlight-function nil)
(defgroup diff-hl-margin nil
"Highlight buffer changes on margin"
:group 'diff-hl)
-(defcustom diff-hl-margin-side 'left
- "Which margin to use for indicators."
- :type '(choice (const left)
- (const right))
- :set (lambda (var value)
- (let ((on diff-hl-margin-mode))
- (when on (diff-hl-margin-mode -1))
- (set-default var value)
- (when on (diff-hl-margin-mode 1)))))
-
;;;###autoload
(define-minor-mode diff-hl-margin-mode
"Toggle displaying `diff-hl-mode' highlights on the margin."
(dolist (win (get-buffer-window-list))
(set-window-buffer win (current-buffer))))
+(defcustom diff-hl-margin-side 'left
+ "Which margin to use for indicators."
+ :type '(choice (const left)
+ (const right))
+ :set (lambda (var value)
+ (let ((on diff-hl-margin-mode))
+ (when on (diff-hl-margin-mode -1))
+ (set-default var value)
+ (when on (diff-hl-margin-mode 1)))))
+
(defun diff-hl-margin-minor-mode-off ()
(diff-hl-margin-minor-mode -1))
(defvar diff-hl-margin-spec-cache
(cl-loop for (type . char) in '((insert . "+") (delete . "-")
- (change . "|") (unknown . "?"))
+ (change . "!") (unknown . "?")
+ (ignored . "i"))
nconc
(cl-loop for side in '(left right)
collect