Permalink
Browse files

Ensure "make check-declare" succeeds

* Cask: Restore dev dependencies.

* Makefile: Remove really old lame targets.

* lispy.el (cider-doc-lookup): Update declare.

* targets/check-declare.el: Ensure sly/contrib is on the path.

* targets/install-deps.el (lispy-dev-packages): Add a few packages.
(package-list-packages): Don't error if there's nothing to upgrade.
  • Loading branch information...
1 parent 32086f1 commit 4b648260ee11f3482f2a27be0613f2c553e68d21 @abo-abo committed Apr 11, 2016
Showing with 30 additions and 16 deletions.
  1. +4 −3 Cask
  2. +1 −9 Makefile
  3. +2 −1 lispy.el
  4. +15 −0 targets/check-declare.el
  5. +8 −3 targets/install-deps.el
View
@@ -9,9 +9,10 @@
(depends-on "iedit")
(depends-on "multiple-cursors")
(depends-on "cider")
- ;; (depends-on "slime")
- ;; (depends-on "geiser")
- ;; (depends-on "projectile")
+ (depends-on "slime")
+ (depends-on "sly")
+ (depends-on "geiser")
+ (depends-on "projectile")
(depends-on "clojure-mode")
(depends-on "swiper")
(depends-on "hydra")
View
@@ -28,16 +28,8 @@ test:
elisp:
$(QEMACS) lispy.el
-clojure:
- $(QEMACS) ~/git/incanter/modules/incanter-core/src/incanter/bayes.clj
-
-scheme:
- $(QEMACS) ~/Dropbox/source/scheme/script3.scm -f lispy-mode
-
-lisp:
- $(QEMACS) ~/Dropbox/source/site-lisp/git/slime/metering.lisp
clean:
rm -f *.elc
-.PHONY: all clean cask elisp clojure lisp scheme check-declare
+.PHONY: all clean cask elisp check-declare
View
@@ -4054,7 +4054,7 @@ When ARG is non-nil, force select the window."
(interactive)
(lispy-goto-symbol (lispy--current-function)))
-(declare-function cider-doc-lookup "ext:cider-interaction")
+(declare-function cider-doc-lookup "ext:cider-doc")
(defun lispy-describe ()
"Display documentation for `lispy--current-function'."
@@ -4066,6 +4066,7 @@ When ARG is non-nil, force select the window."
((boundp symbol)
(describe-variable symbol)))))
((memq major-mode lispy-clojure-modes)
+ (require 'cider-doc)
(cider-doc-lookup (lispy--current-function)))
(t
@@ -10,4 +10,19 @@
(locate-library "slime"))
"contrib/"))
(require 'slime-repl)
+
+(defun find-library-file (lib)
+ (save-window-excursion
+ (let ((buf (find-library lib)))
+ (when buf
+ (buffer-file-name buf)))))
+
+
+(let ((sly-file (find-library-file "sly")))
+ (when sly-file
+ (add-to-list
+ 'load-path
+ (expand-file-name
+ "contrib" (file-name-directory sly-file)))))
+
(apply #'check-declare-files files)
@@ -12,11 +12,15 @@
multiple-cursors
cider
slime
+ sly
geiser
clojure-mode
swiper
hydra
ace-window
+ helm
+ projectile
+ find-file-in-project
undercover))
(dolist (package lispy-dev-packages)
@@ -26,9 +30,10 @@
(save-window-excursion
(package-list-packages t)
- (package-menu-mark-upgrades)
(condition-case nil
- (package-menu-execute t)
+ (progn
+ (package-menu-mark-upgrades)
+ (package-menu-execute t))
(error
- (package-menu-execute))))
+ (message "All packages up to date"))))

0 comments on commit 4b64826

Please sign in to comment.