[PATCH 7/7] Remove byte-compiler warnings
From: Xavier Maillard <hidden>
Date: 2016-06-15 22:42:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
* emacs/git-blame.el: Do not load cl at run-time. Added several defvar to silent byte-compiler. Interactive form in git-reblame was not correct, fixed that. Signed-off-by: Xavier Maillard <redacted> --- contrib/emacs/git-blame.el | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
index 64ad50b..ce029ad 100644
--- a/contrib/emacs/git-blame.el
+++ b/contrib/emacs/git-blame.el@@ -77,7 +77,8 @@ ;; ;;; Code: -(require 'cl) ; to use `push', `pop' +(eval-when-compile + (require 'cl)) ; to use `push', `pop' (defun color-scale (l) (let* ((colors ())
@@ -127,11 +128,22 @@ (defvar git-blame-mode nil) (make-variable-buffer-local 'git-blame-mode) + +(defvar git-blame-current nil) +(make-variable-buffer-local 'git-blame-current) + +(defvar git-blame-file nil) +(make-variable-buffer-local 'git-blame-file) + +(defvar git-blame-colors nil) +(make-variable-buffer-local 'git-blame-colors) + (unless (assq 'git-blame-mode minor-mode-alist) (setq minor-mode-alist (cons (list 'git-blame-mode " blame") minor-mode-alist))) + ;;;###autoload (defun git-blame-mode (&optional arg) "Minor mode for displaying Git blame"
@@ -157,9 +169,9 @@ ;;;###autoload (defun git-reblame () "Recalculate all blame information in the current buffer" + (interactive) (unless git-blame-mode (error "git-blame is not active")) - (interactive) (git-blame-cleanup) (git-blame-run))
--
1.5.0