From 0248e384a2f6a210b9a8de6292ebb0e6a18072e4 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Wed, 23 Mar 2016 17:11:55 -0400 Subject: [PATCH] restclient: install both ob-http and restclient The variable `restclient-use-org` now just set the auto mode alist it does not select which package to install. --- layers/restclient/packages.el | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/layers/restclient/packages.el b/layers/restclient/packages.el index 67080f56d..efac26ea1 100644 --- a/layers/restclient/packages.el +++ b/layers/restclient/packages.el @@ -9,22 +9,28 @@ ;; ;;; License: GPLv3 (setq restclient-packages - '((ob-http :toggle restclient-use-org) - (restclient :toggle (null restclient-use-org)))) + '(ob-http + restclient)) (defun restclient/init-ob-http () (use-package ob-http - :mode ("\\.http\\'" . org-mode) - :init (spacemacs|use-package-add-hook org - :post-config (add-to-list 'org-babel-load-languages '(http . t))))) + :init + (progn + (when restclient-use-org + (add-to-list 'auto-mode-alist '("\\.http\\'" . org-mode))) + (spacemacs|use-package-add-hook org + :post-config (add-to-list 'org-babel-load-languages '(http . t)))))) (defun restclient/init-restclient () (use-package restclient - :mode ("\\.http\\'" . restclient-mode) :defer t - :init (spacemacs/set-leader-keys-for-major-mode 'restclient-mode - "s" 'restclient-http-send-current-stay-in-window - "S" 'restclient-http-send-current - "r" 'restclient-http-send-current-raw-stay-in-window - "R" 'restclient-http-send-current-raw - "y" 'restclient-copy-curl-command))) + :init + (progn + (unless restclient-use-org + (add-to-list 'auto-mode-alist '("\\.http\\'" . restclient-mode))) + (spacemacs/set-leader-keys-for-major-mode 'restclient-mode + "s" 'restclient-http-send-current-stay-in-window + "S" 'restclient-http-send-current + "r" 'restclient-http-send-current-raw-stay-in-window + "R" 'restclient-http-send-current-raw + "y" 'restclient-copy-curl-command))))