Signed-off-by: Xavier Maillard <redacted>
---
contrib/emacs/vc-git.el | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el
index 4cab845..748cb60 100644
--- a/contrib/emacs/vc-git.el
+++ b/contrib/emacs/vc-git.el
@@ -32,8 +32,8 @@
;; - more customisable variables
(eval-when-compile
- (require 'cl)
- (require 'vc))
+ (require 'vc)
+ (require 'cl))
;; Add it automatically
(add-to-list 'vc-handled-backends 'GIT)
@@ -49,14 +49,14 @@
:group 'vc-git)
(defcustom vc-git-author-name nil
-"*Author name to use in git. If nil, we check for environment variables
-GIT_AUTHOR_NAME or `user_full_name'."
+"*Author name to use in git. If nil, we check for environment variable
+GIT_AUTHOR_NAME or `user-full-name'."
:type '(choice string (const nil))
:group 'vc-git)
(defcustom vc-git-author-email nil
-"*Author email to use in git. If nil, we check for environment variables
-GIT_AUTHOR_ADDRESS and if still nil, `user_mail_address'."
+"*Author email to use in git. If nil, we check for environment variable
+GIT_AUTHOR_ADDRESS and if still nil, `user-mail-address'."
:type '(choice string (const nil))
:group 'vc-git)
--
1.5.0