emacs: Check that lazy-lock-mode exists before using it.

[profile] / emacs

diff --git a/emacs b/emacs
index 88c181a..ee4839b 100644 (file)
--- a/emacs
+++ b/emacs
@@ -41,7 +41,7 @@
 (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))))
+     (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 (and (library-exists-p "quilt")
      (load "quilt"))
 
@@ -124,7 +124,7 @@
 
 ;; --- Other goodies ---
 
-(resize-minibuffer-mode 1)             ;Make minibuffer grow dynamically
+(trap (resize-minibuffer-mode 1))      ;Make minibuffer grow dynamically
 (auto-compression-mode 1)              ;Enable automatic compression
 (setq dabbrev-case-replace nil)                ;Retain case when completing
 (setq next-line-add-newlines nil)      ;Don't add weird newlines
@@ -317,6 +317,7 @@
       (append `(("\\.p[lm]$" . perl-mode)
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
+               ("\\.cs" . csharp-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"
@@ -433,7 +434,8 @@
 
 ;; --- Configure lazy fontification ---
 
-(setq font-lock-support-mode 'lazy-lock-mode)
+(and (fboundp 'lazy-lock-mode)
+     (setq font-lock-support-mode 'lazy-lock-mode))
 ; (setq lazy-lock-defer-contextually t)
 (setq lazy-lock-defer-time nil)
 (setq font-lock-maximum-decoration 3)