diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-08-25 08:00:04 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-08-25 08:00:04 +0000 |
commit | a33e2f1dc15a805b4bda06e50d11f41c2e5aa2fb (patch) | |
tree | da2eccc172b85cd61d1e24b422e3699fc5d13806 /dev-util | |
parent | Remove older version. (diff) | |
download | gentoo-2-a33e2f1dc15a805b4bda06e50d11f41c2e5aa2fb.tar.gz gentoo-2-a33e2f1dc15a805b4bda06e50d11f41c2e5aa2fb.tar.bz2 gentoo-2-a33e2f1dc15a805b4bda06e50d11f41c2e5aa2fb.zip |
Add comment in Emacs site-init file wrt bug 235393. Remove unused file.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/git/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/git/files/71git-gentoo.el | 7 | ||||
-rw-r--r-- | dev-util/git/files/72git-gentoo.el | 13 |
3 files changed, 13 insertions, 13 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 6a301a520f9b..aa2267998bdc 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/git # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.291 2008/08/24 02:19:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.292 2008/08/25 08:00:03 ulm Exp $ + + 25 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -files/71git-gentoo.el, + files/72git-gentoo.el: + Add comment in Emacs site-init file wrt bug 235393. Remove unused file. *git-1.6.0 (24 Aug 2008) diff --git a/dev-util/git/files/71git-gentoo.el b/dev-util/git/files/71git-gentoo.el deleted file mode 100644 index ded21c29e3dc..000000000000 --- a/dev-util/git/files/71git-gentoo.el +++ /dev/null @@ -1,7 +0,0 @@ -;;; git site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(add-to-list 'vc-handled-backends 'GIT) -(autoload 'git-status "git" "Entry point into git-status mode." t) -(autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t) diff --git a/dev-util/git/files/72git-gentoo.el b/dev-util/git/files/72git-gentoo.el index 19413619c870..5d58165fa598 100644 --- a/dev-util/git/files/72git-gentoo.el +++ b/dev-util/git/files/72git-gentoo.el @@ -1,8 +1,11 @@ + ;;; dev-util/git site-lisp configuration +;; GNU Emacs >=22.2 already includes vc-git.el. +;; Enable the following only if Emacs has no GIT support. (unless (fboundp 'vc-git-registered) - (add-to-list 'load-path "@SITELISP@") - (add-to-list 'vc-handled-backends 'GIT) - (autoload 'git-status "git" "Entry point into git-status mode." t) - (autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t)) + (add-to-list 'load-path "@SITELISP@") + (add-to-list 'vc-handled-backends 'GIT) + (autoload 'git-status "git" "Entry point into git-status mode." t) + (autoload 'git-blame-mode "git-blame" + "Minor mode for incremental blame for Git." t)) |