summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--emacs/.emacs.d/init.el12
-rw-r--r--emacs/.emacs.d/init.org5
2 files changed, 6 insertions, 11 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 9e8e109a..ffde904a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -604,7 +604,7 @@
   :demand t
   :diminish projectile-mode
   :config (progn
-            (projectile-global-mode +1)
+            (projectile-mode +1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
 
             (defun yarn-install (&optional arg)
@@ -1706,6 +1706,7 @@
 ;; #+BEGIN_SRC emacs-lisp
 (use-package ledger-mode
   :mode ("\\.ledger\\'" . ledger-mode)
+  :functions ledger-report
   :init (progn
           (defun open-budget ()
             (interactive)
@@ -2169,16 +2170,11 @@
 (use-package js2-mode
   :mode (("\\.js\\'" . js2-mode))
   :interpreter ("node" . js2-mode)
-  :functions js2-next-error
+  :functions (js2-next-error
+              js2--struct-put)
   :config (progn
             (define-key js2-mode-map [menu-bar Javascript] nil)
-            (defun js2--imenu-around (do-it name)
-              "Don't create a menu from js2-mode"
-              (if (and (not (string-equal name "IM-Javascript-IDE"))
-                       (fboundp #'do-it))
-                  (do-it name)))
             (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
-            (advice-add 'imenu-add-to-menubar :around #'js2--imenu-around)
             (defun ap/js2-prev-error ()
               (interactive)
               (js2-next-error -1))
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 78c1ede5..da79d68f 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -604,7 +604,7 @@ ones.
   :demand t
   :diminish projectile-mode
   :config (progn
-            (projectile-global-mode +1)
+            (projectile-mode -1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
 
             (defun yarn-install (&optional arg)
@@ -2174,8 +2174,7 @@ an AST internally, so it can work with it almost like a lisp.
             (define-key js2-mode-map [menu-bar Javascript] nil)
             (defun js2--imenu-around (do-it name)
               "Don't create a menu from js2-mode"
-              (if (and (not (string-equal name "IM-Javascript-IDE"))
-                       (fboundp #'do-it))
+              (if (not (string-equal name "IM-Javascript-IDE"))
                   (do-it name)))
             (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
             (advice-add 'imenu-add-to-menubar :around #'js2--imenu-around)