Commit Graph

274 Commits

Author SHA1 Message Date
5042996f3e add ensime to required packages. 2014-04-14 18:30:49 -07:00
02add1b03e add scala-mode2 2014-04-14 18:27:35 -07:00
9ff81e612c Add all copy 2014-04-14 18:19:53 -07:00
1fc07d92ad remove a bunch of submodules, themes now fetched via elpa. 2014-04-14 14:52:42 -07:00
0040b4cb3e Add patch to execute-extended-command for old versions of emacs and smex. 2014-04-14 13:31:41 -07:00
9ef2df938e multi-line my-packages. 2014-04-14 11:29:59 -07:00
155fdef869 remove smex from required packages as it was causing problems with yelp's version of emacs. 2014-04-14 10:36:59 -07:00
78c2a4a098 Make elpa if it isn't there. 2014-04-14 01:07:01 -07:00
9888ee7a21 No longer storing elpa stuff in repository. 2014-04-14 00:42:01 -07:00
bbdc7a5436 remote-os-copy -> smart-copy; now copies to remote host if sshed. 2014-04-13 23:57:15 -07:00
4561dd9721 Move starte kits init. 2014-04-13 22:20:06 -07:00
4116004eb0 make C-c + also copy to tmux buffer. 2014-04-10 14:30:12 -07:00
89b03f9bef Add ctags, multiple cursors, bump multi-line it. 2014-04-10 01:08:05 -07:00
01caef53d1 Add MELPA, themes. 2014-04-08 18:20:45 -07:00
d16b9bd2ac Add os-copy cleanup keybindings 2014-03-25 19:48:08 -07:00
26672cca72 Add remote-os-copy to .emacs.d 2014-03-25 18:57:45 -07:00
a3e35bec30 bump emacs-testify pointer. 2014-03-21 11:31:41 -07:00
f1877847fc No more tabs! also tweaks to emacs-testify. 2014-01-21 15:16:40 -08:00
9612e42908 Add message buffer name, bump emacs-testify pointer. 2013-11-06 14:48:25 -08:00
b1be91f1bf Added ffip-get-buffer-name 2013-09-26 17:49:42 -07:00
ab85b3ce95 Switch to solarized, remove autofill in text mode and enable global-linum-mode 2013-09-25 15:02:09 -07:00
da4ae81c4b Add no-easy-keys. 2013-09-25 13:09:05 -07:00
3ca39d6424 Merge remote-tracking branch 'origin/master' into yelp 2013-09-10 17:23:45 -07:00
5b68e3d34e Merge remote-tracking branch 'origin/yelp' into yelp
Conflicts:
	init.el
2013-07-18 20:28:21 -07:00
27ec88c43e Merge remote-tracking branch 'origin/master' into yelp
Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
2013-07-18 20:26:45 -07:00
4d1530b9d8 A bunch of small fixes. 2013-07-08 11:13:35 -07:00
18d7861e82 Got rid of auto fill mode. set default js-indent-level. 2013-07-08 11:06:11 -07:00
97178b7ed1 Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  Added emacs-testify
  Added caching to find-file-in-project.

Conflicts:
	init.el
2013-05-25 11:30:04 -07:00
83bb775e38 Added emacs-testify
Conflicts:

	init.el
2013-04-25 16:38:26 -07:00
b2ffe6f4d6 Added emacs-testify 2013-04-25 16:35:51 -07:00
6058d7d114 Added tmux copy. 2013-04-11 10:43:40 -07:00
767b5c276e Added caching to find-file-in-project. 2013-04-11 10:42:47 -07:00
f93369aa52 Merge remote-tracking branch 'origin/master' into yelp 2013-04-11 10:40:30 -07:00
a74a7c7ef7 Added caching to find-file-in-project. 2013-04-11 10:40:05 -07:00
903ab9e2d7 commit for merge 2013-04-10 15:43:11 -07:00
7cec3f8db3 Merge remote-tracking branch 'origin/master' into HEAD
* origin/master:
  No tabs in python in master.
  added backups to .gitignore.
  Added other direction split switching.
2013-04-01 01:17:57 +00:00
563240001d Got rid of explicit loading of pymacs. 2013-04-01 01:17:13 +00:00
eef55f7c0f Revert "No tabs in python in master." We merged this in by accident.
This reverts commit 76991aa34b9281208a2b40dc32467f101e7c7877.
2013-03-28 13:09:12 -07:00
1801e8e766 Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  No tabs in python in master.
  added backups to .gitignore.
  Added other direction split switching.
