185 Commits

Author SHA1 Message Date
Jonas Bernoulli
7c5bc2e9a2 Update orgit to v1.3.0 2017-01-31 15:53:19 +01:00
Jonas Bernoulli
9875f34c79 Merge branch 'master' into magit-directors-cut 2017-01-31 15:52:53 +01:00
Jonas Bernoulli
64581a640a Update 5 drones
Update auto-compile to  1.4.0
Update epkg         to v2.2.0
Update git-modes    to  1.2.5
Update magit        to  2.10.1
Update packed       to  2.0.0
2017-01-31 15:49:49 +01:00
Jonas Bernoulli
5e136930a2 Merge branch 'master' into magit-directors-cut 2017-01-22 16:56:38 +01:00
Jonas Bernoulli
fb9b17ba94 Update 5 drones
Update emacsql     to  2.0.2-1-g327b09b
Update git-modes   to  1.2.4
Update magit       to  2.10.0-19-g85db4aee
Update use-package to  2.3-17-g3803485
Update with-editor to v2.5.9-1-g8ae3c7a
2017-01-22 16:49:47 +01:00
Jonas Bernoulli
1e3df8e56b Merge branch 'master' into magit-directors-cut 2016-12-31 18:32:00 +01:00
Jonas Bernoulli
eed1197e52 Update 6 drones
Update borg        to v1.0.0
Update closql      to v0.3.3
Update epkg        to v2.1.0
Update magit       to  2.9.0-79-gd7552945
Update use-package to  2.3-15-g5954ad3
Update with-editor to v2.5.9
2016-12-31 18:29:01 +01:00
Jonas Bernoulli
3870228d50 Merge branch 'master' into magit-directors-cut 2016-12-14 14:41:07 +01:00
Jonas Bernoulli
570ce067ba Update magit to 2.9.0-24-g12ae09c1 2016-12-14 14:40:06 +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
a81617010b Merge branch 'master' into magit-directors-cut 2016-12-08 00:32:03 +01:00
Jonas Bernoulli
a9318a4d97 Update drones
Update borg        to v0.2.0-28-gfe01782
Update epkg        to v2.0.0-13-g846c5ee
Update magit       to  2.9.0-9-gdd53fa2e
Update with-editor to v2.5.8-2-gee41302
2016-12-08 00:30:36 +01:00
Jonas Bernoulli
95ebb7abda Merge branch 'master' into magit-directors-cut 2016-12-01 16:15:54 +01:00
Jonas Bernoulli
7b8939ea3e Update borg to v0.2.0-26-g2142794
Also update the "bin/borg-bootstrap" script to take the ".hive-maint"
file into account as described in the Borg manual, and remove the
commentary because that is now covered in the Borg manual also.
2016-12-01 16:15:01 +01:00
Jonas Bernoulli
8e437d064e Emacsg: bin/borg-bootstrap: exit on fatal errors 2016-12-01 16:15:01 +01:00
Jonas Bernoulli
19d1fae6ce Emacsg: bin/borg-bootstrap: don't use sub-shells 2016-12-01 16:15:01 +01:00
Jonas Bernoulli
bfd6b10a27 Emacsg: make output more readable 2016-12-01 16:14:53 +01:00
Jonas Bernoulli
c5fcb59c66 Emacsg: update descriptions of make targets 2016-12-01 15:52:01 +01:00
Jonas Bernoulli
6b1d47f081 Update 2 drones
Update epkg        to v2.0.0-11-gfafc140
Update with-editor to v2.5.8-1-g8fa5cef
2016-12-01 15:49:23 +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
d00abb7bc2 Merge branch 'master' into magit-directors-cut 2016-11-30 20:07:59 +01:00
Jonas Bernoulli
b0d6922f41 Update 4 drones
Update borg   to v0.2.0-19-ga05b9bf
Update closql to v0.3.2-1-g8b063e7
Update epkg   to v2.0.0-6-gc11c370
Update magit  to  2.8.0-216-g81a8dd3
2016-11-30 20:05:48 +01:00
Jonas Bernoulli
9b29a94b8d Update urls of borg, closql and epkg 2016-11-30 20:05:42 +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
028663328b Update orgit to v1.2.0 2016-11-28 19:27:14 +01:00
Jonas Bernoulli
5eac5dfcd5 Merge branch 'master' into magit-directors-cut 2016-11-28 19:26:03 +01:00
Jonas Bernoulli
cf83e920b6 Emacsg: use bin/bootstrap script
`make bootstrap' now uses this script.  If that part of the bootstrap
process fails, then you can also run it manually.  See the commentary
at the beginning of the script for usage instructions.
2016-11-28 19:24:37 +01:00
Jonas Bernoulli
d079306f51 Emacsg: add bin/borg-bootstrap script
See the commentary at the beginning of the script for usage
instructions.  Starting with the next commit `make bootstrap'
will use it.
2016-11-28 19:24:26 +01:00
Jonas Bernoulli
98b6613d11 Emacsg: explicitly specify target when calling make recursively 2016-11-28 19:09:34 +01:00
Jonas Bernoulli
01da6340cd Emacsg: suppress certain byte-compile warnings
Suppress warnings about `defgeneric' and `defmethod' being obsolete.
Compiling the drone `emacsql' results in many such warnings, which
distract from other potential warnings, which actually should be
addressed.  Because `emacsql' wants to stay compatible with Emacsen
before v25.1 it cannot switch to `cl-defgeneric' and `cl-defmethod'
and I don't want to see warnings about that for the next few years.

