branch: master
commit eb92f0e99c0de4d51b80d307fdb92e0533ff9e74
Merge: d188525 5bfb314
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Merge pull request #39 from jamessan/diff-hl-margin-load-error
Move diff-hl-margin-side after diff-hl-margin-mode definition
---
diff-hl-margin.el | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index 26fa7ad..4f99994 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -44,16 +44,6 @@
"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."
@@ -96,6 +86,16 @@ You probably shouldn't use this function directly."
(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))
