X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5829b6b1d3f2bab6bbdeef92f7b3e0f85db6ca33..4877b8d8f0fd312be08bf10a8ec4f2ac7b7c952b:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 79220bd..7378f0c 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -130,6 +130,7 @@
 
 (and (or window-system (mdw-emacs-version-p 23))
      (not mdw-fast-startup)
+     (not (and (fboundp 'daemonp) (daemonp)))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
@@ -343,7 +344,7 @@
       eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
-      delete-by-moving-to-trash t
+      delete-by-moving-to-trash (mdw-emacs-version-p 24)
       dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
       wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
@@ -582,10 +583,7 @@
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
       frame-inhibit-implied-resize t
       default-frame-alist
-      `((width . ,(+ mdw-column-width
-		     (cond ((<= emacs-major-version 20) 1)
-			   ((= emacs-major-version 26) 3)
-			   (t 0))))
+      `((width . ,(+ mdw-column-width mdw-frame-width-fudge))
 	(height . 33)
 	(vertical-scroll-bars . right)
 	(cursor-type . bar)