Also direct all of Emacs' stderr to stdout because `message' prints
to stderr instead of stdout).
2016-11-28 19:09:32 +01:00
Jonas Bernoulli
dd13e1db75 text-mode: fix configuration 2016-11-28 18:33:06 +01:00
Jonas Bernoulli
f8f9626d15 Update 6 drones
Update borg        to v0.2.0-18-g9573646
Update closql      to v0.3.2
Update dash        to  2.13.0-19-g958e3fb
Update epkg        to v2.0.0-5-g3256cac
Update magit       to  2.8.0-204-gf7b7cea
Update with-editor to v2.5.8
2016-11-28 18:33:03 +01:00
Jonas Bernoulli
e5a530d3eb Merge branch 'master' into magit-directors-cut 2016-11-05 01:47:57 +01:00
Jonas Bernoulli
dafb942601 Update drones
Update borg        to v0.2.0
Update closql      to v0.3.1-2-g1245d82
Update dash        to  2.13.0-5-gd4bccfe
Update diff-hl     to  1.8.4-7-gc476e40
Update emacsql     to  2.0.2
Update epkg        to v2.0.0
Update magit       to  2.8.0-144-g4aeaea1
Update use-package to  2.3-8-gc7adfdd
Update with-editor to v2.5.7-1-gb2d9d6b
2016-11-05 01:44:29 +01:00
Jonas Bernoulli
cc34c30c25 Update urls of borg, closql and epkg 2016-11-05 01:43:25 +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
8bc684ec7e Update magit-rockstar to v1.0.5 2016-10-15 14:33:24 +02:00
Jonas Bernoulli
1f747444b9 Merge branch 'master' into magit-directors-cut 2016-10-15 14:33:19 +02:00
Jonas Bernoulli
58f39443fa Update drones
Update borg        to v0.1.6
Update diff-hl     to  1.8.4-2-g0c8bf49
Update magit       to  2.8.0-122-gc1d31c8
Update with-editor to v2.5.7
2016-10-15 14:30:22 +02:00
Jonas Bernoulli
453b69ea0c magit: set magit-branch-adjust-remote-upstream-alist 2016-10-05 13:16:39 +02:00
Jonas Bernoulli
60a49d53bc Merge branch 'master' into magit-directors-cut 2016-10-05 13:15:30 +02:00
Jonas Bernoulli
e351df0e1e Update drones
Update borg        to v0.1.5
Update dash        to  2.13.0-3-g2996a0d
Update magit       to  2.8.0-61-ga49dfe1
Update use-package to  2.2-13-gca736c3
Update with-editor to v2.5.6
2016-10-05 13:13:06 +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
b666668afe Assimilate orgit v1.1.1 2016-09-02 23:42:00 +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