summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2013-01-041-53/+27
|\ | | | | | | | | Conflicts: .emacs.d/init.el
| * Emacs: Don't load rudel for nowGravatar Tom Willemsen2013-01-041-1/+1
| | | | | | | | I haven't used it in a while anyway...
| * Emacs: Show any scratch buffers in current windowGravatar Tom Willemsen2013-01-041-0/+3
| |
| * Emacs: Stay true to 80 columns, even with lispGravatar Tom Willemsen2013-01-041-3/+0
| |
| * Emacs: don't use ido for `org-refile'Gravatar Tom Willemsen2013-01-041-0/+1
| | | | | | | | It doesn't work...
| * Emacs: Some mode changesGravatar Tom Willemsen2013-01-031-3/+4
| | | | | | | | | | | | * .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.
| * Emacs: Start with literate configuration againGravatar Tom Willemsen2013-01-031-39/+1
| |
| * Emacs: Stop using ido-ubiquitousGravatar Tom Willemsen2012-12-301-2/+1
| | | | | | | | | | It was starting to get in the way too much, try icomplete-mode instead.
| * Emacs: Show magit main window in current windowGravatar Tom Willemsen2012-12-281-0/+3
| |
| * Emacs: set-up auto-complete default configGravatar Tom Willemsen2012-12-281-0/+1
| |
| * Emacs: Reset buffer displayGravatar Tom Willemsen2012-12-281-3/+0
| | | | | | | | | | Having everything show up in the same buffer is unpleasant, the correct situation should be determined per-buffer.
| * Emacs: Manually set-up w3mGravatar Tom Willemsen2012-12-281-1/+2
| | | | | | | | | | Only `w3m-goto-url' and `w3m-bookmark-view' are ever really used to start w3m, no need to load `w3m-load' for that.
| * Emacs: Throw away unneeded imports and sortGravatar Tom Willemsen2012-12-271-6/+3
| |
| * Emacs: Meh, stop messing around with the mode-lineGravatar Tom Willemsen2012-12-271-2/+0
| |
| * Show buffer position againGravatar Tom Willemsen2012-12-201-1/+0
| |
| * Emacs: diminish yasnippetGravatar Tom Willemsen2012-12-201-0/+3
| |
| * Add diminishGravatar Tom Willemsen2012-12-191-0/+11
| |
| * Set the fci-rule-column to 101 for lispsGravatar Tom Willemsen2012-12-191-0/+3
| |
| * Remove oni:load-hippie-expGravatar Tom Willemsen2012-12-171-6/+1
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-12-141-4/+16
|\| | | | | | | | | Conflicts: dotfiles.mk
| * Add type-break settingsGravatar Tom Willemsen2012-12-141-1/+4
| |
| * Emacs: Simplify window management keysGravatar Tom Willemsen2012-12-111-0/+5
| | | | | | | | | | | | 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...
| * Add the external yoshi-theme path to theme pathGravatar Tom Willemsen2012-12-111-1/+4
| |
| * Send jabber message as appt remindersGravatar Tom Willemsen2012-12-061-0/+1
| |
| * Change prompts for jabberGravatar Tom Willemsen2012-12-061-2/+2
| | | | | | | | This way all text is nicely alligned
* | There is no /usr/local/emacs hereGravatar Tom Willemsen2012-12-051-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-12-051-31/+41
|\| | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-12-041-20/+24
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-271-12/+18
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-211-8/+11
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-201-4/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-191-4/+9
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-141-3/+0
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-141-1/+0
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-141-2/+0
| |
* | .config/herbstluftwm/autostartGravatar Tom Willemsen2012-11-081-7/+5
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-071-3/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-071-2/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-051-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-261-0/+14
|\| | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-261-0/+14
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-241-130/+66
|\| | | | | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el .xinitrc .zprofile
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-3/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-23/+3
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-14/+0
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-221-81/+25
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-1/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-1/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-9/+35
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-181-1/+1
| |