Merge branch 'master' into layer/cosmetics

2025-11-23 11:41:18 -05:00 · 2018-06-23 22:49:40 -05:00
parent 20ec8f1818 ba5ffda542
commit 1df4361d04
10 changed files with 9 additions and 13 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,6 +42,7 @@
 [submodule "magit"]
 	path = lib/magit
 	url = git@github.com:magit/magit.git
 	recursive-byte-compile = true
 	info-path = Documentation
 [submodule "magit-popup"]
 	path = lib/magit-popup
--- a/init.el
+++ b/init.el
@@ -30,11 +30,6 @@
  (require  'use-package)
  (setq use-package-verbose t))
 (use-package subr-x
  :config
  (put 'if-let   'byte-obsolete-info nil)
  (put 'when-let 'byte-obsolete-info nil))
 (use-package auto-compile
  :demand t
  :config
--- a/lib/borg
+++ b/lib/borg
--- a/lib/closql
+++ b/lib/closql
--- a/lib/epkg
+++ b/lib/epkg
--- a/lib/ghub
+++ b/lib/ghub
--- 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