73 Commits

Author SHA1 Message Date
Jonas Bernoulli
93f1f28c63 Assimilate forge v0.1.0-27-gfd33db0 2018-12-27 13:10:47 +01:00
Jonas Bernoulli
dcb1893fba Remove magithub and dependencies
Remove apiwrap
Remove ghub+
Remove magithub
Remove s
2018-12-27 13:07:24 +01:00
Jonas Bernoulli
043cd94e14 Merge branch 'master' into layer/magit-directors-cut 2018-12-27 12:54:21 +01:00
Jonas Bernoulli
1de7198d71 auto-compile: No longer inhibit when HEAD is detached 2018-12-27 12:47:34 +01:00
Jonas Bernoulli
dece7f36ea Merge branch 'master' into layer/magit-directors-cut 2018-06-23 22:47:29 -05:00
Jonas Bernoulli
ba5ffda542 Revert "Emacsg: init: Silence bogus warnings on newer Emacsen"
This reverts commit 17f4770a18e8d93d0e6773193d421cb595dae29a.
2018-06-23 16:32:05 -05:00
Jonas Bernoulli
e10fe6ba90 magit: Don't enable global-magit-file-mode again
This mode is now enabled by default.
2018-05-21 20:32:00 +02:00
Jonas Bernoulli
9c9250e008 magit: Leave mode lighters unchanged 2018-03-27 20:59:08 +02:00
Jonas Bernoulli
d6dd3b8d75 Assimilate magithub 0.1.5-109-g2dcadcc and dependencies
Update apiwrap       to  0.4-7-gd80ae8d
Update ghub+         to  0.2.1-12-gec82120
Update magithub      to  0.1.5-109-g2dcadcc
Update markdown-mode to v2.3-167-g668de4a
Update s             to  1.12.0-8-g5968b95
2018-03-27 20:41:25 +02:00
Jonas Bernoulli
f1ae88215a magit: Collapse stashes using magit-section-initial-visibility-alist 2018-03-02 22:32:59 +01:00
Jonas Bernoulli
12305cd7b1 magit: Use magit-{previous,next}-line 2018-03-02 22:32:59 +01:00
Jonas Bernoulli
4349f76631 magit: Show gravatars 2018-03-02 22:27:00 +01:00
Jonas Bernoulli
7cfa3317f5 Remove magit-rockstar
Magit-Rockstar is obsolete.  Magit now provides better
replacements for the main commands from Magit-Rockstar.
2018-03-02 22:25:29 +01:00
Jonas Bernoulli
00b42b003b Merge branch 'master' into layer/magit-directors-cut 2018-03-02 22:24:41 +01:00
Jonas Bernoulli
5420d5312f custom: Do not require
This prevents `custom.el' from being loaded again when compiling
`init.el'.  Preventing that is necessary because the use face would
otherwise be reloaded, which would undo all changes to faces that
were done using `set-face-attribute' or similar.
2018-02-09 20:51:17 +01:00
Jonas Bernoulli
937576cb82 Merge branch 'master' into layer/magit-directors-cut 2018-01-29 11:17:15 +01:00
Jonas Bernoulli
308b112d18 save-place: don't enable save-place-mode on Emacs 24 2018-01-17 17:39:03 +01:00
Jonas Bernoulli
8248513177 eldoc: don't enable global-eldoc-mode on Emacs 24 2018-01-17 17:37:47 +01:00
Jonas Bernoulli
7ac2bf1f73 magit-rockstar: Place magit-rockstar more nicely 2018-01-11 12:09:00 +01:00
Jonas Bernoulli
58aeeea86c magit-rockstar: Don't add magit-branch-pull-request to popup
That command is now defined in Magit itself
and a member of `magit-branch-popup' by default.
2018-01-11 12:08:00 +01:00
Jonas Bernoulli
63daede5e7 magit: Don't require confirmation for magit-stash-{pop,drop} 2018-01-11 12:07:00 +01:00
Jonas Bernoulli
bbc47f3a62 magit: Add magit-insert-worktrees to magit-status-sections-hook 2018-01-11 12:06:00 +01:00
Jonas Bernoulli
c4261d777c Merge branch 'master' into layer/magit-directors-cut 2017-12-21 03:21:37 +01:00
Jonas Bernoulli
17f4770a18 Emacsg: init: Silence bogus warnings on newer Emacsen
I mean, what am I supposed to do here?  26.1 doesn't
want to use `if-let' and 25.3 doesn't have `if-let*'.
2017-12-21 03:15:00 +01:00
Jonas Bernoulli
a2973a87e1 Emacsg: init: Suppress package.el more reliably 2017-12-21 03:14:00 +01:00
Jonas Bernoulli
544cab0657 magit: go back to magit-insert-unpulled-from-upstream
No longer replace `magit-insert-unpulled-from-upstream'
with `magit-insert-unpulled-from-upstream-or-recent' on
`magit-status-section-hook'.  The latter is an obsolete
alias for the former now.
2017-11-27 12:40:30 +01:00
Jonas Bernoulli
8cf374b249 magit: add new magit-insert-modules to magit-status-sections-hook
Instead of adding various `magit-insert-modules-*' functions directly.
2017-11-27 12:29:56 +01:00
Jonas Bernoulli
2325e4b4a9 magit: add ~/.emacs.d and drones to magit-repository-directories 2017-09-19 19:02:02 +02:00
Jonas Bernoulli
a2bb8ddf9d magit: add magit-insert-modules to magit-status-sections-hook
... instead of all the module sections individually.
This new inserter is a wrapper around all those sections.
2017-08-05 00:09:42 +02:00
Jonas Bernoulli
f0f097c406 use-package: use :after where appropriate 2017-07-26 22:38:22 +02:00
Jonas Bernoulli
facc564d0e magit-rockstar: add magit-branch-pull-request to magit-branch-popup
... instead of to magit-pull-and-fetch-popup.  Most users don't
use the latter popup at all.  Also `magit-branch-pull-request'
was updated and is now much better suited for the branching popup.
2017-07-26 22:36:33 +02:00
Jonas Bernoulli
c935228a2a magit: update margin configuration for v2.9 2016-12-08 00:34:35 +01:00
Jonas Bernoulli
74402a30b1 magit: use magit-visit-ref in magit-refs-mode
It's no longer necessary to use `magit-show-commit' to get consistent
behavior in `magit-refs-mode' because as of v2.9 `magit-visit-ref'
defaults to behave just like `magit-show-commit'.
2016-12-08 00:34:29 +01:00
Jonas Bernoulli
d314247581 magit: show just commit age in margin of log buffers
Previously we disabled the margin in log buffer by setting
`magit-log-show-margin' to `nil'.  That variable has been
replaced with `magit-log-margin', which also allows showing
just the commit age instead of both the author and the age.
That seems like a good compromise.
2016-11-30 21:15:38 +01:00
Jonas Bernoulli
b3aa803a16 magit: drop redundant settings
The default values of `magit-popup-use-prefix-argument' and
`magit-popup-show-common-commands' are now identical to the
values we used to set here.
2016-11-28 19:27:44 +01:00
Jonas Bernoulli
5eac5dfcd5 Merge branch 'master' into magit-directors-cut 2016-11-28 19:26:03 +01:00
Jonas Bernoulli
dd13e1db75 text-mode: fix configuration 2016-11-28 18:33:06 +01:00
Jonas Bernoulli
a5196ddae8 git-commit: no longer set value of two variables
The function on `git-commit-finish-query-functions' by default no longer
complains about "too long" summary lines (which is why we set this to
nil before) but it still complains about non-empty second line (which is
a good thing).

