(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)
(setq sendmail-program "~/bin/sendmail-hack"
send-mail-function 'sendmail-send-it
mail-interactive t
+ mail-specify-envelope-from t
+ mail-envelope-from 'header
sendmail-error-reporting-interactive '("-odb" "-oee"))
(autoload 'sendmail-send-it "sendmail")
(autoload 'smtpmail-send-it "smtpmail")
bbdb-north-american-phone-numbers-p nil
bbdb-dwim-net-address-allow-redundancy t
bbdb-extract-address-components-func 'bbdb-extract-address-components
+ bbdb-allow-duplicates t
bbdb/news-auto-create-p
(lambda ()
(let ((group gnus-newsgroup-name))
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)
;; Default frame size.
(setq frame-background-mode (if mdw-black-background 'dark 'light)
+ frame-inhibit-implied-resize t
default-frame-alist
- `((width . ,(+ mdw-column-width
- (if (>= emacs-major-version 21) 0 1)))
+ `((width . ,(+ mdw-column-width mdw-frame-width-fudge))
(height . 33)
(vertical-scroll-bars . right)
(cursor-type . bar)
;; Other frame fiddling.
-(setq frame-title-format '("" invocation-name "@" system-name ": %b"))
+(setq frame-title-format '("Emacs " user-login-name "@" system-name " – %b"))
;; Global keymap changes.