From b2838d5477cf210b8f52c4180198c294f1cc75a3 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Sat, 27 Aug 2022 10:05:10 +0300 Subject: [PATCH] Cleanup --- sweep.el | 23 ++++++++++++++--------- sweep.h | 6 +++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/sweep.el b/sweep.el index 961eac9..5e8791f 100644 --- a/sweep.el +++ b/sweep.el @@ -18,13 +18,15 @@ (defvar sweep-install-buffer-name "*Install sweep*" "Name of the buffer used for compiling sweep-module.") +(defun sweep-home-directory () + (file-name-directory (locate-library "sweep.el" t))) + ;;;###autoload (defun sweep-module-compile () "Compile sweep-module." (interactive) (let* ((sweep-directory - (shell-quote-argument - (file-name-directory (locate-library "sweep.el" t)))) + (shell-quote-argument (sweep-home-directory))) (make-commands (concat "cd " sweep-directory "; make; cd -")) @@ -40,8 +42,13 @@ (if (y-or-n-p "Sweep needs `sweep-module' to work. Compile it now? ") (progn (sweep-module-compile) - (require 'sweep-module)) - (error "Sweep will not work until `sweep-module' is compiled!"))) + (require 'sweep-module) + (sweep-initialize (expand-file-name "bin/swipl" + (sweep-home-directory)) + "-q" + (expand-file-name "sweep.pl" + (sweep-home-directory)))) + (error "Sweep will not work until `sweep-module' is compiled!"))) (declare-function sweep-initialize "sweep-module") (declare-function sweep-initialized-p "sweep-module") @@ -108,13 +115,11 @@ (interactive (list (sweep-read-module-name))) (find-file (sweep-module-path mod))) -;; (add-to-list 'load-path (expand-file-name "~/checkouts/sweep/")) +;;;; Testing: +;; (add-to-list 'load-path (file-name-directory (buffer-file-name))) ;; (require 'sweep) -;; (sweep-initialized-p) -;; (sweep-initialize (executable-find "swipl") "-q" (expand-file-name "sweep.pl" (file-name-directory (locate-library "sweep.el" t)))) - - (provide 'sweep) + ;;; sweep.el ends here diff --git a/sweep.h b/sweep.h index d1e1efc..03d7324 100644 --- a/sweep.h +++ b/sweep.h @@ -5,11 +5,11 @@ #include #include -static int value_to_term(emacs_env*, emacs_value, term_t); +static int value_to_term(emacs_env*, emacs_value, term_t); static emacs_value term_to_value(emacs_env*, term_t); static char * estring_to_cstring(emacs_env*, emacs_value, ptrdiff_t*); -static int estring_to_atom(emacs_env*, emacs_value, term_t); -static IOSTREAM * estring_to_stream(emacs_env*, emacs_value); static void ethrow(emacs_env*, const char*); +/* static int estring_to_atom(emacs_env*, emacs_value, term_t); */ +/* static IOSTREAM * estring_to_stream(emacs_env*, emacs_value); */ #endif /*_SWEEP_H*/ -- 2.39.2