emacs: Use GIT and Quilt add-ons.

diff --git a/emacs b/emacs
index 28b3334..9c10d0a 100644 (file)
--- a/emacs
+++ b/emacs
@@ -34,10 +34,16 @@
 
 (setq load-path (cons "~/lib/emacs" load-path))
 
-(autoload 'cc-mode "cc-mode" nil t)
-(autoload 'rexx-mode "rexx-mode" nil t)
-(autoload 'cvs-update "pcl-cvs" nil t)
-(autoload 'debian-changelog-mode "debian-changelog-mode" nil t)
+(maybe-autoload 'cc-mode "cc-mode" nil t)
+(maybe-autoload 'rexx-mode "rexx-mode" nil t)
+(maybe-autoload 'cvs-update "pcl-cvs" nil t)
+(maybe-autoload 'debian-changelog-mode "debian-changelog-mode" nil t)
+(maybe-autoload 'git-status "git" nil t)
+(and (library-exists-p "vc-git")
+     (not (memq 'GIT vc-handled-backends))
+     (setq vc-handled-backends (append vc-handled-backends (list 'GIT))))
+(and (library-exists-p "quilt")
+     (load "quilt"))
 
 (trap
   (or (fboundp 'make-regexp)
@@ -319,6 +325,7 @@
                          "svk-commit[^/.]*\\.tmp" "\\|"
                          "gitci\\.[^/.]*" "\\|"
                          "cvs[^/.]\\{6\\}" "\\|"
+                         "quilt_header\.[^/.]\\{6\\}"
                          "\\)$")
                 . text-mode)
                ("\\.calc?$" . apcalc-mode)

diff --git a/setup b/setup
index f508812..b9adf91 100755 (executable)
--- a/setup
+++ b/setup
@@ -187,7 +187,11 @@ else
 fi
 
 echo "Installing Emacs packages..."
-for elib in make-regexp; do
+emacspkg="
+  make-regexp
+  git vc-git
+  quilt"
+for elib in $emacspkg; do
   $echon "  $elib:$echoc"
   if $false $emacs >/dev/null 2>&1 --no-site-file --batch --eval '
        (setq load-path (nconc load-path (list "~/lib/emacs")))