[Emacs-diffs] trunk r115468: * vc/vc-git.el: Silence byte-compiler warnings.

[Juanma Barranquero]

------------------------------------------------------------
revno: 115468
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 18:10:22 +0100
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-git.el              vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-11 17:05:28 +0000
+++ b/lisp/ChangeLog    2013-12-11 17:10:22 +0000
@@ -1,3 +1,9 @@
+2013-12-11  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (custom-deps, finder-data): Run output file names

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2013-12-02 22:13:51 +0000
+++ b/lisp/vc/vc-git.el 2013-12-11 17:10:22 +0000
@@ -521,7 +521,7 @@
                  :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 @@
                    '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 @@
 (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