Merge branch 'version-0.1.5'0.1.5

- Adjust emacsql
- Fix initialization
- Rewrite string comparison using string-distance
- Update documentation
- Fix package requirments for MELPA

1 files changed, 3 insertions, 3 deletions

diff --git a/gnosis-dev.el b/gnosis-dev.el
index 6801290..d93dc87 100644
--- a/gnosis-dev.el
+++ b/gnosis-dev.el
@@ -110,12 +110,12 @@ by the thoracodorsal nerve."
 If ask nil, leave development env"
   (interactive)
   (let ((ask (y-or-n-p "Start development env (n for exit)?"))
-	(testing-dir (concat gnosis-dir "/testing")))
+	(testing-dir (concat gnosis-dir "testing")))
     (if ask
 	(progn
 	  (unless (file-exists-p testing-dir)
 	    (make-directory testing-dir))
-	  (setf gnosis-db (emacsql-sqlite (concat testing-dir "/testing.db")))
+	  (setf gnosis-db (emacsql-sqlite-open (expand-file-name "testing.db" testing-dir)))
 	  (setf gnosis-testing t)
 	  (dolist (table '(notes decks review review-log extras))
 	    (condition-case nil
@@ -125,7 +125,7 @@ If ask nil, leave development env"
 	  (gnosis-dev-add-fields)
 	  (message "Adding testing values...")
 	  (message "Development env is ready for testing."))
-      (setf gnosis-db (emacsql-sqlite (concat (file-name-as-directory gnosis-dir) "gnosis.db")))
+      (setf gnosis-db (emacsql-sqlite-open (expand-file-name "gnosis.db" gnosis-dir)))
       (setf gnosis-testing nil)
       (message "Exited development env."))))