From: James McCoy Date: Wed, 25 Feb 2015 20:48:33 +0000 (-0500) Subject: Move diff-hl-margin-side after diff-hl-margin-mode definition X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/5bfb31484ec30b3984bb87184a7dd3da5c8c5c81 Move diff-hl-margin-side after diff-hl-margin-mode definition This fixes a “Symbol's value as variable is void” error when loading diff-hl-margin.el. --- diff --git a/diff-hl-margin.el b/diff-hl-margin.el index 26fa7ad78..4f9999436 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))