mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* vc/vc-git.el: Silence byte-compiler warnings.

Browse source 
(vc-git-dir-extra-headers): Rename arg _dir which is no longer ignored.
(log-edit-set-header): Declare.
This commit is contained in:
Juanma Barranquero 2013-12-11 18:10:22 +01:00
parent 3ef8e0d150
commit 0cd616a2d8
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

7
lisp/vc/vc-git.el
View file

@ -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