X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=.emacs;h=db36d3e6ea3fbd60ceb3cb97d18c6f0d3c5b444c;hb=2df705d3f133dfd3c9bada6423084990a67f878f;hp=4732256f31692726080c24d0cb7e6f76bc5c649a;hpb=c8ef0ff3bd4f0b1ddaaadf9770d64db7fe28159a;p=emacs.d.git

diff --git a/.emacs b/.emacs
index 4732256..db36d3e 100644
--- a/.emacs
+++ b/.emacs
@@ -7,6 +7,9 @@
 ;; Set the frame title to the name of the buffer, if supported.
 (setq frame-title-format "%b")
 
+;; Currently needed to make Emacs 23 behave sanely.
+'(diff-jump-to-old-file t)
+
 ;; Disable the menu/tool bars when we're using X.
 (menu-bar-mode -1)
 (when window-system
@@ -59,14 +62,8 @@
 (load-library "autoloads")
 
 
-(defun load-erc()
-  (interactive)
-  (ignore-errors
-    (load-library "erc")
-    )
-  )
-
-(global-set-key "\C-ce" 'load-erc)
+;; Open private IRC messages in a new buffer.
+(setq erc-auto-query 'buffer)
 
 
 ;; Never ask me anything, emacs.
@@ -79,6 +76,11 @@
 (load-library "fix-nonstandard-chars")
 
 
+;; Enable dired-find-alternate-file without having to stop
+;; and explain myself to Emacs.
+(put 'dired-find-alternate-file 'disabled nil)
+
+
 ;; These next functions override the defaults provided by emacs. They
 ;; prevent warning messages related to file modification times,
 ;; particularly on weird filesystems.