X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.emacs;h=636088c75f089d85ac9480a27f15fa54df64ff63;hp=753b167cd5113805a5081578656b874a1fb79349;hb=a680bf3a19887f7b3f3d595d40198d8390eae152;hpb=b7ba0f1d7c4c138136498cb928456aedffcc6248

diff --git a/.emacs b/.emacs
index 753b167..636088c 100644
--- a/.emacs
+++ b/.emacs
@@ -1,17 +1,20 @@
 (custom-set-variables
-  ;; custom-set-variables was added by Custom -- don't edit or cut/paste it!
+  ;; custom-set-variables was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
  '(bibtex-user-optional-fields (quote (("annote" "Personal annotation (ignored)") ("abstract" "") ("pmid" "") ("doi" ""))))
- '(calendar-latitude [33 57 north] t)
- '(calendar-longitude [117 24 west] t)
+ '(calendar-latitude [33 57 north])
+ '(calendar-longitude [117 24 west])
  '(case-fold-search t)
  '(confirm-kill-emacs (quote y-or-n-p))
  '(cperl-lazy-help-time nil)
  '(debian-changelog-mailing-address "don@debian.org")
  '(display-time t)
  '(display-time-24hr-format t)
- '(display-time-mode t nil (time))
- '(global-auto-revert-mode t nil (autorevert))
+ '(display-time-day-and-date t)
+ '(display-time-mode t)
+ '(global-auto-revert-mode t)
  '(global-font-lock-mode t nil (font-lock))
  '(iswitchb-prompt-newbuffer nil)
  '(mail-user-agent (quote sendmail-user-agent))
@@ -30,17 +33,19 @@
  '(sentence-end "[.?!][]\"')]*\\($\\|	\\| \\)[ 	
 ]*")
  '(sentence-end-double-space nil)
- '(show-paren-mode t nil (paren))
+ '(show-paren-mode t)
  '(tool-bar-mode nil nil (tool-bar))
  '(user-mail-address "don@donarmstrong.com"))
 (fset 'perl-mode 'cperl-mode)
 ;;(load-file "cperl-mode.el")
-(add-to-list 'load-path '"~/emacs_el/")
+(add-to-list 'load-path '"~/lib/emacs_el/")
+;;(add-to-list 'Tex-style-path '"~/lib/emacs_el/auctex/")
 
 (require 'tex-site)
 (require 'psvn)
 (require 'cperl-mode)
 ;;(require 'ecasound)
+;;(require 'emacs-wiki)
 (require 'bibtex)
 (require 'post)
 
@@ -105,12 +110,6 @@
 ;; (add-to-list 'auto-mode-alist '("\\.php?\\'" . php-mode))
 ;; (add-to-list 'auto-mode-alist '("\\.php4?\\'" . php-mode))
 
-(custom-set-faces
-  ;; custom-set-faces was added by Custom -- don't edit or cut/paste it!
-  ;; Your init file should contain only one such instance.
- )
-
-
 ;; REFTEX (much enhanced management of cross-ref, labels, etc)
 ;; http://www.strw.leidenuniv.nl/~dominik/Tools/reftex/
 (autoload 'reftex-mode     "reftex" "RefTeX Minor Mode" t)
@@ -131,7 +130,7 @@
   (insert (format-time-string "%A, %B %e, %Y %k:%M:%S %Z")))
 (global-set-key "\C-[d" 'insert-date)
 
-(iswitchb-default-keybindings)
+;(iswitchb-default-keybindings)
 
 (column-number-mode t)
 (setq reftex-plug-into-AUCTeX t)
@@ -163,9 +162,13 @@
 	  )
 
 (fset 'insert-function-documentation
-   [?\C-x ?i home ?\C-k ?/ ?h ?o ?m ?e ?/ ?d ?o ?n ?/ ?t ?e ?m ?p ?l ?a ?t ?e ?s ?/ ?p ?e ?r ?l ?_ ?f ?u ?n ?c ?t ?i ?o ?n ?_ ?d ?o ?c ?u ?m ?e ?n ?t ?a ?t ?i ?o ?n return])
+   [?\C-x ?i home ?\C-k ?/ ?h ?o ?m ?e ?/ ?d ?o ?n ?/ ?l ?i ?b ?/ ?t ?e ?m ?p ?l ?a ?t ?e ?s ?/ ?p ?e ?r ?l ?_ ?f ?u ?n ?c ?t ?i ?o ?n ?_ ?d ?o ?c ?u ?m ?e ?n ?t ?a ?t ?i ?o ?n return])
 (global-set-key "\M-f" 'insert-function-documentation)
-     
+
+(eval-after-load "lilypond-mode" 
+  '(progn
+     (load-library "lyqi-mode")
+     (define-key LilyPond-mode-map "\C-cq" 'lyqi-mode)))
 
 (desktop-load-default)
-(desktop-read)
\ No newline at end of file
+(desktop-read)