Merge branch 'master' into layer/elisp

2025-11-23 11:41:18 -05:00 · 2018-03-02 22:35:40 +01:00
parent 7bd2866746 1f27169059
commit 3d749dff30
12 changed files with 12 additions and 11 deletions
--- a/init.el
+++ b/init.el
@@ -54,6 +54,7 @@
              (expand-file-name "var/epkgs/" user-emacs-directory)))
 (use-package custom
  :no-require t
  :config
  (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
  (when (file-exists-p custom-file)
--- a/lib/borg
+++ b/lib/borg
--- a/lib/dash
+++ b/lib/dash
--- a/lib/diff-hl
+++ b/lib/diff-hl
--- a/lib/emacsql
+++ b/lib/emacsql
--- a/lib/epkg
+++ b/lib/epkg
--- a/lib/ghub
+++ b/lib/ghub
--- a/lib/git-modes
+++ b/lib/git-modes
--- a/lib/magit
+++ b/lib/magit
--- a/lib/magit-popup
+++ b/lib/magit-popup
--- a/lib/use-package
+++ b/lib/use-package
--- a/lib/with-editor
+++ b/lib/with-editor