Merge remote-tracking branch 'origin/master'

[gnu-emacs-elpa] / diff-hl.el

diff --git a/diff-hl.el b/diff-hl.el
index df2e34dfb878511d4cca6872525e12486a970b8b..056d300ca766828212c4ec0bd0e88355ba3001ed 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -1,19 +1,21 @@
 ;;; diff-hl.el --- Highlight uncommitted changes -*- lexical-binding: t -*-\r
 \r
+;; Copyright (C) 2012-2013  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.4.6\r
+;; Version:  1.5.1\r
 ;; Package-Requires: ((cl-lib "0.2"))\r
 \r
-;; This file is not part of GNU Emacs.\r
+;; This file is part of GNU Emacs.\r
 \r
-;; This file is free software: you can redistribute it and/or modify\r
+;; GNU Emacs is free software: you can redistribute it and/or modify\r
 ;; it under the terms of the GNU General Public License as published by\r
 ;; the Free Software Foundation, either version 3 of the License, or\r
 ;; (at your option) any later version.\r
 \r
-;; This file is distributed in the hope that it will be useful,\r
+;; GNU Emacs is distributed in the hope that it will be useful,\r
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
 ;; GNU General Public License for more details.\r
@@ -23,8 +25,9 @@
 \r
 ;;; Commentary:\r
 \r
-;; `diff-hl-mode' highlights uncommitted changes on the left fringe of the\r
-;; window, allows you to jump between the hunks and revert them selectively.\r
+;; `diff-hl-mode' highlights uncommitted changes on the left side of\r
+;; the window (using the fringe, by default), allows you to jump\r
+;; between the hunks and revert them selectively.\r
 \r
 ;; Provided commands:\r
 ;;\r
@@ -58,7 +61,7 @@
   (require 'face-remap))\r
 \r
 (defgroup diff-hl nil\r
-  "VC diff fringe highlighting"\r
+  "VC diff highlighting on the side of a window"\r
   :group 'vc)\r
 \r
 (defface diff-hl-insert\r
@@ -164,14 +167,16 @@
         (puthash key val diff-hl-spec-cache)))\r
     val))\r
 \r
-(defun diff-hl-fringe-bmp-from-pos (type pos)\r
+(defun diff-hl-fringe-bmp-from-pos (_type pos)\r
   (intern (format "diff-hl-bmp-%s" pos)))\r
 \r
-(defun diff-hl-fringe-bmp-from-type (type pos)\r
+(defun diff-hl-fringe-bmp-from-type (type _pos)\r
   (if (eq type 'unknown)\r
       'question-mark\r
     (intern (format "diff-hl-bmp-%s" type))))\r
 \r
+(defvar vc-svn-diff-switches)\r
+\r
 (defmacro diff-hl-with-diff-switches (body)\r
   `(let ((vc-git-diff-switches nil)\r
          (vc-hg-diff-switches nil)\r
@@ -398,7 +403,7 @@ in the source file, or the last line of the hunk above it."
 \r
 ;;;###autoload\r
 (define-minor-mode diff-hl-mode\r
-  "Toggle VC diff fringe highlighting."\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