163 Commits

Author SHA1 Message Date
Jonas Bernoulli
87c14d645b Merge branch 'master' into layer/magit-directors-cut 2018-03-27 20:35:47 +02:00
Jonas Bernoulli
11330a8065 Update 12 drones
Update auto-compile to  1.4.3
Update borg         to v2.0.0-54-gb03e8d1
Update closql       to v0.5.1-2-gbfd5a5e
Update dash         to  2.13.0-69-g87d5fea
Update epkg         to v3.0.0-32-g432312b
Update ghub         to v2.0.0
Update git-modes    to  1.2.7
Update magit        to  2.11.0-608-g4b9386cd6
Update magit-popup  to v2.12.2-7-g907f40a
Update packed       to  3.0.0
Update use-package  to  2.3-372-g592c3fb
Update with-editor  to v2.7.1-7-gff3e969
2018-03-27 17:50:41 +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
524ab3fe3d Update 2 drones
Update magit-imerge to v0.2.0-4-g79a2fcc
Update orgit        to v1.5.0
2018-03-02 22:24:52 +01:00
Jonas Bernoulli
00b42b003b Merge branch 'master' into layer/magit-directors-cut 2018-03-02 22:24:41 +01:00
Jonas Bernoulli
1f27169059 Update 7 drones
Update borg        to v2.0.0-43-g01e9720
Update epkg        to v3.0.0-30-gbc78f60
Update ghub        to v1.3.0-49-ga98da28
Update git-modes   to  1.2.6-1-g8ca6595
Update magit       to  2.11.0-574-g8d8b351d2
Update magit-popup to v2.12.2-2-g48cf02b
Update with-editor to v2.7.1-2-gfcbccec
2018-03-02 21:41:05 +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
935483742c Update 6 drones
Update dash        to  2.13.0-67-g48a5015
Update diff-hl     to  1.8.4-16-g190622d
Update emacsql     to  2.0.2-17-g75ac044
Update ghub        to v1.3.0-42-gb267bb6
Update magit       to  2.11.0-513-g153001052
Update use-package to  2.3-353-g6af4b6c
2018-02-09 20:50:00 +01:00
Jonas Bernoulli
7f59c95567 Update 2 drones
Update magit-imerge to v0.2.0-3-g1969c44
Update magit-tbdiff to v0.2.0-6-gaaa0400
2018-01-29 11:17:27 +01:00
Jonas Bernoulli
937576cb82 Merge branch 'master' into layer/magit-directors-cut 2018-01-29 11:17:15 +01:00
Jonas Bernoulli
68a7187fc2 Update 8 drones
Update borg        to v2.0.0-37-g593314b
Update dash        to  2.13.0-65-gc1991d4
Update diff-hl     to  1.8.4-15-g9ef21e4
Update emacsql     to  2.0.2-16-g62d3915
Update ghub        to v1.3.0-39-gf1b647f
Update magit       to  2.11.0-471-g4e637088f
Update magit-popup to v2.12.2
Update use-package to  2.3-349-g8ecb0f1
2018-01-29 10:55:43 +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
e68b9f71b9 Update magit-rockstar to v1.1.0 2018-01-17 16:59:20 +01:00
Jonas Bernoulli
56ad7d0adb Merge branch 'master' into layer/magit-directors-cut 2018-01-17 16:59:03 +01:00
Jonas Bernoulli
69886354f6 Update 4 drones
Update borg  to v2.0.0-35-g454daf9
Update dash  to  2.13.0-63-g138c22a
Update ghub  to v1.3.0-38-g8959334
Update magit to  2.11.0-411-g73ea37afb
2018-01-17 16:57:47 +01:00
Jonas Bernoulli
c69a6d0334 Update magit-rockstar to v1.0.6-2-g44e3bf0
Rewind by one commit, which depends on
a change in a `magit' feature branch.
2018-01-15 13:43:17 +01:00
Jonas Bernoulli
100b55ea06 Merge branch 'master' into layer/magit-directors-cut 2018-01-15 13:42:50 +01:00
Jonas Bernoulli
b5698f6235 Update 7 drones
Update auto-compile to  1.4.2
Update borg         to v2.0.0-34-g362ae8a
Update epkg         to v3.0.0-28-gc8ab0e5
Update ghub         to v1.3.0-37-g2962611
Update magit        to  2.11.0-395-g24ce90832
Update magit-popup  to v2.12.1
Update with-editor  to v2.7.1
2018-01-15 13:41:40 +01:00
Jonas Bernoulli
2659f6c889 Emacsg: docs: remove obsolete information 2018-01-15 12:16:15 +01:00
Jonas Bernoulli
095eb3b8a4 Emacsg: docs: Remove obsolete links 2018-01-15 11:03:28 +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
91b4bc1239 Merge branch 'master' into layer/magit-directors-cut 2018-01-11 12:05:58 +01:00
Jonas Bernoulli
0523110764 ghub: Update upstream url 2018-01-11 12:05:03 +01:00
Jonas Bernoulli
589754d058 Update 4 drones
Update dash        to  2.13.0-61-g528e5a5
Update ghub        to v1.3.0-34-g1395d56
Update magit       to  2.11.0-389-g260e4afe3
Update use-package to  2.3-335-g05a4033
2018-01-11 12:01:00 +01:00
Jonas Bernoulli
492ccd5441 Emacs.g: Move Makefile and borg-bootstrap into borg package
In the borg repository these files are renamed to "borg.mk" and
"borg.sh" and modified slightly.  Add a new "Makefile" here.  It
defines one simple target `borg-bootstrap', which is required to
make "borg.mk" and "borg.sh" available during bootstrap and sources
"borg.mk" for all the other targets it used to define.  The target
defined here is fairly simple and hopefully won't have to be updated
often, but independent configurations still have integrate a copy of
this file, because we cannot bootstrap out of thin air and `git
submodule' isn't up to the task yet.

Update borg to v2.0.0-20-g8399ec8
2018-01-11 11:58:02 +01:00
Jonas Bernoulli
e532228c30 Assimilate ghub v1.3.0-33-gb5f8152 2017-12-22 21:22:30 +01:00
Jonas Bernoulli
e873b20245 Update magit-rockstar to v1.0.6-3-gc832047 2017-12-21 03:22:14 +01:00
Jonas Bernoulli
c4261d777c Merge branch 'master' into layer/magit-directors-cut 2017-12-21 03:21:37 +01:00
Jonas Bernoulli
2efadaadac Emacsg: make: Add clean target 2017-12-21 03:18:00 +01:00
Jonas Bernoulli
4e25394021 Emacsg: make: Silence bogus warnings on older Emacsen
See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26177.
2017-12-21 03:17:00 +01:00
Jonas Bernoulli
45b352b5d0 Emacsg: make: 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:16:00 +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
f6285fa805 Remove finalize
This was a dependency of `emacsql', but as of
2.0.2-14-g616dde3 it no longer is required.
2017-12-21 03:13:00 +01:00
Jonas Bernoulli
8417c45cbd Update 10 drones
Update auto-compile to  1.4.1-1-g694b92e
Update borg         to v2.0.0-19-g4b908fd
Update closql       to v0.5.1
Update emacsql      to  2.0.2-14-g616dde3
Update epkg         to v3.0.0-26-g71ce3ff
Update finalize     to  2.0.0-2-g8467315
Update magit        to  2.11.0-355-g0ee62ee80
Update magit-popup  to v2.12.0-4-g3f23e81
Update use-package  to  2.3-323-g865e931
Update with-editor  to v2.7.0-11-g05338d8
2017-12-21 03:12: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
2379774797 Merge branch 'master' into layer/magit-directors-cut 2017-11-27 12:38:37 +01:00
Jonas Bernoulli
76a26068ba Update 7 drones
Update borg        to v2.0.0-8-gba62a78
Update closql      to v0.5.0
Update dash        to  2.13.0-57-g91d8cb0
Update epkg        to v3.0.0-8-g6114b78
Update finalize    to  2.0.0-1-g0496a7b
Update use-package to  2.3-94-g98f9e12
Update with-editor to v2.7.0-7-gee39f23
2017-11-27 12:31:34 +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
02639413bd Merge branch 'master' into layer/magit-directors-cut 2017-11-27 12:18:29 +01:00
Jonas Bernoulli
3cf3789d31 Update 7 drones
Update borg        to v2.0.0-8-gba62a78
Update closql      to v0.5.0
Update dash        to  2.13.0-57-g91d8cb0
Update epkg        to v3.0.0-8-g6114b78
Update finalize    to  2.0.0-1-g0496a7b
Update use-package to  2.3-94-g98f9e12
Update with-editor to v2.7.0-7-gee39f23
2017-11-27 12:13:29 +01:00
Jonas Bernoulli
f3778d700f Assimilate magit-popup v2.12.0-2-g70e3cdd
Update magit to 2.11.0-286-gaa0f18646

magit-popup is no longer part of the magit repository.
2017-11-27 11:56:33 +01:00
Richard Kim
9756b42aa5 Emacsg: Makefile: respect EMACS environment variable 2017-10-16 17:20:12 +02:00