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

[emacs.d.git] / .emacs

diff --git a/.emacs b/.emacs
index e1c5691d121680e88abd97079bef868bcc2c7ef8..d263d76ec5a4a47977c3dddf14083731088319a2 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -7,12 +7,17 @@
 ;; Set the frame title to the name of the buffer, if supported.
 (setq frame-title-format "%b")
 
-;; Disable the menu/tool bars
+;; 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)
-(tool-bar-mode -1)
+(when window-system
+  (tool-bar-mode -1))
 
 ;; And put the damned scroll bar on the correct side.
-(set-scroll-bar-mode 'right)
+(when window-system
+  (set-scroll-bar-mode 'right))
 
 ;; The most important statement in this file.
 ;; Do not display a splash screen on startup.
@@ -57,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.
@@ -74,6 +73,8 @@
 (load-library "diff-buffer-against-file")
 (global-set-key "\C-cd" 'diff-buffer-against-file)
 
+(load-library "fix-nonstandard-chars")
+
 
 ;; These next functions override the defaults provided by emacs. They
 ;; prevent warning messages related to file modification times,