Commit Graph

1605 Commits

Author SHA1 Message Date
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
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
092e195a7c Changing yasnippet pointer back. 2013-03-19 00:36:13 -07:00
2a246feb35 Made modeline background black. 2013-03-18 02:31:25 -07:00
15e637ec1a dumb yasnippted thing. 2013-03-17 23:50:23 +01:00
f5cc9e43e1 Updated .gitignore. 2013-03-16 20:11:01 -07:00
760cabd4b2 Removed .elc files. 2013-03-16 20:10:33 -07:00
3110354532 Added theme stuff. 2013-03-16 20:09:42 -07:00
36fcc48477 Added pymacs.el 2013-03-16 19:08:48 -07:00
f5fbc614ab derp. 2013-03-16 19:04:29 -07:00
b8e969c1d1 deleted actual emacs for python folder 2013-03-16 18:22:57 -07:00
5d6f2ca5af removed emacs for python submodule. 2013-03-16 18:22:25 -07:00