(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)
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]
(setq find-ls-option ;Build file lists efficiently
'("-print0 | xargs -0r ls -ld" . "ld"))
(setq bookmark-save-flag 0) ;Save bookmarks automatically
-(setq vc-follow-symlinks t)
+(setq vc-follow-symlinks t
+ vc-git-resolve-conflicts nil)
(setq x-gtk-file-dialog-help-text nil)
(setq use-dialog-box nil)
(setq Info-fontify-maximum-menu-size 100000)
(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)