From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 11 Dec 2013 17:10:22 +0000 (+0100)
Subject: * vc/vc-git.el: Silence byte-compiler warnings.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~467
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0cd616a2d872e4ce6df868e25dc5d19eeaaa3064;p=emacs.git

* vc/vc-git.el: Silence byte-compiler warnings.
(vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored.
(log-edit-set-header): Declare.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85776c07a74..6479e197bf7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc/vc-git.el: Silence byte-compiler warnings.
+	(vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored.
+	(log-edit-set-header): Declare.
+
 2013-12-11  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.in (custom-deps, finder-data): Run output file names
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a14287f8cbd..51e035a9bc0 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -521,7 +521,7 @@ or an empty string if none."
 		  :help "Show the contents of the current stash"))
     map))
 
-(defun vc-git-dir-extra-headers (_dir)
+(defun vc-git-dir-extra-headers (dir)
   (let ((str (with-output-to-string
                (with-current-buffer standard-output
                  (vc-git--out-ok "symbolic-ref" "HEAD"))))
@@ -560,9 +560,9 @@ or an empty string if none."
 		    'face 'font-lock-variable-name-face)))
      "\n"
      ;; For now just a heading, key bindings can be added later for various bisect actions
-     (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root _dir)))
+     (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root dir)))
        (propertize  "Bisect     : in progress\n" 'face 'font-lock-warning-face))
-     (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root _dir)))
+     (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root dir)))
        (propertize  "Rebase     : in progress\n" 'face 'font-lock-warning-face))
      (if stash
        (concat
@@ -624,6 +624,7 @@ The car of the list is the current branch."
 (declare-function log-edit-mode "log-edit" ())
 (declare-function log-edit-toggle-header "log-edit" (header value))
 (declare-function log-edit-extract-headers "log-edit" (headers string))
+(declare-function log-edit-set-header "log-edit" (header value &optional toggle))
 
 (defun vc-git-log-edit-toggle-signoff ()
   "Toggle whether to add the \"Signed-off-by\" line at the end of