Robert O'Connor
e9ff9f09c6
Remove trailing whitespace from all files
2017-03-26 13:06:43 -04:00
Ayush Goyal
b00096e9ef
Add transient state for smerge mode
2017-03-13 19:21:57 +02:00
syl20bnr
aaf2f7d535
github: move load-gh-pulls-mode to funcs.el
2017-02-09 18:00:32 -05:00
syl20bnr
b53a8957a1
github: add magithub
...
to opt-out simply add magithub to the dotspacemacs-excluded-packages variable
2017-02-06 22:48:38 -05:00
syl20bnr
fb27ede558
Bump year in copyright headers
...
Happy New Year 2017!
2017-01-05 23:08:17 -05:00
Justin Burkett
7bf00ad878
which-key: Update usage of replacement alists
...
See 19186917eb
2016-11-25 12:32:10 +02:00
zhexuany
19592f0ad5
fixed syntax highloght in README
2016-11-22 20:41:45 -05:00
Justin Humm
7172cd7170
Fixed dead hyperlink in magit intro
2016-11-20 18:53:31 -05:00
bmag
6e4442e0db
Rename and add missing definition of version-control-diff-side
2016-11-05 13:03:23 +02:00
Emmanuel Touzery
1176a23dff
version control: let the user pick on which side to display the diff
2016-11-05 12:43:51 +02:00
Muneeb Shaikh
5771484668
Move spacemacs/git-link-* functions to git layer
2016-10-17 18:52:55 +05:30
Eoin Houlihan
7464ef32e2
Use Magit 2.8's built-in fullscreen display function
2016-10-17 14:11:28 +02:00
Ryan Phillips
cd6b5ed67b
add magit-repolist support
...
fixes #7083
2016-10-17 14:07:58 +02:00
bmag
88e4ddf778
git: hook fci-mode only when fci package is used
2016-10-17 13:42:37 +02:00
Rory O’Kane
b7c84b5c35
Fix capitalization of “GitHub” in layer docs
2016-09-13 13:23:30 +03:00
Eivind Fonn
3ce6f41b1e
Fix version-control layer in daemon mode
2016-08-30 16:00:05 +02:00
Eivind Fonn
25eb00c24f
Update git layer rebase documentation
2016-08-19 10:10:09 +02:00
syl20bnr
0a01159572
git: add SPC g f h to get the commit history of the current file
2016-07-28 23:26:54 -04:00
Robert O'Connor
3ebdb1c0ec
github layer: fix table formatting in README
2016-07-26 22:58:34 -04:00
Robert O'Connor
74d6a6fcad
Revert #6576 ; TL;DR: We no longer need to do this.
...
See justbur/evil-magit#24 and 4a375ea304
2016-07-22 12:52:23 +03:00
d12frosted
5c371f0843
minor update to magit-gh-pulls documentation
...
- fix grammar
- add note about `# o` key binding
2016-07-14 14:26:06 +03:00
Robert O'Connor
7d5a9e0b0f
Fix magit-gh-pulls docs
...
- #g -> #r -- #g was not defined.
- add docs for getting s diff of the current PR
- wording fix
2016-07-14 06:15:07 -04:00
syl20bnr
afc6f8561e
version-control: change function prefix to spacemacs
2016-07-06 21:12:02 -04:00
Jeremy Bi
81626bee0b
Run diff-hl-magit-post-refresh
after committing
...
Otherwise `diff-hl-mode` still highlights uncommitted changes
2016-07-06 20:49:11 -04:00
syl20bnr
8f22e0c8c2
github: move clone command under SPC g h c prefix
2016-07-05 00:23:16 -04:00
syl20bnr
140e779735
git: add SPC g l prefix command name
2016-07-05 00:23:16 -04:00
syl20bnr
31be6c9b8e
github: remove commented code for helm-gist
...
This package seams to be abandonned and we have already gist.el
2016-07-05 00:23:16 -04:00
syl20bnr
316dc0765d
git: move git-link to git layer under SPC g l command prefix
...
git-link is aimed to work with various git hosting services so it makes
sense to move it back to git layer.
2016-07-05 00:23:16 -04:00
syl20bnr
b92daec7cf
git: remove all popup key binding for magit-dispatch-popup
...
The `SPC g` command prefix was to much overloaded for actions which
are already available in discoverable manner in magit. So I decided to
remove all the actions reachable from magit-dispatch-popup from `SPC g`.
magit-dispatch-popup is available under `SPC g m`. This increases the
key binding sequences but OTHO it makes everythings consistent (same
key sequence behind `SPC g s` and `SPC g m`) and we prefer consistency.
This refactoring free up a lot of precious key bindings we can use for
commands that are not available in Magit.
2016-07-05 00:23:16 -04:00
syl20bnr
3f54fa7832
Fix github layer missing parens
2016-07-05 00:23:16 -04:00
Ivan Malison
91b3f75c95
github: add github-search package
2016-07-05 00:23:16 -04:00
Ivan Malison
0bfade9d7d
github: Add bindings for the addition of remotes
...
`github-clone-add-existing-remote`, `github-clone-fork-remote`,
`github-clone-add-source-remote` come from the newest version of
github-clone and allow the easy addition of remotes to an existing
repository.
2016-07-05 00:23:16 -04:00
ralesi
10d2dce0be
Fixes #6051 , checks for existance of git-gutter.
2016-05-29 23:05:04 -04:00
syl20bnr
a2de9a63af
Use :toggle keyword instead of when forms
2016-05-29 22:39:21 -04:00
syl20bnr
1f993bddf6
Rename spacemacs-helm and spacemacs-ivy layers to helm and ivy
...
For ivy users: be sure to update your dotfile by replacing spacemacs-ivy
by ivy
2016-05-15 22:24:27 -04:00
Eivind Fonn
325067bc10
unimpaired: Move hunk commands to version-control
2016-05-06 13:27:44 +02:00
Robert O'Connor
55ebd1e679
git: add submodule popup keybinding
2016-05-06 13:04:06 +02:00
syl20bnr
07852abad5
Format documenation files with doc-fmt tool
2016-04-12 23:31:38 -04:00
syl20bnr
ad4e0d7817
perforce: fix duplicated :init and delete empty file config.el
2016-04-12 22:46:33 -04:00
Richard Kim
c2ebcc7d17
fix start up error if perforc layer is enabled
...
The fix is to move spacemacs/declare-prefix call out of config.el into
packages.el file of the layer. I don't know why this change fixes the
issue. I just made changes to perforce layer code to match what is done
in all other layers where the function is called within package.el
rather than in config.el.
2016-04-12 22:45:36 -04:00
Magnus Therning
5c575a7eb8
git: Add binding to magit-reset-popup
...
Signed-off-by: Magnus Therning <magnus@therning.org>
2016-04-08 17:43:35 +02:00
syl20bnr
ecffbb49e0
github: make git-link-commit works with git-timemachine
2016-04-07 22:51:47 -04:00
syl20bnr
4bc796c9e6
github: move some functions to funcs.el
2016-04-07 22:44:58 -04:00
syl20bnr
43bc88119b
github: replace the advice around git-link--branch by letf
2016-04-07 22:43:07 -04:00
Daniel Luna
4a6f2ff014
[github layer] git-link working as expected in git-timemachine buffers
...
This commit allows an user to run git-link in a git-timemachine bufer
and get the current revision instead of the latest commit in that
branch.
2016-04-07 22:27:41 -04:00
Lily
135fdfb612
github: Document how to configure your github OAuth token
...
This helps make the `github` layer work better
2016-04-04 22:39:50 -04:00
syl20bnr
173e2a5421
Move all prefix names from config.el to init functions
2016-04-03 00:12:28 -04:00
syl20bnr
3b0c1fd93d
Convert org doc files with doc-fmt
2016-03-30 22:59:55 -04:00
syl20bnr
82fdd9a511
Use evil in holy-mode
...
Motivation
While disabling Evil in holy-mode makes its implementation shorter and
sounds elegant on the paper, in practice it puts a big burden on the
configuration parts which need to know if Evil is enable or not. This is
a bad separation of concerns and the bunch of fixes that we were forced
to do in the past weeks shows this issue. Those fixes were about
removing the knowledge of the activation of Evil by implementing new
dispatching functions to be used by layers, this is cumbersome and makes
Spacemacs layer configuration more subtle which is not good. There was
additional bad consequences of the removal of Evil state like the
impossibility to use Evil lisp state or iedit states, or we would have
been forced to implement a temporary activation of Evil which is
awkward.
Instead I reintroduce Evil as the central piece of Spacemacs design thus
Evil is now re-enabled in holy-mode. It provides the abstraction we need
to isolate editing styles and be able to grow the Spacemacs
configuration coverage sanely. Layers don't need to check whether the
holy mode is active or not and they don't need to know if Evil is
available (it is always available). We also don't need to write
additional dispatching functions, this is the job of Evil, and I think
it provides everything for this. Ideally configuration layer should be
implemented with only Evil in mind and the holy-mode (and hybrid-mode)
should magically make it work for Emacs style users, for instance we can
freely use `evil-insert-state` anywhere in the code without any guard.
Evil is now even more part of Spacemacs, we can really say that
Spacemacs is Emacs+Evil which is now an indivisible pair. Spacemacs
needed this stable API to continue on the right track.
While these changes should be rather transparent to the user, I'm sorry
for this experimental period, I failed to see all the implications of
such a change, I was just excited about the possibility to make Evil
optional. The reality is that Spacemacs has to embrace it and keep its
strong position on being Emacs+Evil at the core.
Implementation
- insert, motion and normal states are forced to emacs state using an
advice on `evil-insert-state`, `evil-motion-state` and
`evil-normal-state` respectively. These functions can be used freely in
the layer configuration.
- A new general hook `spacemacs-editing-style-hook` allow to hook any
code that need to be configured based on the editing style. Functions
hooked to this hook takes the current style as parameter, this
basically generalize the hook used to setup hjkl navigation bindings.
- ESC has been removed from the emacs state map.
- Revert unneeded changes
- Revert "evil: enter insert-state only from normal-state"
commit bdd702dfbe
.
- Revert "avoid being evil in deft with emacs editing style"
commit f3a16f49ed
.
Additional changes
All editing style packages have been moved to a layer called
`spacemacs-editing-styles`
Notes
I did not have time to attack hybrid mode, I should be able to do it
later.
2016-03-13 21:16:55 -04:00
Muneeb Shaikh
f903460994
source-control: git-timemachine goto nth revision
...
Allows you to goto arbitrary revision by inputting rev number. e.g. To
goto 1st revision of the file, enter 1.
2016-03-12 17:51:50 +01:00
Johan K. Jensen
be2c471397
Fix inline code blocks
...
Add zero-width space because emphasis blocks can't start/end with
a comma, an apostrophe or a quote.
2016-03-01 18:51:13 +01:00
Eivind Fonn
16d8c24a30
Fix error message in vcs trans-state
2016-02-09 21:29:44 +01:00
person808
ba30c06754
Fix git-gutter linum setup.
2016-02-07 15:01:46 +01:00
Balaji Sivaraman
2b1ed603dc
Change all references of micro-state in codebase to transient-state
2016-01-31 23:04:47 -05:00
syl20bnr
de44ab15ba
git: revert git blame transient state to micro state
...
To work this transient state needs to support a function as a
`:exit` value.
2016-01-26 01:21:01 -05:00
justbur
d2582fceec
transient-state: Improve some docs
2016-01-26 01:21:01 -05:00
justbur
e97af03ff7
Call new micro-state a transient state
2016-01-26 01:21:00 -05:00
justbur
3862c6ef36
vc: Translate vcs micro-state and fix bug
...
There's no diff-hl-margin-minor-mode function
2016-01-26 01:20:59 -05:00
justbur
7b819fff5e
git: Translate time-machine and git-blame micro-states
2016-01-26 01:20:59 -05:00
Ken Wu
fb3f548fe8
Fix bugs when version-control-diff-tool = diff-hl
...
The original code is confused by diff-hl-mode and diff-hl-margin-mode.
This modification fixes all typos due to the confusion.
2016-01-23 17:21:13 +01:00
Robert O'Connor
c0e0702430
bind SPC gA to magit-cherry-pick-popup
2016-01-23 17:15:02 +01:00
Robert O'Connor
f86ec0e047
add magit-rebase-popup command to init function
2016-01-23 17:13:00 +01:00
Fabien Dubosson
9ab4ddb3b5
Correct alignment in git's layer README
2016-01-21 21:53:52 +01:00
Christoph Neuroth
1d76daeef7
Bind SPC g r to magit-rebase-popup
2016-01-21 21:53:52 +01:00
syl20bnr
046d86800c
Clean copyrights and update for year 2016
2016-01-11 21:42:17 -05:00
justbur
b0ee301845
layers: Conditionally load helm packages
...
Only use them when the spacemacs-helm layer is used.
2016-01-09 13:36:03 -05:00
syl20bnr
cddf18ff1e
Update install layer section in REAMDE.org files
2016-01-06 00:21:55 -05:00
Robert O'Connor
7dcbde1a95
Add push to matching branch to git layer README
2016-01-03 23:57:17 -05:00
scloudyy
ef5bea1207
Fix push/pull keybindings in git README
2016-01-03 14:17:45 +01:00
Fabien Dubosson
374e37e32c
Add information about global-git-commit-mode
...
Fix #2522
2015-12-21 13:56:38 +01:00
justbur
0b02475772
Use built-in evil functions to set default states
...
evil-set-initial-state is safer than manually adding and deleting from
the lists, because it knows about all available states and ensures that
the mode only shows up in one list. If it is in multiple list the
initial state depends on which is checked first, which we don't want.
2015-12-21 00:22:18 -05:00
syl20bnr
e3a816b37d
org: move orgit to git layer and add documenation
2015-12-20 01:02:12 -05:00
dptd
0144b39a3b
removed unnecessary white char
2015-12-12 23:02:53 -05:00
syl20bnr
086c11af2c
git: add SPC m a for with-editor-cancel
2015-12-09 00:53:33 -05:00
justbur
01b9b29d0b
with-editor: Update keys for c-c c-c convention
...
Add `,,` for finish and use `,k` for cancel instead of `,a`.
2015-12-09 00:52:50 -05:00
syl20bnr
410d3d9572
git: add gr and GR bindings to evilfiied magit buffers
...
since magit uses keymap text properties we need to explicitly define
them in each section keymap. Could be refactored a bit.
2015-12-08 02:10:06 -05:00
Eivind Fonn
f3815505af
Add documentation for emacs-style vc binding
2015-12-07 19:49:27 +01:00
Muneeb Shaikh
e6f3835add
vc: add emacs style [p]revious binding for prev-hunk
2015-12-07 19:44:27 +01:00
Eivind Fonn
b943d00ae4
Remove magit-push-always-verify documentation
...
It was removed upstream: 9e4f84f631
2015-12-07 11:23:24 +01:00
syl20bnr
4d357cf001
git: enable gravatars in magit buffers
...
The default value is nil since magit 2.3.0
2015-12-06 20:19:44 -05:00
syl20bnr
6fd2af2af3
evilified-state: support for magit remap entries in section maps
...
Add :pre-bindings keyword argument used to restore explicit key binding
in section maps.
2015-12-06 01:04:13 -05:00
Eivind Fonn
c893383fe4
Fix some documentation bugs
...
- CSS links
- GIFS in published version
- Unify layer doc titles
- Change emoji layer emojis to an image
2015-12-03 23:50:29 -05:00
ralesi
993300ce4d
Fix loading of git gutter fringes.
2015-12-03 23:48:25 -05:00
Fabien Dubosson
b7eb9f52fa
Fix a typo in `version-control' README
2015-12-03 13:49:09 +01:00
Eivind Fonn
87b6d3fbe9
Fix vcs microstate documentation
2015-12-01 12:45:37 +01:00
syl20bnr
22cba50ab6
git: move stage/unstage commands to SPC g S
and SPC g U
2015-12-01 01:43:29 -05:00
syl20bnr
74bc25c32c
git: add autoloads for popup functions
2015-12-01 01:43:01 -05:00
ralesi
3fb775877b
Update git bindings. Make use of popup.
2015-12-01 01:37:48 -05:00
Eivind Fonn
1e63a4a009
Fix diminish timing of git gutter packages
2015-12-01 01:19:30 -05:00
syl20bnr
c6e625882f
version-control: move SPC T D
to SPC T C-d
...
By convention.
2015-11-29 23:08:38 -05:00
syl20bnr
a41308d528
version-control: convert newlines to unix format
2015-11-29 23:03:38 -05:00
syl20bnr
b843b77f32
version-control: minor changes to respect 80th column
2015-11-29 23:00:57 -05:00
ralesi
792d4471e7
VCS micro-state / Customizable diff margins
2015-11-29 22:44:18 -05:00
Chris Perkins
d99259bcd5
Add some missing which-key prefixes
2015-11-29 12:12:43 +01:00
syl20bnr
a19c0f3d24
core: remove spacemacs/set-key funcs and add a new pre-command-hook
...
This pre-command-hook translates the special key to the corresponding
emacs function key. This effects only happens in terminal, this hook is
a no-op in GUI.
By doing this we attempt to bring more consistency between the GUI
and the terminal regarding TAB and RET keys.
2015-11-28 23:11:48 -05:00
justbur
53e2c9ac27
layers: Fix leader key in some modes
...
Specifically need to be concerned with modes that make their maps
overriding.
1. dired
2. evil-magit
2015-11-21 18:22:51 +01:00
justbur
9befd20a1a
layers: Transition to new key bindings functions
...
Removes dependence on evil-leader centralizing control over the method
of key binding in core-keybindings.el
2015-11-21 18:22:51 +01:00
Eivind Fonn
e7fbc84ff0
Remove package guards for evilified
...
See discussion in #3879
2015-11-21 11:07:14 +01:00
syl20bnr
f95422c61d
git layer: remove obsolete test since the package is protected
2015-11-19 00:56:25 -05:00
syl20bnr
e3df025eff
evilified-state: fix tests and rename library to evil-evilified-state
2015-11-19 00:24:27 -05:00
justbur
b294461957
evilified-state: Make into local package
2015-11-18 23:35:01 -05:00
Eivind Fonn
c3866382b2
Documentation update
...
- Add #+HTML_HEAD_EXTRA options to all org files
- HTMLize published documentation via CSS
2015-11-13 14:23:13 +01:00
justbur
951462f316
evil-magit: Update for MELPA
2015-11-09 18:44:31 +01:00
syl20bnr
96e7c8ee86
git and github: reorganize key bindings
...
gd is now "diff"
gh is now "github"
gg is not changed for "github gist" (updated the prefix name)
Inverts gc and gC since commit is more frequent than checkout
2015-11-02 00:16:13 -05:00
Christoph Paulik
9bcd40b7b0
Add github-clone to github layer
...
- allows cloning and forking from within emacs
2015-11-01 23:44:18 -05:00
Eivind Fonn
13c5b1d24b
Convert documentation to publishable format
2015-11-01 23:40:29 -05:00
Pierre Radermecker
5831b841ee
Add magit-checkout binding
...
This is particularly useful to switch from one branch to another without
going through the status buffer for instance.
2015-10-31 14:07:00 +01:00
Bar Magal
16611a53d8
Update code to show magit buffers in full screen
2015-10-31 13:50:43 +01:00
justbur
01d1231ac9
git: Don't use evil-magit for emacs editing style
2015-10-29 12:22:10 -04:00
justbur
49c1f76939
git: Update git readme for evil-magit
2015-10-29 12:22:02 -04:00
justbur
150e38e76c
git: Add new evil-magit bindings
...
Also turn off evilification for magit conditional on the evil-magit
package being used.
2015-10-29 09:17:44 -04:00
Robert O'Connor
f60f96ca38
git: Update docs for magit-gitflow
2015-10-25 10:41:38 +01:00
syl20bnr
f7139a4167
git: add doc for SPC g i
2015-10-22 21:43:05 -04:00
Diego Berrocal
d516553634
Add magit-init to keybindings
...
I noticed that magit-init is a faster way of initializing vcs maintained
projects.
2015-10-22 21:41:28 -04:00
Muneeb Shaikh
f4fc2a7781
Fix magit-gh-pulls and magit-gitflow keys
...
Remap gh-pulls on `#` and gitflow on `%`
This breaks the old keybindings of `magit-gitflow` which was `#f`
previously.
2015-10-22 18:16:44 -04:00
syl20bnr
2b038b2046
git: move gh-pulls bindings from #g to #
...
`#` is now the official binding for gh-pulls
Resolves #3481
2015-10-21 16:58:39 -04:00
syl20bnr
55bc0815c8
git: make git-timemachine enter function idempotent
...
And make it possible to deactivate the micro-state on a different
buffer than the git-timemachine buffer
2015-10-19 21:21:31 -04:00
syl20bnr
3e5acbea80
git: better exit function for magit-blame micro-state
2015-10-19 21:21:01 -04:00
syl20bnr
7107ea5ffa
git: make SPC g b (magit-blame) idempotent
...
Fixes #3467
2015-10-19 21:10:25 -04:00
syl20bnr
0108329f5b
git: simplify the git-timemachine micro-state on enter action
2015-10-18 23:39:07 -04:00
syl20bnr
bf7d9a40b4
git: new magit-blame micro state
2015-10-18 23:37:50 -04:00
Adam Olsen
a90df74e1b
Bind SPC g B
to 'magit-blame-quit
2015-10-18 22:36:07 -04:00
justbur
bfd360440f
doc: Be consistent with ref to Spacemacs
...
Use of =Spacemacs= vs Spacemacs is inconsistent. This picks Spacemacs as
a convention
2015-10-14 00:32:09 -04:00
person808
c1b6293268
Replace eval-after-load
with with-eval-after-load
.
...
We now backport the macro for 24.3 so we can use it everywhere.
2015-10-07 15:51:39 -04:00
Diego Berrocal
33cd5097ff
Fix typo with ~= in the doc
2015-10-07 15:51:39 -04:00
Eivind Fonn
8d1c7c8c20
Document v/V discrepancy in magit
...
Fix #2476
[ci-skip]
2015-10-05 12:07:45 +02:00
Eivind Fonn
31ec9091cc
Document magit update key
...
Fix #2826
[ci-skip]
2015-10-05 12:07:45 +02:00
Carl Lange
8b6517a9be
Fix a typo, githib->github
2015-09-29 21:36:55 -04:00
syl20bnr
383b1bec20
Update dotspacemacs/config and dotspacemacs/init occurrences
2015-09-28 02:05:18 -04:00
Muneeb Shaikh
1fc73d671f
Evilify magit-stash-mode
2015-09-19 18:44:32 -04:00
justbur
6eab954afe
Use + instead of ! for layer categories
...
Helm seems to treat "!" specially in pattern matching, so having a ! in
the pattern string when traversing directories is problematic. This
change fixes #2737 , because as far as I can tell "+" has no special
meaning in a helm pattern.
Of course, we can choose a different character, but I'm fond of "+" as
representing "more layers here".
2015-09-11 00:13:51 -04:00