[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog b2838d5477 004/166: Cleanup
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sweeprolog b2838d5477 004/166: Cleanup |
Date: |
Fri, 30 Sep 2022 04:59:21 -0400 (EDT) |
branch: elpa/sweeprolog
commit b2838d5477cf210b8f52c4180198c294f1cc75a3
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
Cleanup
---
sweep.el | 23 ++++++++++++++---------
sweep.h | 6 +++---
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/sweep.el b/sweep.el
index 961eac9128..5e8791f53f 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 d1e1efcdd3..03d7324cae 100644
--- a/sweep.h
+++ b/sweep.h
@@ -5,11 +5,11 @@
#include <SWI-Prolog.h>
#include <SWI-Stream.h>
-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*/
- [nongnu] elpa/sweeprolog 3351766605 103/166: sweep.el: bump Package-Version to 0.2.0, (continued)
- [nongnu] elpa/sweeprolog 3351766605 103/166: sweep.el: bump Package-Version to 0.2.0, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5b9e2d7d7c 126/166: ADDED: sweep_op_info/2: new_predicate, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5eb4ede8f8 113/166: ADDED: (sweep-prefix-operators): New function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 2abad939fe 108/166: DOC: Following file specifications: new section, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6dd6433920 165/166: ENHANCED: fontify quasi-quotation content according to its type, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 48e8fb7c65 155/166: ENHANCED: (sweep--colour-term-to-face): return multiple regions, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1c87ca72e3 163/166: DOC: document new variable highlighting in the manual, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a8d186092f 157/166: ENHANCED: More indicative error on failure to locate sweep-module, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 97856b5c85 159/166: DOC: add installation instructions from NonGNU ELPA, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 348294a57f 002/166: Add swipl-devel submodule, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog b2838d5477 004/166: Cleanup,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog 4f96499382 011/166: DOC: expand README.org, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5c4aef50f2 041/166: Run `ninja install` as root in CI, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a6e37f306b 069/166: ENHANCED: fontify mutlifile predicate calls in a dedicated face, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 4299c39d62 070/166: ENHANCED: indentation edge cases handling, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1a19f7b3be 074/166: DOC: document font-lock and xref integration for sweep-mode, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1c6d2e96a8 078/166: ENHANCED: allow user to specify location of swipl binary, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5a8f70149f 099/166: FIXED: (sweep-load-buffer): error after prompting for a buffer, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 7327016d15 095/166: FIXED: sweep_predicates_collection/2: include preds defined in user, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a70a730f48 087/166: PORT: don't use the 2nd arg to looking-at, added only in Emacs 29, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog d1a2913f75 115/166: ENHANCED: Update semantic highlighting on idle timer in sweep-mode, ELPA Syncer, 2022/09/30