From 4321f20b3e39b77aac255dce2d09fbb4d13f2d51 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 14 Feb 2018 20:54:53 -0500
Subject: [PATCH] Appease byte-compiler-sama

---
 core/autoload/editor.el                  | 2 +-
 modules/lang/org/autoload/org-capture.el | 3 +--
 modules/lang/org/autoload/org.el         | 3 +--
 modules/tools/neotree/autoload.el        | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/autoload/editor.el b/core/autoload/editor.el
index 4c12234ba..2ee50dc16 100644
--- a/core/autoload/editor.el
+++ b/core/autoload/editor.el
@@ -247,7 +247,7 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
 ;;
 
 ;;;###autoload
-(defun doom*newline-and-indent (orig-fn)
+(defun doom*newline-and-indent (_orig-fn)
   "Inserts a newline and possibly indents it. Also continues comments if
 executed from a commented line; handling special cases for certain languages
 with weak native support."
diff --git a/modules/lang/org/autoload/org-capture.el b/modules/lang/org/autoload/org-capture.el
index 6edabe44e..518bc033e 100644
--- a/modules/lang/org/autoload/org-capture.el
+++ b/modules/lang/org/autoload/org-capture.el
@@ -63,17 +63,16 @@ you're done. This can be called from an external shell script."
     (setq string nil))
   (when (and key (string-empty-p key))
     (setq key nil))
-  (require 'org-capture)
   (let ((frame (if (+org-capture-frame-p)
                    (selected-frame)
                  (make-frame +org-capture-window-params))))
     (with-selected-frame frame
+      (require 'org-capture)
       (condition-case ex
           (cl-letf (((symbol-function #'pop-to-buffer)
                      (symbol-function #'switch-to-buffer)))
             (switch-to-buffer (doom-fallback-buffer))
             (let ((org-capture-initial string)
-                  (org-capture-mode-hook org-capture-mode-hook)
                   org-capture-entry)
               (when (and key (not (string-empty-p key)))
                 (setq org-capture-entry (org-capture-select-template key)))
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 1812ae0c2..390756ab5 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -139,8 +139,7 @@ wrong places)."
            (let ((marker (org-element-property :bullet context))
                  (pad (save-excursion
                         (back-to-indentation)
-                        (- (point) (line-beginning-position))))
-                 afterp)
+                        (- (point) (line-beginning-position)))))
              (save-match-data
                (pcase direction
                  ('below
diff --git a/modules/tools/neotree/autoload.el b/modules/tools/neotree/autoload.el
index 917e0ed8e..69720725f 100644
--- a/modules/tools/neotree/autoload.el
+++ b/modules/tools/neotree/autoload.el
@@ -8,8 +8,7 @@
 (defun +neotree/open ()
   "Open the neotree window in the current project."
   (interactive)
-  (let ((path buffer-file-name)
-        (project-root (doom-project-root 'nocache)))
+  (let ((project-root (doom-project-root 'nocache)))
     (require 'neotree)
     (if (neo-global--window-exists-p)
         (neotree-hide)