Skip to content

Remove final cl requires #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2016
Merged

Remove final cl requires #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions haskell-cabal.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

;; (defun haskell-cabal-extract-fields-from-doc ()
;; (require 'xml)
;; (with-no-warnings (require 'cl))
;; (let ((section (completing-read
;; "Section: "
;; '("general-fields" "library" "executable" "buildinfo"))))
Expand All @@ -43,8 +42,8 @@
;; (let* ((xml (xml-parse-region
;; (progn (search-forward "<variablelist>") (match-beginning 0))
;; (progn (search-forward "</variablelist>") (point))))
;; (varlist (remove-if-not 'consp (cddar xml)))
;; (syms (mapcar (lambda (entry) (caddr (assq 'literal (assq 'term entry))))
;; (varlist (cl-remove-if-not 'consp (cl-cddar xml)))
;; (syms (mapcar (lambda (entry) (cl-caddr (assq 'literal (assq 'term entry))))
;; varlist))
;; (fields (mapcar (lambda (sym) (substring-no-properties sym 0 -1)) syms)))
;; fields))
Expand Down
22 changes: 8 additions & 14 deletions haskell-doc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@

;;; Code:

(eval-when-compile (require 'cl))

(require 'haskell-mode)
(require 'haskell-process)
(require 'haskell)
Expand Down Expand Up @@ -1539,18 +1537,14 @@ If SYNC is non-nil, make the call synchronously instead."
(if sync
(let ((response (haskell-process-queue-sync-request process ghci-command)))
(funcall callback (funcall process-response response)))
(lexical-let ((process process)
(callback callback)
(ghci-command ghci-command)
(process-response process-response))
(haskell-process-queue-command
process
(make-haskell-command
:go (lambda (_) (haskell-process-send-string process ghci-command))
:complete
(lambda (_ response)
(funcall callback (funcall process-response response))))))
'async))))
(haskell-process-queue-command
process
(make-haskell-command
:go (lambda (_) (haskell-process-send-string process ghci-command))
:complete
(lambda (_ response)
(funcall callback (funcall process-response response))))))
'async)))

(defun haskell-doc-sym-doc (sym)
"Show the type of given symbol SYM.
Expand Down