audio,images: remove old ERC notification media

[emacs.d.git] / .emacs

diff --git a/.emacs b/.emacs
index b990474d74dd029f30f3fc7540f8f8204fc6d075..8f88dc32afca085ae71f83038cf1b8d42c2ed054 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -12,14 +12,11 @@
 
 ;; Gentoo *or somebody* made the default too small.
 ;; Make it too big to overcompensate.
-(set-default-font "DejaVu Sans Mono-14")
+(set-frame-font "DejaVu Sans Mono-14")
 
 ;; 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
@@ -56,6 +53,11 @@
 ;; Don't leave backups everywhere.
 (setq backup-inhibited t)
 
+;; Don't let the file's contents modify my editor, because that needs
+;; to be said? More importantly, don't interrupt me to ask me if I
+;; want to process the variables that emacs KNOWS are unsafe.
+(setq enable-local-variables nil)
+
 ;; Add the directory containing .emacs to the load-path.
 (add-to-list 'load-path (file-name-directory (file-truename user-init-file)))
 
@@ -76,6 +78,7 @@
 (global-set-key "\C-cd" 'diff-buffer-against-file)
 
 (load-library "fix-nonstandard-chars")
+(load-library "latex-query-replace-regexp-math")
 
 
 ;; Enable dired-find-alternate-file without having to stop
@@ -86,6 +89,5 @@
 ;; Enable the downcase-region function.
 (put 'downcase-region 'disabled nil)
 
-;; Show trailing whitespace, without having to drop into
-;; whitespace-mode.
-(custom-set-variables '(show-trailing-whitespace t))
+;; I want to see trailing whitespace.
+(setq-default show-trailing-whitespace t)