fix with-library; bind hippie-expand

[emacs.git] / .emacs

diff --git a/.emacs b/.emacs
index 1d32ab9481b6e163d7571f47ede47c723f81eee4..dc3703b69102530f9489c72a23e986e48ec8e395 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -65,9 +65,17 @@
 (add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/other")
 ;;(add-to-list 'Tex-style-path '"~/lib/emacs_el/auctex/")
 
-(setq tinyprocmail--procmail-version "v3.22")
-(add-hook 'tinyprocmail--load-hook 'tinyprocmail-install)
-(require 'tinyprocmail)
+;; From http://www.emacswiki.org/emacs/LoadingLispFiles
+;; execute conditional code when loading libraries
+(defmacro with-library (symbol &rest body)
+  `(when (require ,symbol nil t)
+     ,@body))
+(put 'with-library 'lisp-indent-function 1)
+
+;; load tinyprocmail
+(with-library 'tinyprocmail
+  (setq tinyprocmail--procmail-version "v3.22")
+  (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install))
 
 (require 'vcl-mode)
 
@@ -539,6 +547,8 @@ Argument DESCRIPTION MIME description."
 ; ess configuration
 (load "ess_remote_eval")
 (load "ess_configuration")
+; procmailmode configuration
+(load "procmail_mode")
 
 (load "mode-line-cleaner")
 
@@ -577,3 +587,4 @@ Argument DESCRIPTION MIME description."
         (assq-delete-all 'my-keys-minor-mode minor-mode-map-alist)
         (add-to-list 'minor-mode-map-alist mykeys))))
 (ad-activate 'load)
+(global-set-key "\M- " 'hippie-expand)