@@ -1015,14 +1015,15 @@ (use-package discover-my-major   :bind ("C-h C-m" . discover-my-major))
 #+END_SRC
 
-** discover
+** which-key
 
-Makes some context menus for dired and other things, similarly to the
-way magit’s popups work.
+Popup keybindings following a prefix automatically.
 
 #+BEGIN_SRC emacs-lisp
-(use-package discover
-  :config (global-discover-mode))
+  (use-package which-key
+    :config (progn
+              (which-key-mode)
+              (which-key-setup-side-window-right-bottom)))
 #+END_SRC
 
 ** eldoc
@@ -1658,15 +1659,16 @@ A nice completion backend for programming modes.
 
 #+BEGIN_SRC emacs-lisp
-(use-package ggtags
-  :commands turn-on-ggtags-mode
-  :config (progn
-            (bind-key "q" #'ggtags-navigation-mode-abort ggtags-navigation-mode-map))
-  :init (progn
-          (defun turn-on-ggtags-mode ()
-            (interactive)
-            (ggtags-mode 1))
-          (add-hook 'c-mode-common-hook #'turn-on-ggtags-mode)))
+  (use-package ggtags
+    :commands turn-on-ggtags-mode
+    :functions (ggtags-navigation-mode-abort)
+    :config (progn
+              (bind-key "q" #'ggtags-navigation-mode-abort ggtags-navigation-mode-map))
+    :init (progn
+            (defun turn-on-ggtags-mode ()
+              (interactive)
+              (ggtags-mode 1))
+            (add-hook 'c-mode-common-hook #'turn-on-ggtags-mode)))
 #+END_SRC
 
 ** Lisps