12fbc83cc7
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
.emacs.d/init.el
2013-01-04 00:06:15 +01:00
a13dbcec8d
Emacs: Don't load rudel for now
...
I haven't used it in a while anyway...
2013-01-04 00:01:29 +01:00
454f5cd77e
Emacs: Show any scratch buffers in current window
2013-01-04 00:01:08 +01:00
4cf76b65c1
Emacs: Stay true to 80 columns, even with lisp
2013-01-04 00:00:37 +01:00
241374103f
Emacs: don't use ido for `org-refile'
...
It doesn't work...
2013-01-04 00:00:08 +01:00
8e738db1fa
Emacs: Some mode changes
...
* .emacs.d/init.el: Reorder modes. Start using `winner-mode' again
and once more prefer `ido-ubiquitous' over `icomplete-mode'.
`icomplete-mode' tends to get messy.
2013-01-03 23:59:26 +01:00
5b4684f335
Emacs: Start with literate configuration again
2013-01-03 23:55:57 +01:00
0cceaba810
Emacs: Stop using ido-ubiquitous
...
It was starting to get in the way too much, try icomplete-mode
instead.
2012-12-30 02:29:29 +01:00
eda4b0c1ef
Emacs: Show magit main window in current window
2012-12-28 11:24:28 +01:00
d29d60a998
Emacs: set-up auto-complete default config
2012-12-28 01:58:23 +01:00
71eaad3446
Emacs: Reset buffer display
...
Having everything show up in the same buffer is unpleasant, the
correct situation should be determined per-buffer.
2012-12-28 01:58:05 +01:00
62ea1086e9
Emacs: Manually set-up w3m
...
Only `w3m-goto-url' and `w3m-bookmark-view' are ever really used to
start w3m, no need to load `w3m-load' for that.
2012-12-28 01:56:58 +01:00
5d78178216
Emacs: Throw away unneeded imports and sort
2012-12-27 02:26:02 +01:00
172fcfe930
Emacs: Meh, stop messing around with the mode-line
2012-12-27 02:25:29 +01:00
e6036a3382
Show buffer position again
2012-12-20 00:15:28 +01:00
43382b4e45
Emacs: diminish yasnippet
2012-12-20 00:01:55 +01:00
adf44fafae
Add diminish
2012-12-19 23:55:48 +01:00
25adcab0c3
Set the fci-rule-column to 101 for lisps
2012-12-19 11:43:00 +01:00
c8b34bbdad
Remove oni:load-hippie-exp
...
Placing `yas/hippie-try-expand' at the end of the
`hippie-expand-try-functions-list' doesn't seem to work very well and
putting it in the front might cause situations where I want to expand
a variable name or something and yas might take over, so don't use yas
with hippie-expand. Instead bind `yas-expand' to `C-\' and set
`yas-fallback-behavior' to nil so it doesn't start acting crazy when
there's no snippet to expand.
2012-12-17 12:11:03 +01:00
5cff0a1e09
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
dotfiles.mk
2012-12-14 00:32:05 +01:00
58dc871d0b
Add type-break settings
2012-12-14 00:16:57 +01:00
0195a2c07c
Emacs: Simplify window management keys
...
Since `C-1..9' do the same as `M-1..9' and I never use the Meta ones,
I seem to have a few keybindings available to me for such things as
this. Now I just need to start using them...
2012-12-11 01:46:16 +01:00
757a5fab18
Add the external yoshi-theme path to theme path
2012-12-11 01:44:49 +01:00
614fcffbb7
Send jabber message as appt reminders
2012-12-06 22:40:43 +01:00
1e84d8bee4
Change prompts for jabber
...
This way all text is nicely alligned
2012-12-06 13:04:29 +01:00
a95c1528ab
There is no /usr/local/emacs here
2012-12-05 00:47:40 +01:00
6278e2e634
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
.emacs.d/site-lisp/oni.el
2012-12-05 00:44:09 +01:00
ff77b0c0d9
.emacs.d/init.el
2012-12-04 17:41:57 +01:00
7dc3ebbcc1
.emacs.d/init.el
2012-11-27 11:12:17 +01:00
fa717d86a0
Merge remote-tracking branch 'origin/master' into phoenix
2012-11-21 01:23:32 +01:00
d027e71839
.emacs.d/init.el
2012-11-20 18:53:28 +01:00
c99d57dbf3
.emacs.d/init.el
2012-11-19 23:22:51 +01:00
9c12ab5718
Merge remote-tracking branch 'origin/master' into phoenix
2012-11-14 20:12:55 +01:00
169e18603e
.emacs.d/init.el
2012-11-14 20:04:51 +01:00
8a15c875ac
.emacs.d/init.el
2012-11-14 01:22:40 +01:00
57e1063403
.config/herbstluftwm/autostart
2012-11-08 00:34:15 +01:00
7d198e5604
.emacs.d/init.el
2012-11-07 18:53:32 +01:00
7481b80d53
.emacs.d/init.el
2012-11-07 03:27:54 +01:00
1c630b0ad7
.emacs.d/init.el
2012-11-05 21:04:22 +01:00
cbdfa4cac3
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
.emacs.d/site-lisp/oni.el
2012-10-26 01:46:09 +02:00
2e70340b95
.emacs.d/init.el
2012-10-26 00:54:23 +02:00
d6be1ae80f
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
2012-10-24 01:36:38 +02:00
af62874a4a
.emacs.d/init.el
2012-10-23 00:23:36 +02:00
a38365ecf3
.emacs.d/init.el
2012-10-23 00:06:35 +02:00
89b0ac6c2b
.emacs.d/init.el
2012-10-23 00:02:14 +02:00
6a9e18bf35
.emacs.d/init.el
2012-10-22 23:59:38 +02:00
19024fdfab
.emacs.d/init.el
2012-10-19 22:59:45 +02:00
9b97541602
.emacs.d/init.el
2012-10-19 13:33:21 +02:00
cd7d508120
.emacs.d/init.el
2012-10-19 13:29:34 +02:00
7713dfa53a
.emacs.d/init.el
2012-10-18 11:11:55 +02:00