X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/38ddb67eafcfa071009b34155326c1366d68c6a5..e92e3482d1710228e4dd2a865ce52841ebe8131e:/dot/emacs?ds=inline

diff --git a/dot/emacs b/dot/emacs
index 660a7ee..6fe3a05 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -89,8 +89,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.
 
@@ -191,6 +195,7 @@
 (setq enable-local-variables :safe
       enable-local-eval nil)
 (setq dabbrev-case-replace nil)		;Retain case when completing
+(setq linum-format "%7d ")
 (setq next-line-add-newlines nil)	;Don't add weird newlines
 (setq split-height-threshold 45)	;Reuse windows where sensible
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
@@ -445,6 +450,10 @@
 	  #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
 (add-hook 'org-agenda-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
+(or mdw-fast-startup
+    (progn
+      (org-remember-insinuate)
+      (global-set-key [?\C-c ?r] 'org-remember)))
 
 ;; Recognising types of files.