51 Commits

Author SHA1 Message Date
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
Jonas Bernoulli
9e138065d8 isearch: allow scrolling while searching 2016-05-17 18:42:00 +02:00
Jonas Bernoulli
cb40ab046b man: limit line width 2016-05-17 18:41:00 +02:00
Jonas Bernoulli
6aba44db51 dired: show human-readable file sizes 2016-05-17 18:40:00 +02:00
Jonas Bernoulli
d8006b663e tramp: configure root-over-ssh proxy 2016-05-17 18:39:00 +02:00
Jonas Bernoulli
8e4b9e1d77 recentf: exclude tramp paths 2016-05-17 18:38:00 +02:00
Jonas Bernoulli
dec42814ff Enable global column-number-mode 2016-05-17 18:37:00 +02:00
Jonas Bernoulli
fabbd0cab4 Enable global temp-buffer-resize-mode 2016-05-17 18:36:00 +02:00
Jonas Bernoulli
93d224e36c Enable global-prettify-symbols-mode 2016-05-17 18:35:00 +02:00
Jonas Bernoulli
a6422fea56 Enable global show-paren-mode 2016-05-17 18:34:00 +02:00
Jonas Bernoulli
609a2e4940 Enable global-eldoc-mode 2016-05-17 18:33:00 +02:00
Jonas Bernoulli
8459a87b60 Enable global save-place-mode 2016-05-17 18:32:00 +02:00
Jonas Bernoulli
ef6c3fdd30 Enable global savehist-mode 2016-05-17 18:31:00 +02:00
Jonas Bernoulli
774dc42d8f Enable global server-mode
Provided the default server isn't already running in another Emacs
instance, start it in this instance.
2016-05-17 18:30:00 +02:00
Jonas Bernoulli
416e225649 Disable global scroll-bar-mode 2016-05-17 18:29:00 +02:00
Jonas Bernoulli
2c9523d9d4 Disable global tool-bar-mode 2016-05-17 18:28:00 +02:00
Jonas Bernoulli
9749d096e5 Disable global menu-bar-mode 2016-05-17 18:27:00 +02:00
Jonas Bernoulli
080a2fee28 Assimilate diff-hl 1.8.3-3-g4bfa149 2016-05-17 18:26:00 +02:00
Jonas Bernoulli
5b6cc0c12f Assimilate auto-compile and dependencies
Assimilate auto-compile 1.3.1
Assimilate packed       0.5.3
2016-05-17 18:24:00 +02:00
Jonas Bernoulli
3cbf0e2061 Assimilate magit and dependencies
Assimilate magit        2.6.2-68-g97972fb
Assimilate with-editor v2.5.1
2016-05-17 18:23:00 +02:00
Jonas Bernoulli
b84f6d64c6 Assimilate epkg and dependencies
Assimilate closql   v0.1.0
Assimilate emacsql   2.0.1-1-g3042597
Assimilate epkg     v1.0.1
Assimilate finalize  1.0.0-1-g9ac589c
2016-05-17 18:22:00 +02:00
Jonas Bernoulli
c7ea45aa93 Assimilate dash 2.12.1-15-g6d8abc7 2016-05-17 18:21:00 +02:00
Jonas Bernoulli
313aa080f8 Assimilate use-package 2.1-57-g22c63c8 2016-05-17 18:20:00 +02:00