dot/emacs: Always start the servers in Emacs 23.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 2118790..845f1ff 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,6 +62,7 @@
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 
 ;; Skeleton stuff.
 
@@ -85,9 +86,10 @@
 
 ;; Emacs server behaviour.
 
-(and window-system
-     (trap (gnuserv-start)
-          (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))))
+(and (or window-system (>= emacs-major-version 23))
+     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
+          (start-server)
+          (gnuserv-start)))
 
 ;; Control backup behaviour.
 
@@ -358,14 +360,13 @@
       (mdw-uniquify-alist
        '((width . 78)
         (height . 33)
-        (vertical-scroll-bars . right))
-       (and window-system
-           '((cursor-type . bar)
-             (cursor-blink . t)
-             (left-fringe . 5)
-             (right-fringe . 5)
-             (scroll-bar-width . 15)))
-       '((cursor-color . "red"))
+        (vertical-scroll-bars . right)
+        (cursor-type . bar)
+        (cursor-blink . t)
+        (left-fringe . 5)
+        (right-fringe . 5)
+        (scroll-bar-width . 15)
+        (cursor-color . "red"))
        (if mdw-black-background
           '((background-color . "black")
             (foreground-color . "white")
@@ -427,6 +428,11 @@
 (and (not mdw-fast-startup) (fboundp 'hippie-expand)
      (global-set-key [?\M-/] 'hippie-expand))
 
+(eval-after-load "dired"
+  '(progn
+     (define-key dired-mode-map [?\C-x ?\C-q]
+       'wdired-change-to-wdired-mode)))
+
 (add-hook 'org-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
 (add-hook 'org-agenda-mode-hook
@@ -483,7 +489,8 @@
 (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
        '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
          csharp-mode-hook perl-mode-hook cperl-mode-hook
-         python-mode-hook icon-mode-hook awk-mode-hook tcl-mode-hook
+         python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+         tcl-mode-hook
          asm-mode-hook TeX-mode-hook LaTeX-mode-hook
          TeXinfo-mode-hook tex-mode-hook latex-mode-hook
          texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
@@ -548,9 +555,6 @@
 (setq lazy-lock-stealth-lines 100)
 (setq lazy-lock-stealth-verbose t)
 
-(add-hook 'after-make-frame-functions 'mdw-do-set-font)
-(add-hook 'term-setup-hook (lambda () (mdw-do-set-font (selected-frame))))
-(add-hook 'window-setup-hook (lambda () (mdw-do-set-font (selected-frame))))
 
 (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t)
 (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t)
@@ -573,6 +577,7 @@
 
 (setq-default py-indent-offset 2)
 (add-hook 'python-mode-hook 'mdw-fontify-python t)
+(add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)
 (setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background
                                                   "Linux"
                                                 "LightBG")))
@@ -649,6 +654,9 @@
        ("^pdf$" "." "evince %o")
        ("^html?$" "." "netscape %o")))
 
+(setq TeX-open-quote "\""
+      TeX-close-quote "\"")
+
 (setq reftex-use-external-file-finders t
       reftex-auto-recenter-toc t)