Merge branch 'master' into layer/elisp

.gitmodules

@@ -34,6 +34,9 @@
 	path = lib/magit
 	url = git@github.com:magit/magit.git
 	info-path = Documentation
+[submodule "magit-popup"]
+	path = lib/magit-popup
+	url = git@github.com:magit/magit-popup.git
 [submodule "package-build"]
 	path = lib/package-build
 	url = git@github.com:melpa/package-build.git

Makefile

@@ -3,6 +3,8 @@
 # Author: Jonas Bernoulli <jonas@bernoul.li>
 # License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
 
+EMACS ?= emacs
+
 .PHONY: all help build build-init quick bootstrap
 .FORCE:
 
@@ -19,24 +21,24 @@ help:
 
 build:
 	@rm -f init.elc
-	@emacs -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg \
 	--funcall borg-initialize \
 	--funcall borg-batch-rebuild 2>&1
 
 build-init:
 	@rm -f init.elc
-	@emacs -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg \
 	--funcall borg-initialize \
 	--funcall borg-batch-rebuild-init 2>&1
 
 quick:
 	@rm -f init.elc
-	@emacs -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg \
 	--funcall borg-initialize \
 	--eval  '(borg-batch-rebuild t)' 2>&1
 
 lib/%: .FORCE
-	@emacs -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg \
 	--funcall borg-initialize \
 	--eval  '(borg-build "$(@F)")' 2>&1
 

init.el

@@ -104,20 +104,9 @@
          ("C-x M-g" . magit-dispatch-popup))
   :config
   (magit-add-section-hook 'magit-status-sections-hook
-                          'magit-insert-modules-unpulled-from-upstream
-                          'magit-insert-unpulled-from-upstream)
-  (magit-add-section-hook 'magit-status-sections-hook
-                          'magit-insert-modules-unpulled-from-pushremote
-                          'magit-insert-unpulled-from-upstream)
-  (magit-add-section-hook 'magit-status-sections-hook
-                          'magit-insert-modules-unpushed-to-upstream
-                          'magit-insert-unpulled-from-upstream)
-  (magit-add-section-hook 'magit-status-sections-hook
-                          'magit-insert-modules-unpushed-to-pushremote
-                          'magit-insert-unpulled-from-upstream)
-  (magit-add-section-hook 'magit-status-sections-hook
-                          'magit-insert-submodules
-                          'magit-insert-unpulled-from-upstream))
+                          'magit-insert-modules
+                          'magit-insert-stashes
+                          'append))
 
 (use-package man
   :defer t