The default value of `git-commit-summary-max-length' has been increased
from 50 to 68, which is close enough to the 64 we used here before.
2016-10-15 14:35:28 +02:00
Jonas Bernoulli
453b69ea0c magit: set magit-branch-adjust-remote-upstream-alist 2016-10-05 13:16:39 +02:00
Jonas Bernoulli
30451dc2d9 term: call home with editing needs 2016-09-15 09:59:35 +02:00
Jonas Bernoulli
11eb614e07 shell: call home with editing needs 2016-09-15 09:59:14 +02:00
Jonas Bernoulli
3d77a7c746 magit: use magit-pull-and-fetch-popup 2016-09-15 09:58:21 +02:00
Jonas Bernoulli
8c8c293242 Assimilate magit-rockstar v1.0.4 2016-09-02 23:41:00 +02:00
Jonas Bernoulli
4c72aeb908 ediff: use a single frame
That's the safe default, which works for users of tiling window
managers.
2016-09-02 23:40:00 +02:00
Jonas Bernoulli
0c09dbd3f6 smerge-mode: don't ignore whitespace 2016-09-02 23:39:00 +02:00
Jonas Bernoulli
dec8dd8f2f Magit the director's cut 2016-09-02 23:38:00 +02:00
Jonas Bernoulli
f08084b363 lisp-interaction-mode: indent using spaces
Many users set `indent-tabs-mode' global value to nil.  And I agree with
those users, this should have been the default.  But the reality is that
it isn't the default.

If you change the default locally, then your default is different from
the "default default", which is a problem because most files that were
authored by people who prefer to use tabs do NOT explicitly set the
file local value to t, because that doing so would (theoretically) be
redundant.

If you do set `indent-tabs-mode' to nil despite this, then you will end
up using spaces for indentation in files whose author decided to use
tabs.  What I do instead is to set the file-/buffer-local value for all
files whose author I am.  That's a bit inconvenient, but if I didn't do
that then I would have to check every contributions for tabs.
2016-05-17 18:46:00 +02:00
Jonas Bernoulli
34217222ed emacs-lisp-mode: enable outline-minor-mode and reveal-mode 2016-05-17 18:45:00 +02:00
Jonas Bernoulli
73d93703ce text-mode: indicate buffer boundaries 2016-05-17 18:44:00 +02:00
Jonas Bernoulli
bd04355f42 prog-mode: indicate buffer boundaries 2016-05-17 18:43:00 +02:00