* resolve conflicts in dictionary

[home-base.git] / .emacs

diff --git a/.emacs b/.emacs
index 56b0244f9992e548fd75b83de5bdb102f0997180..df92f900d6ca69a01abdf99644cfeb8913f456ad 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -16,9 +16,9 @@
  '(display-time-mode t)
  '(global-auto-revert-mode t)
  '(global-font-lock-mode t nil (font-lock))
- '(global-set-key "\M-g" 'goto-line)
- '(iswitchb-prompt-newbuffer nil)
+ '(global-set-key "\347" t)
  '(iswitchb-mode t)
+ '(iswitchb-prompt-newbuffer nil)
  '(mail-user-agent (quote sendmail-user-agent))
  '(mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases")))
  '(post-email-address "don@donarmstrong.com")
@@ -124,17 +124,17 @@
 (add-hook 'LaTeX-mode-hook 'outline-minor-mode)   ; with AUCTeX LaTeX mode
 (add-hook 'latex-mode-hook 'outline-minor-mode)   ; with Emacs latex mode
 
-(TeX-add-style-hook
- "latex"
- (lambda ()
-   (TeX-add-symbols
-    '("DLA" 1))))
-(custom-set-variables
- '(font-latex-user-keyword-classes 
-   '(("fixme" 
-      ("DLA" "RZ")
-      font-lock-function-name-face 2 (command 1 t))))
-) 
+;; (TeX-add-style-hook
+;;  "latex"
+;;  (lambda ()
+;;    (TeX-add-symbols
+;;     '("DLA" 1))))
+;; (custom-set-variables
+;;  '(font-latex-user-keyword-classes 
+;;    '(("fixme" 
+;;       ("DLA" "RZ")
+;;       font-lock-function-name-face 2 (command 1 t))))
+;; ) 
 
 
 
@@ -187,4 +187,10 @@
 (desktop-load-default)
 (desktop-read)
 ; start up the iswitchb mode
-(iswitchb-mode)
\ No newline at end of file
+(iswitchb-mode)
+(custom-set-faces
+  ;; custom-set-faces 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.
+ )