edit-server-new-frame nil
gnuserv-frame t)
(trap (let ((warning-suppress-types
- (cons '(server) warning-suppress-types)))
+ (cons '(server)
+ (and (boundp 'warning-suppress-types)
+ warning-suppress-types))))
(server-start)))
(trap (progn
(require 'edit-server)
(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)
(windmove-default-keybindings))
(setq windmove-wrap-around t)
(trap (require 'ido) (ido-mode 1)
- (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
- (setq ido-cr+-max-items nil
- ido-ubiquitous-command-overrides
- (append ido-ubiquitous-command-overrides
- `((enable-old regexp ,(concat "\\`"
- "gtags-find-"
- "\\(" "tag"
- "\\|file"
- "\\|rtag"
- "\\|symbol"
- "\\)"
- "\\(" "\\|-other-window"
- "\\)"
- "\\'")))))
+ (require 'ido-completing-read+)
+ (unless (fboundp 'ido-ubiquitous-mode) (require 'ido-ubiquitous))
+ (ido-ubiquitous-mode 1)
+ (setq ido-cr+-max-items nil)
+ (let ((excludes `(,(concat "\\`"
+ "gtags-find-"
+ "\\(" "tag"
+ "\\|file"
+ "\\|rtag"
+ "\\|symbol"
+ "\\)"
+ "\\(" "\\|-other-window"
+ "\\)"
+ "\\'"))))
+ (if (boundp 'ido-ubiquitous-command-overrides)
+ (setq ido-ubiquitous-command-overrides
+ (append ido-ubiquitous-command-overrides
+ (mapcar (lambda (exclude)
+ (if (symbolp exclude)
+ `(enable-old exact
+ ,(symbol-name exclude))
+ `(enable-old regexp ,exclude)))
+ excludes)))
+ (setq ido-cr+-function-blacklist
+ (append ido-cr+-function-blacklist excludes))))
(setq magit-completing-read-function 'magit-ido-completing-read)
(require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))