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
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
d11f776e21
added backups to .gitignore.
2013-03-28 13:07:05 -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
1c0e86f017
Merge remote-tracking branch 'origin/master' into yelp
...
* origin/master:
Got rid of stupid python-mode, now using python.el.
Conflicts:
init.el
2013-03-25 14:32:28 -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
59d928e50b
Merge remote-tracking branch 'origin/yelp' into yelp
...
* origin/yelp:
Fixed dumb python-mode hijaking ruby thing.
2013-03-25 10:29:10 -07:00
eac51bdc57
Got rid of buggy starter-kit lisp mode.
2013-03-24 12:58:27 -07:00
58a9a9d0ba
Added emacs starter kit.
2013-03-24 12:56:49 -07:00
9d3481c994
Merge remote-tracking branch 'origin/master' into yelp
...
* origin/master:
Fixed dumb python-mode hijaking ruby thing.
Removed yasnippet.
2013-03-24 00:51:53 -07:00
82103ae761
Fixed dumb python-mode hijaking ruby thing.
2013-03-24 00:47:03 -07:00
f1c506193c
Merge branch 'master' into yelp
...
* master:
Removed yasnippet.
2013-03-20 10:31:42 -07:00
b411260400
Removed yasnippet.
2013-03-20 10:31:15 -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
ad26b3428f
Update emacs for python submodule.
2013-03-19 20:18:24 -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
82778d2c52
Deleted yasnippet.
2013-03-19 01:56:23 -07:00
2129e7973c
Removed yasnippet module.
2013-03-19 01:55:56 -07:00
