From 62027103a220d75097e0eb240aecf3776ec9037d Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:32:51 +0100 Subject: [PATCH 1/6] Update 7 drones Update borg to v3.1.2-5-g3cfb35f Update diff-hl to 1.8.7-7-g2cf8b48 Update epkg to v3.2.2-7-gedf8c00 Update ghub to v3.3.0-5-ga8bf337 Update libgit to 6c3b892 Update magit to v2.90.1-949-g68b5a13fa Update transient to v0.2.0 --- lib/borg | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/transient | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/borg b/lib/borg index 7efd982..3cfb35f 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 7efd982e8e84b5761acbed9db98ec21eefca5048 +Subproject commit 3cfb35f5c54a76f200272ed11b4a39f11a57552c diff --git a/lib/diff-hl b/lib/diff-hl index fb9eb1c..2cf8b48 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74 +Subproject commit 2cf8b489f3b71c869a5626a5eb41f36495bdfd61 diff --git a/lib/epkg b/lib/epkg index 075f6af..edf8c00 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 075f6afa81f7a83a35088b699ed44d6029192198 +Subproject commit edf8c009066360af61caedf67a2482eaa19481b0 diff --git a/lib/ghub b/lib/ghub index 4ebe60b..a8bf337 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 4ebe60b9522355c6ee95005bc7d8ba41df4a3c6b +Subproject commit a8bf337534ec583906db77a3d56f7d1b84bda952 diff --git a/lib/libgit b/lib/libgit index 65fde63..6c3b892 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit 65fde63a0bde9b4cef74204db5d9ac0a740d6b4d +Subproject commit 6c3b89276a149b2d009882f756a9edf866671f05 diff --git a/lib/magit b/lib/magit index 798e47a..68b5a13 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 798e47a1f07ac40c5a8c82372814c52be0478a76 +Subproject commit 68b5a13fa1b6b122d4a2547b8c415aadff83d8ca diff --git a/lib/transient b/lib/transient index 7977732..a269614 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 79777324858df408bd6ba7509d9f0b6987208d98 +Subproject commit a269614c69ad8b2703e6e5093d0017d6afad6cca From cd0a0224c184ad8d3400f697b55e1248122abca3 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:37:24 +0100 Subject: [PATCH 2/6] Emacsg: init: Add early-init.el --- early-init.el | 9 +++++++++ init.el | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 early-init.el diff --git a/early-init.el b/early-init.el new file mode 100644 index 0000000..43e75ce --- /dev/null +++ b/early-init.el @@ -0,0 +1,9 @@ +;;; early-init.el --- earliest birds -*- lexical-binding: t -*- + +(setq package-enable-at-startup nil) + +;; Local Variables: +;; no-byte-compile: t +;; indent-tabs-mode: nil +;; End: +;;; early-init.el ends here diff --git a/init.el b/init.el index 518dca1..bad920d 100644 --- a/init.el +++ b/init.el @@ -9,8 +9,10 @@ (setq user-init-file (or load-file-name buffer-file-name)) (setq user-emacs-directory (file-name-directory user-init-file)) (message "Loading %s..." user-init-file) - (setq package-enable-at-startup nil) - ;; (package-initialize) + (when (< emacs-major-version 27) + (setq package-enable-at-startup nil) + ;; (package-initialize) + (load-file (expand-file-name "early-init.el" user-emacs-directory))) (setq inhibit-startup-buffer-menu t) (setq inhibit-startup-screen t) (setq inhibit-startup-echo-area-message "locutus") From d777e2b31fc37e14a5d269b23563204ef9b6396b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:39:05 +0100 Subject: [PATCH 3/6] package: Add melpa and org to package-archives We don't use package.el, but if we do for testing purposes then its nice if things are already configured properly. --- early-init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/early-init.el b/early-init.el index 43e75ce..06edd7c 100644 --- a/early-init.el +++ b/early-init.el @@ -2,6 +2,14 @@ (setq package-enable-at-startup nil) +(with-eval-after-load 'package + (add-to-list 'package-archives + (cons "melpa" "https://melpa.org/packages/") + t) + (add-to-list 'package-archives + (cons "org" "https://orgmode.org/elpa/") + t)) + ;; Local Variables: ;; no-byte-compile: t ;; indent-tabs-mode: nil From b0e74990099d3e8f1ef58ffffd1e1c5e62603867 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:42:39 +0100 Subject: [PATCH 4/6] diff-mode: Continue to extend faces to edge of window Due to a breaking change we have to request this explicitly in Emacs 27. Earlier Emacs versions do the right thing by default. See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37774. --- init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/init.el b/init.el index bad920d..f349ac8 100644 --- a/init.el +++ b/init.el @@ -74,6 +74,14 @@ (global-diff-hl-mode) (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)) +(use-package diff-mode + :defer t + :config + (when (>= emacs-major-version 27) + (set-face-attribute 'diff-refine-changed nil :extend t) + (set-face-attribute 'diff-refine-removed nil :extend t) + (set-face-attribute 'diff-refine-added nil :extend t))) + (use-package dired :defer t :config (setq dired-listing-switches "-alh")) From 7c194efc8a2a4de7b065de705e47829d974f2fd0 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:42:44 +0100 Subject: [PATCH 5/6] smerge-mode: Continue to extend faces to edge of window Due to a breaking change we have to request this explicitly in Emacs 27. Earlier Emacs versions do the right thing by default. --- init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/init.el b/init.el index f349ac8..8fb5150 100644 --- a/init.el +++ b/init.el @@ -142,6 +142,14 @@ (use-package simple :config (column-number-mode)) +(use-package smerge-mode + :defer t + :config + (when (>= emacs-major-version 27) + (set-face-attribute 'smerge-refined-changed nil :extend t) + (set-face-attribute 'smerge-refined-removed nil :extend t) + (set-face-attribute 'smerge-refined-added nil :extend t))) + (progn ; `text-mode' (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)) From b0178cc65c58680d5fbf6108af63d89a95fe5fb7 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 20 Mar 2020 23:43:24 +0100 Subject: [PATCH 6/6] tramp: Disable vc Tramp's FAQ suggests this in order to speed things up. --- init.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 8fb5150..8ec83f6 100644 --- a/init.el +++ b/init.el @@ -159,7 +159,11 @@ (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) (add-to-list 'tramp-default-proxies-alist - (list (regexp-quote (system-name)) nil nil))) + (list (regexp-quote (system-name)) nil nil)) + (setq vc-ignore-dir-regexp + (format "\\(%s\\)\\|\\(%s\\)" + vc-ignore-dir-regexp + tramp-file-name-regexp))) (progn ; startup (message "Loading %s...done (%.3fs)" user-init-file