2013-03-28 13:08:42 -07:00
509397f9a2 No tabs in python in master. 2013-03-28 13:08:02 -07:00
37a1a11904 Merge branch 'master' of github.com:IvanMalison/.emacs.d
* 'master' of github.com:IvanMalison/.emacs.d:
  Tweaks.
2013-03-28 13:05:33 -07:00
29799b7486 Added other direction split switching. 2013-03-28 13:05:03 -07:00
a186a491bf Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  Tweaks.
  Updates from work.
  Got rid of tabs by default for python.
  Added ignore, turn subword mode on for python mode.
  Stop loading pymacs everytime a python file is loaded.

Conflicts:
	init.el
2013-03-27 21:27:00 -07:00
476d0bdd8c Tweaks. 2013-03-27 21:23:22 -07:00
af25444cf8 Updates from work. 2013-03-27 18:25:41 -07:00
b75eb68e02 Got rid of tabs by default for python. 2013-03-26 12:00:17 -07:00
efc1953b17 Added ignore, turn subword mode on for python mode. 2013-03-26 11:59:40 -07:00
825dca7919 Added ignore, turn subword mode on for python mode. 2013-03-26 11:54:04 -07:00
fc562db128 Stop loading pymacs everytime a python file is loaded. 2013-03-26 10:17:51 -07:00
4d461eebbd Merge branch 'yelp' of github.com:IvanMalison/.emacs.d into yelp
* 'yelp' of github.com:IvanMalison/.emacs.d:
  Changed default theme to solarized.
2013-03-26 10:16:53 -07:00
0aece58291 Stop loading pymacs everytime a python file is loaded. 2013-03-26 10:15:38 -07:00
773f035ba4 Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  Changed default theme to solarized.
2013-03-26 10:10:14 -07:00
d28ffff7a7 Changed default theme to solarized. 2013-03-26 10:04:08 -07:00
780e5a52f3 Got rid of stupid python-mode, now using python.el. 2013-03-25 14:31:41 -07:00
2819245c3c Got rid of stupid python-mode, now using python.el. 2013-03-25 14:28:49 -07:00
ac0b05da5c Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  More tweaks.
  Init changes.
  Added whitespace changes to init.el.
2013-03-25 10:45:48 -07:00
3606f61592 More tweaks. 2013-03-25 10:45:07 -07:00
ee44489106 Init changes. 2013-03-25 10:40:45 -07:00
3961734e8d Added whitespace changes to init.el. 2013-03-25 10:37:38 -07:00
00679329f7 Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  Got rid of buggy starter-kit lisp mode.
  Added emacs starter kit.
2013-03-25 10:29:18 -07:00
58a9a9d0ba Added emacs starter kit. 2013-03-24 12:56:49 -07:00
92fa746aa3 Merge branch 'master' into yelp
* master:
  Update emacs for python submodule.
  Added emacs-for-python.
2013-03-20 10:28:31 -07:00
489c25f12e Added emacs-for-python. 2013-03-19 19:59:41 -07:00
78a06c9f10 Merge remote-tracking branch 'origin/master' into yelp
* origin/master:
  Added yasnippet bundle.
  Deleted yasnippet.
  Removed yasnippet module.
2013-03-19 02:01:04 -07:00
688bf2c799 Added yasnippet bundle. 2013-03-19 02:00:00 -07:00
92937b396a Added mode hook for yelp. 2013-03-19 01:45:09 -07:00
9a8bd09099 Disable menu bar. 2013-03-19 01:40:56 -07:00
2a246feb35 Made modeline background black. 2013-03-18 02:31:25 -07:00
3110354532 Added theme stuff. 2013-03-16 20:09:42 -07:00
f5fbc614ab derp. 2013-03-16 19:04:29 -07:00
0be2b6a4cd Fixing things up. 2013-03-16 18:20:21 -07:00
a9e47e5048 Why isn't shit working? 2013-03-16 16:40:09 -07:00
efea58982b Changed submodules updating init.el. 2013-03-16 16:34:21 -07:00
d14b633d9e Initial 2013-03-15 10:35:58 -07:00