indent: Include indent settings.

[profile] / emacs

diff --git a/emacs b/emacs
index 2b74aef..0053381 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)
@@ -139,9 +145,8 @@
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq Info-fontify-maximum-menu-size 60000)
 (setq ispell-dictionary "british"
-      flyspell-default-dictionary "british")
-(setq browse-url-browser-function 'browse-url-mozilla
-      browse-url-mozilla-program "firefox")
+      flyspell-default-dictionary "british"
+      ispell-silently-savep t)
 (trap
   (require 'uniquify)
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
@@ -158,12 +163,17 @@
 
 ;;;----- W3 and URL fetching stuff ------------------------------------------
 
-(let ((proxy (mdw-config 'proxy)))
+(let ((proxy (mdw-config 'http-proxy)))
   (setq url-proxy-services
        `(("http" . ,proxy)
          ("ftp" . ,proxy)
          ("gopher" . ,proxy))))
 (setq url-cookie-untrusted-urls '("."))
+         
+(setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-mozilla-program "firefox")
+
+(setq w3m-default-display-inline-images t)
 
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
@@ -319,6 +329,7 @@
                          "svk-commit[^/.]*\\.tmp" "\\|"
                          "gitci\\.[^/.]*" "\\|"
                          "cvs[^/.]\\{6\\}" "\\|"
+                         "quilt_header\.[^/.]\\{6\\}"
                          "\\)$")
                 . text-mode)
                ("\\.calc?$" . apcalc-mode)
@@ -335,6 +346,10 @@
                 . mdwmail-mode))
              auto-mode-alist))
 
+(setq interpreter-mode-alist
+      (append `(("runlisp" . lisp-mode))
+             interpreter-mode-alist))
+
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
 
@@ -483,7 +498,7 @@
 
 ;; --- Make the shell mode aware of my prompt ---
 
-(setq shell-prompt-pattern "^[^]#$%>»\n]*[]#$%>»] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
              "[Pp]assword\\|pass phrase\\):\\s *\\'"))