Commit graph

2277 commits

Author SHA1 Message Date
John Miller
4e33fb9533 Merge commit '799253c7ecd43395a66bfd595346093072c785b5' as 'lib/pos-tip' 2016-09-24 13:00:19 -05:00
John Miller
799253c7ec Squashed 'lib/pos-tip/' content from commit 051e08f
git-subtree-dir: lib/pos-tip
git-subtree-split: 051e08fec5cf30b7574bdf439f79fef7d42d689d
2016-09-24 13:00:19 -05:00
John Miller
3570a47a8c Merge commit 'e511fac3b7a6b9ac6ba94972d2e9433ebf80dd35' as 'lib/popup' 2016-09-24 13:00:05 -05:00
John Miller
e511fac3b7 Squashed 'lib/popup/' content from commit 80829dd
git-subtree-dir: lib/popup
git-subtree-split: 80829dd46381754639fb764da11c67235fe63282
2016-09-24 13:00:05 -05:00
John Miller
264c76451b Merge commit '5a48572880d2734088b4fd22a4d02197358c0c1c' as 'lib/fuzzy' 2016-09-24 12:59:47 -05:00
John Miller
5a48572880 Squashed 'lib/fuzzy/' content from commit 534d723
git-subtree-dir: lib/fuzzy
git-subtree-split: 534d723ad2e06322ff8d9bd0ba4863d243f698e7
2016-09-24 12:59:47 -05:00
John Miller
a4d5314c91 Merge commit 'e33f9155e06f99ca8ddc6b92437a329e40e562de' as 'lib/auto-complete' 2016-09-24 12:59:33 -05:00
John Miller
e33f9155e0 Squashed 'lib/auto-complete/' content from commit b0090a9
git-subtree-dir: lib/auto-complete
git-subtree-split: b0090a942f93824bcbe9a938217c665ea658eacd
2016-09-24 12:59:33 -05:00
John Miller
5ddc7a3015 Merge commit 'e42a64fd0e8dc35f044f16cd7b732f715985cb2c' as 'lib/websocket' 2016-09-24 12:59:21 -05:00
John Miller
e42a64fd0e Squashed 'lib/websocket/' content from commit 5675553
git-subtree-dir: lib/websocket
git-subtree-split: 567555360443f5de0a6426c5e2d88ba037c33855
2016-09-24 12:59:20 -05:00
John Miller
16e28bd513 Try using Paver for project management. 2016-09-24 12:59:01 -05:00
John Miller
b242519fa5 Merge branch 'master' into 38-fixing-testing 2016-09-24 12:26:24 -05:00
John Miller
71d8994ebb Undoing earlier bone-headedness
Finally getting Sam's PR right (sorry about that, Sam). Getting the
mocker subtree into the right place because apparently I cannot type.
2016-09-23 10:37:48 -05:00
John Miller
706ff2184a Merge branch 'pr/117' 2016-09-19 10:46:43 -05:00
John Miller
ed70a26700 Set local keymap for ein's derived modes. 2016-09-19 09:02:35 -05:00
John Miller
ef949a189d Revert "derived modes inherit from special-mode or view-mode as appropriate"
This reverts commit 99de3360c3.
2016-09-15 14:14:42 -05:00
Sam Steingold
6f23cf4536 make mouse-buffer-menu (C-mouse1) group ein buffers 2016-09-13 09:44:06 -04:00
Sam Steingold
4297ea0fc8 set and make-local-variable in one form
This is clearer and complies with the traditional Emacs coding style.
2016-09-13 09:33:25 -04:00
Sam Steingold
99de3360c3 derived modes inherit from special-mode or view-mode as appropriate
this means that the derived modes get all the standard keybinding in the standard way.
2016-09-13 09:32:31 -04:00
John Miller
f10d2896a2 Burn it up. 2016-09-11 22:35:40 -05:00
John Miller
808e629c0a I hate gitmodules. 2016-09-11 22:29:00 -05:00
John Miller
dd05d9680a Gitmodules: The final blow? 2016-09-11 22:20:17 -05:00
John Miller
a89414b2a2 Merge commit '13d3f30f34750be1d6d34c51c554dd07298be81e' as 'test/mocker' 2016-09-09 10:10:36 -05:00
John Miller
13d3f30f34 Squashed 'test/mocker/' content from commit a1ddf87
git-subtree-dir: test/mocker
git-subtree-split: a1ddf87150f67306ae8da927117063c75588be30
2016-09-09 10:10:36 -05:00
John Miller
123cbed8c1 More submodule cleanup. 2016-09-09 10:10:00 -05:00
John Miller
dddc3241a5 Merge commit 'f1e7656ed364431346bd49fc172f20e971026345' as 'doc/eldomain' 2016-09-09 10:07:58 -05:00
John Miller
f1e7656ed3 Squashed 'doc/eldomain/' content from commit d5b163a
git-subtree-dir: doc/eldomain
git-subtree-split: d5b163a761dd3bb239b68acc52ada269ef6fc3a1
2016-09-09 10:07:58 -05:00
John Miller
e98003f8fd Make zeroein.el work with subtrees 2016-09-09 10:07:35 -05:00
John Miller
b0c78fa3a0 Merge commit 'f878099318f8d8ac5d46c21bbfe3141b7cfdc7ea' as 'lib/ein-mumamo' 2016-09-09 09:49:42 -05:00
John Miller
f878099318 Squashed 'lib/ein-mumamo/' content from commit 028fefe
git-subtree-dir: lib/ein-mumamo
git-subtree-split: 028fefec499598add1a87b92ed991891f38f0c7b
2016-09-09 09:49:42 -05:00
John Miller
6f31d6acf2 Merge commit 'f5be42a2c9b1bba6ba486332e19b786727733e1b' as 'lib/request' 2016-09-09 09:49:16 -05:00
John Miller
f5be42a2c9 Squashed 'lib/request/' content from commit 1245013
git-subtree-dir: lib/request
git-subtree-split: 12450136785fe6ff8df940f9c0601406a9fd8bc9
2016-09-09 09:49:16 -05:00
John Miller
c7d93357db Merge commit '94a4ba57fa14e499119b927f424f67451abe96c6' as 'lib/ert' 2016-09-09 09:48:22 -05:00
John Miller
94a4ba57fa Squashed 'lib/ert/' content from commit ac402f1
git-subtree-dir: lib/ert
git-subtree-split: ac402f113ca96937f694b4e678d2fb76f965678f
2016-09-09 09:48:22 -05:00
John Miller
deb70570d2 Merge commit 'b431f57ce1440b220ff5cd0a8c5f87508cb51de7' as 'lib/markdown-mode' 2016-09-09 09:47:48 -05:00
John Miller
b431f57ce1 Squashed 'lib/markdown-mode/' content from commit 3f11a4a
git-subtree-dir: lib/markdown-mode
git-subtree-split: 3f11a4a7609ba2a507ee10f491bdadab28e9b985
2016-09-09 09:47:48 -05:00
John Miller
63eb899b8c Merge commit 'a23fd6fc2e04c68879fe50e6c8cac0ab86c55f7f' as 'lib/smartrep' 2016-09-09 09:45:44 -05:00
John Miller
a23fd6fc2e Squashed 'lib/smartrep/' content from commit f0ff5a6
git-subtree-dir: lib/smartrep
git-subtree-split: f0ff5a6d7b8603603598ae3045c98b011e58d86e
2016-09-09 09:45:44 -05:00
John Miller
a4851ec9be Merge commit '6a0a8e42aea35d40761c00684a7a5a9cfe41900c' as 'lib/pos-tip' 2016-09-09 09:45:24 -05:00
John Miller
6a0a8e42ae Squashed 'lib/pos-tip/' content from commit 051e08f
git-subtree-dir: lib/pos-tip
git-subtree-split: 051e08fec5cf30b7574bdf439f79fef7d42d689d
2016-09-09 09:45:24 -05:00
John Miller
1fbcb40897 Merge commit 'ab71b0be808bb0fb6199d7ca6433f6ac2bbc4cff' as 'lib/popup' 2016-09-09 09:44:43 -05:00
John Miller
ab71b0be80 Squashed 'lib/popup/' content from commit 80829dd
git-subtree-dir: lib/popup
git-subtree-split: 80829dd46381754639fb764da11c67235fe63282
2016-09-09 09:44:43 -05:00
John Miller
f825a20252 Merge commit '05dc8a1e43b0317d226ab621ab4f4d693cfd1906' as 'lib/fuzzy' 2016-09-09 09:44:24 -05:00
John Miller
05dc8a1e43 Squashed 'lib/fuzzy/' content from commit 534d723
git-subtree-dir: lib/fuzzy
git-subtree-split: 534d723ad2e06322ff8d9bd0ba4863d243f698e7
2016-09-09 09:44:24 -05:00
John Miller
45d07ff768 Merge commit '8517227c50f36c24326c947c2f978d4e653c19fc' as 'lib/auto-complete' 2016-09-09 09:44:01 -05:00
John Miller
8517227c50 Squashed 'lib/auto-complete/' content from commit b0090a9
git-subtree-dir: lib/auto-complete
git-subtree-split: b0090a942f93824bcbe9a938217c665ea658eacd
2016-09-09 09:44:01 -05:00
John Miller
43c8e14d5f Merge commit '6748f7c6d2c3fcb44c425dbe1936cd4b4e8f4aa3' as 'lib/websocket' 2016-09-09 09:40:54 -05:00
John Miller
6748f7c6d2 Squashed 'lib/websocket/' content from commit 5675553
git-subtree-dir: lib/websocket
git-subtree-split: 567555360443f5de0a6426c5e2d88ba037c33855
2016-09-09 09:40:54 -05:00
John Miller
f8ac0c737e Making git happy.
This is going to get ugly, I think.
2016-09-09 09:39:51 -05:00
John Miller
7b052f2e6a Trying git subtrees instead of submodules.
Submodules aren't a good fit for this development process, since heads
are always detached from remote repository.
2016-09-09 09:33:17 -05:00