X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=e863475b20b2b42400e8f1720504cbc6ac11e88d;hb=a960985e01cbae3937cad57212c9660032c20c21;hp=2ab8315cfcc03cba59a72e60420dc46a471e7205;hpb=137d83557df6920c343049a590177ffdba90dd0f;p=emacs.git

diff --git a/.emacs b/.emacs
index 2ab8315..e863475 100644
--- a/.emacs
+++ b/.emacs
@@ -59,29 +59,12 @@
 (fset 'perl-mode 'cperl-mode)
 ;;(load-file "cperl-mode.el")
 (add-to-list 'load-path '"~/lib/emacs_el/configuration/")
-(add-to-list 'load-path '"~/lib/emacs_el/")
-;; this is the tiny-tools module from https://github.com/jaalto/project--emacs-tiny-tools.git
-(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/tiny")
-(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/other")
-;;(add-to-list 'Tex-style-path '"~/lib/emacs_el/auctex/")
-
-;; 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 'don-configuration)
 
 (require 'vcl-mode)
 
 (require 'tex-site)
 ;;(require 'psvn)
-(require 'cperl-mode)
 ;;(require 'ecasound)
 ;;(require 'emacs-wiki)
 (require 'bibtex)
@@ -104,18 +87,14 @@
 			      (lambda () (html-mode) (auto-fill-mode)))
 			    auto-mode-alist))
 
-;; Use c-mode for perl .xs files
-(add-to-list 'auto-mode-alist '("\\.xs\\'" . c-mode))
-(add-to-list 'auto-mode-alist '("\\.\\([pP][Llm]\\|al\\)\\'" . cperl-mode))
-(add-to-list 'interpreter-mode-alist '("perl" . cperl-mode))
-(add-to-list 'interpreter-mode-alist '("perl5" . cperl-mode))
-(add-to-list 'interpreter-mode-alist '("miniperl" . cperl-mode))
 
 ; use markdown mode for mdwn files
 (add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.md$" . markdown-mode))
 
 
-
+;; tramp configuration
+(setq tramp-use-ssh-controlmaster-options nil)
 
 ; mail configuration
 (add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . message-mode))
@@ -165,9 +144,6 @@ Argument DESCRIPTION MIME description."
 (global-unset-key "\M-g")
 (global-set-key "\M-g" 'goto-line)
 
-;;(autoload 'perl-mode "cperl-mode"
-;;  "alternate mode for editing Perl programs" t)
-
 ;; self-insert-command hack.
 ;;   Without this, "if<SP>" expands to
 ;;   if ( -!-) {
@@ -175,20 +151,6 @@ Argument DESCRIPTION MIME description."
 ;;   which really should be,
 ;;   if (-!-) {
 ;;   }
-(setq cperl-hairy t
-      cperl-indent-level 4
-      cperl-auto-newline nil
-      cperl-auto-newline-after-colon nil
-      cperl-continued-statement-offset 4
-      cperl-brace-offset -1
-      cperl-continued-brace-offset 0
-      cperl-label-offset -4
-      cperl-highlight-variables-indiscriminately t
-      cperl-electric-lbrace-space nil
-      cperl-indent-parens-as-block nil
-      cperl-close-paren-offset -1
-      cperl-tab-always-indent t)
-;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
 
 
 
@@ -587,3 +549,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)