From 8bc2329b3d398e865119549ddc0c321071fedf39 Mon Sep 17 00:00:00 2001
From: Christoph Paulik <cpaulik@gmail.com>
Date: Thu, 5 May 2016 12:02:25 +0200
Subject: [PATCH] Fix bibtex keybinding loading and add more navigation
 options.

Fix #5985
---
 layers/+lang/bibtex/README.org  |  4 +++
 layers/+lang/bibtex/packages.el | 57 ++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/layers/+lang/bibtex/README.org b/layers/+lang/bibtex/README.org
index 9fceadc24..5c28010f4 100644
--- a/layers/+lang/bibtex/README.org
+++ b/layers/+lang/bibtex/README.org
@@ -58,6 +58,10 @@ In a Bib(La)TeX file, the following key bindings are added:
 
 | Key Binding | Description                                |
 |-------------+--------------------------------------------|
+| ~g j~       | Next entry                                 |
+| ~g k~       | Previous entry                             |
+| ~C-j~       | Next entry                                 |
+| ~C-k~       | Previous entry                             |
 | ~SPC m j~   | Next entry                                 |
 | ~SPC m k~   | Previous entry                             |
 | ~SPC m p~   | Open PDF                                   |
diff --git a/layers/+lang/bibtex/packages.el b/layers/+lang/bibtex/packages.el
index 4903c78ec..f21706b3b 100644
--- a/layers/+lang/bibtex/packages.el
+++ b/layers/+lang/bibtex/packages.el
@@ -28,27 +28,48 @@
 (defun bibtex/init-org-ref ()
   (use-package org-ref
     :defer t
-    :config (spacemacs/set-leader-keys-for-major-mode 'bibtex-mode
-              ;; Navigation
-              "j" 'org-ref-bibtex-next-entry
-              "k" 'org-ref-bibtex-previous-entry
+    :commands (org-ref-bibtex-next-entry
+               org-ref-bibtex-previous-entry
+               org-ref-open-in-browser
+               org-ref-open-bibtex-notes
+               org-ref-open-bibtex-pdf
+               org-ref-bibtex-hydra/body
+               org-ref-bibtex-hydra/org-ref-bibtex-new-entry/body-and-exit
+               org-ref-sort-bibtex-entry
+               arxiv-add-bibtex-entry
+               arxiv-get-pdf-add-bibtex-entry
+               doi-utils-add-bibtex-entry-from-doi
+               isbn-to-bibtex
+               pubmed-insert-bibtex-from-pmid)
+    :init
+    (progn
+      (evil-define-key 'normal bibtex-mode-map
+        (kbd "C-j") 'org-ref-bibtex-next-entry
+        (kbd "C-k") 'org-ref-bibtex-previous-entry
+        "gj" 'org-ref-bibtex-next-entry
+        "gk" 'org-ref-bibtex-previous-entry)
 
-              ;; Open
-              "b" 'org-ref-open-in-browser
-              "n" 'org-ref-open-bibtex-notes
-              "p" 'org-ref-open-bibtex-pdf
+      (spacemacs/set-leader-keys-for-major-mode 'bibtex-mode
+        ;; Navigation
+        "j" 'org-ref-bibtex-next-entry
+        "k" 'org-ref-bibtex-previous-entry
 
-              ;; Misc
-              "h" 'org-ref-bibtex-hydra/body
-              "i" 'org-ref-bibtex-hydra/org-ref-bibtex-new-entry/body-and-exit
-              "s" 'org-ref-sort-bibtex-entry
+        ;; Open
+        "b" 'org-ref-open-in-browser
+        "n" 'org-ref-open-bibtex-notes
+        "p" 'org-ref-open-bibtex-pdf
 
-              ;; Lookup utilities
-              "la" 'arxiv-add-bibtex-entry
-              "lA" 'arxiv-get-pdf-add-bibtex-entry
-              "ld" 'doi-utils-add-bibtex-entry-from-doi
-              "li" 'isbn-to-bibtex
-              "lp" 'pubmed-insert-bibtex-from-pmid)))
+        ;; Misc
+        "h" 'org-ref-bibtex-hydra/body
+        "i" 'org-ref-bibtex-hydra/org-ref-bibtex-new-entry/body-and-exit
+        "s" 'org-ref-sort-bibtex-entry
+
+        ;; Lookup utilities
+        "la" 'arxiv-add-bibtex-entry
+        "lA" 'arxiv-get-pdf-add-bibtex-entry
+        "ld" 'doi-utils-add-bibtex-entry-from-doi
+        "li" 'isbn-to-bibtex
+        "lp" 'pubmed-insert-bibtex-from-pmid))))
 
 (defun bibtex/post-init-markdown-mode ()
   (spacemacs/set-leader-keys-for-major-mode 'markdown-mode