~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
/
xinitrc
diff --git
a/dot/xinitrc
b/dot/xinitrc
index
8bff85f
..
51a9cae
100755
(executable)
--- a/
dot/xinitrc
+++ b/
dot/xinitrc
@@
-217,7
+217,7
@@
start-clients () {
## Choose appropriate clients.
emacs=$(pick_program emacs \
## Choose appropriate clients.
emacs=$(pick_program emacs \
- emacs2
3-lucid emacs24-lucid emacs23 emacs24
emacs22 emacs21 emacs)
+ emacs2
4-lucid emacs23-lucid emacs24 emacs23
emacs22 emacs21 emacs)
term=$(pick_program terminal pterm Eterm xterm)
## Emacs window measurements.
term=$(pick_program terminal pterm Eterm xterm)
## Emacs window measurements.