Merge remote branch 'crybaby'

* crybaby:
  dot/emacs: Support the Chrome edit server.
  dot/vimrc: Use the right font and colours.  Turn on autoindent.
  el/dot-emacs.el: Twiddle `variable-pitch' face size for Emacs 22.

diff --git a/dot/emacs b/dot/emacs
index f70c338..ed2d4d1 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -94,8 +94,12 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 edit-server-new-frame nil
                  gnuserv-frame t)
-           (trap (server-start))))
+           (trap (server-start))
+           (trap (progn
+                   (require 'edit-server)
+                   (edit-server-start)))))
 
 ;; Control backup behaviour.
 

diff --git a/dot/vimrc b/dot/vimrc
index cdb92ef..99e3a53 100644 (file)
--- a/dot/vimrc
+++ b/dot/vimrc
@@ -1,6 +1,10 @@
 set incsearch
 set showcmd
+set autoindent
 
 if &t_Co > 2 || has("gui_running")
   syntax on
+  set guifont=MiscFixed6x13\ 12
+  hi Normal guifg=white guibg=black
+  set background=dark
 endif

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 6e28111..234fe55 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -806,7 +806,7 @@ doesn't match any of the regular expressions in
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
   (mdw-define-face variable-pitch
-    (((type x)) :family "helvetica" :height 120)))
+    (((type x)) :family "helvetica" :height 90)))
 (mdw-define-face region
   (((type tty) (class color)) :background "blue")
   (((type tty) (class mono)) :inverse-video t)