~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile]
/
dot
/
emacs
diff --git
a/dot/emacs
b/dot/emacs
index
9bb23b2
..
2ab16ad
100644
(file)
--- a/
dot/emacs
+++ b/
dot/emacs
@@
-97,6
+97,9
@@
(require 'paren)
(trap (show-paren-mode t))
(or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
(require 'paren)
(trap (show-paren-mode t))
(or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
+(setq x-select-enable-clipboard nil
+ x-select-enable-primary t
+ mouse-drag-copy-region t)
;; Multiple cursors.
;; Multiple cursors.
@@
-134,6
+137,11
@@
(and edit
(set-process-query-on-exit-flag edit nil)))))))
(and edit
(set-process-query-on-exit-flag edit nil)))))))
+;; Saving state.
+
+(or mdw-fast-startup (savehist-mode 1))
+(setq history-length 200)
+
;; Control backup behaviour.
(setq backup-by-copying nil)
;; Control backup behaviour.
(setq backup-by-copying nil)
@@
-208,7
+216,8
@@
(lambda ()
(let ((group gnus-newsgroup-name))
(and (string-match "^nn\\(imap\\|folder\\)\\+" group)
(lambda ()
(let ((group gnus-newsgroup-name))
(and (string-match "^nn\\(imap\\|folder\\)\\+" group)
- (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
+ (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+ group)))))
bbdb-user-mail-names
(concat "^"
"\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
bbdb-user-mail-names
(concat "^"
"\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@
-312,7
+321,7
@@
(setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET]
(setq case-fold-file-names nil) ;Don't translate file names (grr...)
(setq scroll-step 5) ;Don't scroll too much at a time
(setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET]
(setq case-fold-file-names nil) ;Don't translate file names (grr...)
(setq scroll-step 5) ;Don't scroll too much at a time
-(setq-default fill-column
77)
;I use rather narrow windows
+(setq-default fill-column
mdw-text-width)
;I use rather narrow windows
(setq-default comment-column 40) ;Set a standard comment column
(setq-default truncate-partial-width-windows nil
truncate-lines t)
(setq-default comment-column 40) ;Set a standard comment column
(setq-default truncate-partial-width-windows nil
truncate-lines t)
@@
-320,7
+329,7
@@
(setq view-read-only t)
(setq whitespace-style '(trailing empty indentation face lines-tail
space-before-tab space-after-tab)
(setq view-read-only t)
(setq whitespace-style '(trailing empty indentation face lines-tail
space-before-tab space-after-tab)
- whitespace-line-column
77
)
+ whitespace-line-column
mdw-text-width
)
(setq woman-use-own-frame nil ;Keep man pages somewhere sensible
woman-fill-column 72) ;Right margin position.
(setq diff-switches "-u" ;I like reading unified diffs
(setq woman-use-own-frame nil ;Keep man pages somewhere sensible
woman-fill-column 72) ;Right margin position.
(setq diff-switches "-u" ;I like reading unified diffs
@@
-330,6
+339,7
@@
(setq find-ls-option ;Build file lists efficiently
'("-print0 | xargs -0r ls -ld" . "ld"))
(setq bookmark-save-flag 0) ;Save bookmarks automatically
(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 x-gtk-file-dialog-help-text nil)
(setq Info-fontify-maximum-menu-size 100000)
(setq set-mark-command-repeat-pop t)
(setq x-gtk-file-dialog-help-text nil)
(setq Info-fontify-maximum-menu-size 100000)
(setq set-mark-command-repeat-pop t)
@@
-398,8
+408,8
@@
w3m-use-cookies t)
(eval-after-load "w3m"
w3m-use-cookies t)
(eval-after-load "w3m"
- '(let ((entries '(("application/pdf" "\\.pdf\\'" ("
evince
" file) nil)
- ("application/x-pdf" "\\.pdf\\'" ("
evince
" file) nil))))
+ '(let ((entries '(("application/pdf" "\\.pdf\\'" ("
xdg-open
" file) nil)
+ ("application/x-pdf" "\\.pdf\\'" ("
xdg-open
" file) nil))))
(dolist (e entries)
(setq w3m-content-type-alist
(cons e (remove* (car e) w3m-content-type-alist
(dolist (e entries)
(setq w3m-content-type-alist
(cons e (remove* (car e) w3m-content-type-alist
@@
-533,7
+543,8
@@
(setq frame-background-mode (if mdw-black-background 'dark 'light)
default-frame-alist
(setq frame-background-mode (if mdw-black-background 'dark 'light)
default-frame-alist
- `((width . ,(if (>= emacs-major-version 21) 77 78))
+ `((width . ,(+ mdw-column-width
+ (if (>= emacs-major-version 21) 0 1)))
(height . 33)
(vertical-scroll-bars . right)
(cursor-type . bar)
(height . 33)
(vertical-scroll-bars . right)
(cursor-type . bar)
@@
-546,7
+557,8
@@
(cursor-color . "red")
(background-mode . ,frame-background-mode))
initial-frame-alist
(cursor-color . "red")
(background-mode . ,frame-background-mode))
initial-frame-alist
- `((width . ,(if (>= emacs-major-version 21) 77 78))
+ `((width . ,(+ mdw-column-width
+ (if (>= emacs-major-version 21) 0 1)))
(menu-bar-lines . ,(if window-system 1 0)))
window-system-default-frame-alist
'((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
(menu-bar-lines . ,(if window-system 1 0)))
window-system-default-frame-alist
'((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
@@
-590,6
+602,7
@@
(global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
(global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
(global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
(global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
(global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
(global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
+ (global-set-key [?\C-c ?k] 'compile)
(global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
(global-set-key [?\M-#] 'calc-dispatch)
(global-set-key [?\C-x ?/] 'auto-fill-mode)
(global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
(global-set-key [?\M-#] 'calc-dispatch)
(global-set-key [?\C-x ?/] 'auto-fill-mode)
@@
-613,7
+626,14
@@
(global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
(global-set-key [f11] 'mdw-toggle-full-screen)
(and (not mdw-fast-startup) (fboundp 'hippie-expand)
(global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
(global-set-key [f11] 'mdw-toggle-full-screen)
(and (not mdw-fast-startup) (fboundp 'hippie-expand)
- (global-set-key [?\M-/] 'hippie-expand)))
+ (global-set-key [?\M-?] 'hippie-expand)))
+
+(eval-after-load "hippie-exp"
+ '(setq hippie-expand-try-functions-list
+ (remove-if (lambda (name)
+ (memq name '(try-expand-list
+ try-expand-list-all-buffers)))
+ hippie-expand-try-functions-list)))
(eval-after-load "dired"
'(progn
(eval-after-load "dired"
'(progn
@@
-817,6
+837,7
@@
(progn
(setq-default py-indent-offset 2
python-indent 2
(progn
(setq-default py-indent-offset 2
python-indent 2
+ python-indent-offset 2
py-python-command-args
`("-i" "-colors" ,(if mdw-black-background
"Linux" "LightBG")))
py-python-command-args
`("-i" "-colors" ,(if mdw-black-background
"Linux" "LightBG")))
@@
-881,9
+902,9
@@
(setq TeX-output-view-style
'(("^dvi$"
("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$")
(setq TeX-output-view-style
'(("^dvi$"
("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$")
- "%(o?)dvips -t landscape %d -o &&
evince
%f")
+ "%(o?)dvips -t landscape %d -o &&
xdg-open
%f")
("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$"
("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$"
- "%(o?)dvips %d -o &&
evince
%f")
+ "%(o?)dvips %d -o &&
xdg-open
%f")
("^dvi$"
("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$")
"%(o?)xdvi %dS -paper a4r -s 0 %d")
("^dvi$"
("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$")
"%(o?)xdvi %dS -paper a4r -s 0 %d")
@@
-898,14
+919,17
@@
("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
("^dvi$" "." "%(o?)xdvi %dS %d")
("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
("^dvi$" "." "%(o?)xdvi %dS %d")
- ("^pdf$" "." "evince %o")
- ("^html?$" "." "netscape %o")))
+ ("^pdf$" "." "xdg-open %o")
+ ("^html?$" "." "sensible-browser %o")))
+
+(setq TeX-view-program-list
+ '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)"))))
(setq TeX-view-program-selection
'(((output-dvi style-pstricks) "dvips and gv")
(output-dvi "xdvi")
(setq TeX-view-program-selection
'(((output-dvi style-pstricks) "dvips and gv")
(output-dvi "xdvi")
- (output-pdf "
Evince
")
- (output-html "
xdg-open
")))
+ (output-pdf "
mupdf
")
+ (output-html "
sensible-browser
")))
(setq TeX-open-quote "\""
TeX-close-quote "\"")
(setq TeX-open-quote "\""
TeX-close-quote "\"")