Commit graph

64 commits

Author SHA1 Message Date
bmag
99b355e2fa Adapt for Magit's move to Transient
Magit now uses Transient instead of magit-popup, and we must adapt. Also had to
replace the recently removed magit-diff-buffer-file-popup with
magit-diff-buffer-file (similar but doesn't offer a popup before displaying the
diff).

Note some upstream packages haven't adapted to this change, but when they do we
might need similar fixes:
- magithub
- magit-gitflow
- magit-svn
2019-02-16 10:21:45 -05:00
Voleking
a8567cbed3 Fix diff-hl-highlight function is set to nil 2019-01-20 17:12:53 +02:00
emacspace
45276bd96f documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
emacspace
4912b54f24 documentation formatting: Mon Nov 12 22:12:39 UTC 2018 2018-11-12 22:24:27 +00:00
yuhan0
0596e90c3d Add 'z' recenter bindings for various transient states
By analogy with the "zz", "zb", "zt" vim / evil bindings, this adds an
additional key binding "z" for `recenter-top-bottom` to the following
transient states which navigate around the buffer in large jumps:
- auto-symbol-highlight
- error
- buffer
- vcs
- org-babel

This allows for repositioning of the buffer for visibility without having to
exit the transient state.

Minor updates are also made to documentation of other transient states.
2018-11-12 21:47:17 +00:00
JAremko
cd39f80c24 Reformat documentation 2018-10-11 00:13:43 +03:00
syl20bnr
666671a881 Sort key bindings alphabetically in version-control README.org 2018-06-24 02:54:07 -04:00
Masayuki Takemura
ce6e28601f diff-mode: define key bindings with leader key for vim editing style
This patch defines key bindings with leader key instead of evilified state to
make it easier for people those who edit in vim style to use diff-mode for both
of editing and reviewing files/buffers.

There are two use cases for diff-mode:

(1) to manually edit diff in a patch file
(2) to review diff that is generated by `vc-diff' or similar commands

The evilified state is useful for the case (2), but is confusing for the
case (1). Usually, users of vim editing style expect that they are in normal
state when a new buffer is created. However, when evilified state is used for
the case (1), some keys insert their character in a buffer, which let the users
think they are in insert state and keep hitting keys to edit the buffer, while
other keys invoke commands or change contents of buffer, which let them think
they are in normal state, so finally the user get lost what state they are in if
they don't know evilified state is used for diff-mode.

The changeset 58d521af5 "Unbreak diff-mode", originally written on Apr 2 2017,
tried to avoid the confusion by removing the evilified state configuration.
However, it is overwritten by the other and older changeset 8009e1bf5 "evilify
vc-* buffers", which is written on Feb 22 2016, for some reason.

This patch respects both of the use cases listed above, thus defines key
bindings with leader key instead of just removing the evilified state
configuration.
2018-06-24 02:54:07 -04:00
syl20bnr
acfc8c5814 version-control: correctly defer diff-hl and git-gutter packages 2018-06-14 10:08:38 -04:00
syl20bnr
31324f68bb Avoid loading all the diff packages in version-control layer 2018-06-14 02:51:24 -04:00
syl20bnr
c3c7249234 Delay diff-hl loading by 5 seconds 2018-06-14 02:28:10 -04:00
syl20bnr
c41a122b24 Lazy load diff-hl 2018-06-10 23:30:48 -04:00
syl20bnr
ebe4c60264 Revert "Defer packages by default using use-package-always-defer"
This reverts commit 29c78ce841 and all other fixes
that have been made afterwards.

The motivation is that use-package is seen by many as a replacement for
`require`. Is use-package always defer the loading of packages then is breaks
this use case, this does not respect POLA so even if it was making Spacemacs
loading faster (up to 3s faster on some startup on my machine) we just cannot
use it, it would be irresponsible. Spacemacs should be easy to use, loading
performance will come with time but it is not a priority.
2018-03-03 23:40:10 -05:00
syl20bnr
29c78ce841 Defer packages by default using use-package-always-defer
Warning now `:defer t` is implied, to force a package to load `:demand t` is
now necessary.
2018-02-27 23:32:52 -05:00
syl20bnr
83a6778eab Lazy load diff-hl and move lsp-ui-mode hook 2018-02-27 23:32:52 -05:00
JAremko
d2c3b847d8 doc fmt 2018-01-27 16:57:39 +02:00
denin
8009e1bf50 evilify vc-* buffers 2018-01-20 10:54:40 -05:00
syl20bnr
326965d4ce Happy New Year 2018! 2018-01-04 02:00:25 -05:00
CeleritasCelery
e32acfbf3b Fixed feature header 2017-08-29 20:00:44 +03:00
bmag
433ae7c30b git-gutter: remove redundant arg for timer 2017-08-11 23:56:24 +03:00
Aaron Jensen
d47066611b Defer git-gutter loading
As it was, git-gutter and git-gutter+ get started as soon as emacs starts if
they're enabled. This added about 500ms to startup time on my machine, so this
will instead defer it until emacs has been idle for 5 seconds.
2017-08-11 23:56:24 +03:00
syl20bnr
e2e532bb49 core: change <function>p to <function>-p suffixes for consistency
Also defined aliases for backward compatibility with `usedp` functions.
2017-07-02 10:09:39 -04:00
JAremko
6c5a0b2b14 update docs to the new toc-org format 2017-05-22 18:35:37 +03:00
Steven Allen
58d521af51 Unbreak diff-mode
diff-mode is for *editing* diffs. Defaulting to evilified state and binding j/k
breaks this.

You can still use TAB/S-TAB to navigate through hunks.
2017-05-19 16:58:01 +02:00
JAremko
c1e4556882 Format and cleanup docs. Fix links. 2017-04-28 23:29:14 -04:00
Bryan Gilbert
45a7740215 remove automatic call to linum-setup when using git-gutter 2017-04-28 22:52:24 -04:00
JAremko
c277c9716b add browse-at-remote 2017-03-30 22:15:23 -04:00
Ayush Goyal
b00096e9ef Add transient state for smerge mode 2017-03-13 19:21:57 +02:00
syl20bnr
fb27ede558 Bump year in copyright headers
Happy New Year 2017!
2017-01-05 23:08:17 -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
Eivind Fonn
3ce6f41b1e Fix version-control layer in daemon mode 2016-08-30 16:00:05 +02: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
ralesi
10d2dce0be Fixes #6051, checks for existance of git-gutter. 2016-05-29 23:05:04 -04:00
Eivind Fonn
325067bc10 unimpaired: Move hunk commands to version-control 2016-05-06 13:27:44 +02:00
syl20bnr
07852abad5 Format documenation files with doc-fmt tool 2016-04-12 23:31:38 -04:00
syl20bnr
3b0c1fd93d Convert org doc files with doc-fmt 2016-03-30 22:59:55 -04: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
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
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
syl20bnr
046d86800c Clean copyrights and update for year 2016 2016-01-11 21:42:17 -05:00
syl20bnr
cddf18ff1e Update install layer section in REAMDE.org files 2016-01-06 00:21:55 -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
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