Removed the load-erc function; ERC is built-in now.

[emacs.d.git] / .emacs

diff --git a/.emacs b/.emacs
index 4732256f31692726080c24d0cb7e6f76bc5c649a..d263d76ec5a4a47977c3dddf14083731088319a2 100644 (file)
--- 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.