Commit Graph

75 Commits

Author SHA1 Message Date
Jonas Bernoulli
54a89c2be3 Merge branch 'layer/magit-directors-cut' into layer/all 2018-01-11 12:10:53 +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
ce3cbaf665 Merge branch 'master' into layer/all 2017-12-21 03:21:12 +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
26bf0e8114 Merge branch 'layer/magit-directors-cut' into layer/all 2017-11-27 12:45:41 +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
b41bbf7b65 Merge branch 'layer/magit-directors-cut' into layer/all 2017-09-19 19:02:27 +02:00
Jonas Bernoulli
2325e4b4a9 magit: add ~/.emacs.d and drones to magit-repository-directories 2017-09-19 19:02:02 +02:00
Jonas Bernoulli
5fb0760cfd Merge branch 'elisp' into all 2017-08-05 00:29:01 +02:00
Jonas Bernoulli
b6ef6e737e Merge branch 'magit-directors-cut' into all 2017-08-05 00:27:53 +02:00
Jonas Bernoulli
1bd80dd58b copyright: add copyright-update to before-save-hook
You should also set `copyright-names-regexp' or this will quickly
get annoying.  Some other variables you might want to set include
`copyright-year-range' and `copyright-limit'.
2017-08-05 00:26:01 +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
c5ac017051 Merge branch 'essentials' into all 2017-07-26 23:08:57 +02:00
Jonas Bernoulli
3bdb26373f epkg: no longer set epkg-repository explicitly
Updated `no-littering' puts that repository in "var/" already, so
we do not have to do that anymore.  However a user (i.e. me) might
want to put that repository yet somewhere else and to enable that
`no-littering' has to be loaded before `epkg' is configured, so
switch the positions of the two `use-package' forms.
2017-07-26 23:05:52 +02:00
Jonas Bernoulli
d39d1ce2f3 Merge branch 'magit-directors-cut' into all 2017-07-26 22:39:19 +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
fe5eed9be4 Merge branch 'cosmetics' into all 2016-12-14 15:55:29 +01:00
Jonas Bernoulli
539c5a0eec Assimilate mode-line-debug 1.2.2 2016-12-14 15:51:00 +01:00
Jonas Bernoulli
a1347b4cec Assimilate hl-todo 1.7.4 2016-12-14 15:49:00 +01:00
Jonas Bernoulli
3f9053043f Assimilate morlock 1.0.1 2016-12-14 15:48:00 +01:00
Jonas Bernoulli
c628c908f8 Assimilate paren-face 1.0.2 2016-12-14 15:47:00 +01:00
Jonas Bernoulli
00888edfdc Assimilate dim-autoload 2.0.0 2016-12-14 15:46:00 +01:00
Jonas Bernoulli
bb5a3c71f4 Assimilate fill-column-indicator v1.87 2016-12-14 15:44:00 +01:00
Jonas Bernoulli
68bf735c75 Merge branch 'essentials' into all 2016-12-14 15:22:36 +01:00
Jonas Bernoulli
cc2ab2531a Assimilate undo-tree release/0.6.6-4-g597575e3 from emacsg 2016-12-14 15:08:00 +01:00
Jonas Bernoulli
5184a05f7c Assimilate no-littering v0.5.1 2016-12-14 15:07:00 +01: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