[nongnu] elpa/idris-mode 6c22a7b 8/8: Merge pull request #544 from jfdm/borrowings-idris2-mode

[ELPA Syncer]

branch: elpa/idris-mode
commit 6c22a7b23a004a80e93cce45f3dc6ab4642f75b8
Merge: 2939f5a b6f6fb2
Author: Jan de Muijnck-Hughes <jfdm@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #544 from jfdm/borrowings-idris2-mode
    
    Borrowings idris2 mode
---
 .github/workflows/idris1.yml                |  2 +-
 .gitignore                                  | 13 +++++++++++
 Makefile                                    | 35 +++++++++++++++++++++--------
 documentation.tex => docs/documentation.tex |  0
 idris-common-utils.el                       | 11 ++++-----
 idris-ipkg-mode.el                          | 30 ++++++++++++++++++++++++-
 idris-settings.el                           |  2 +-
 7 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/idris1.yml b/.github/workflows/idris1.yml
index 89ed72f..7281289 100644
--- a/.github/workflows/idris1.yml
+++ b/.github/workflows/idris1.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        emacs: [24.5, 25.3, 26.1]
+        emacs: [25.3, 26.1, 27.2]
         idris: [git, stackage]
     env:
       EMACS_VERSION: ${{ matrix.emacs }}
diff --git a/.gitignore b/.gitignore
index a3e1662..1064ee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,16 @@ documentation.log
 documentation.pdf
 test-data/build/
 test-data/*.ibc
+test-data/idris2-history.eld
+test-data/Empty.idr
+
+docs/*.aux
+docs/*.log
+docs/*.pdf
+docs/auto/
+docs/*.fdb_latexmk
+docs/*.fls
+docs/*.xdv
+
+*.ttc
+*.ttm
diff --git a/Makefile b/Makefile
index 6342d78..df16c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,19 @@
 
 EMACS ?= emacs
 
+NEED_PKGS=prop-menu
+
 BATCHEMACS=$(EMACS) --batch --no-site-file -q \
        -eval '(add-to-list (quote load-path) "${PWD}/")' \
        -eval '(require (quote package))' \
        -eval '(add-to-list (quote package-archives) (quote ("melpa" . 
"http://melpa.org/packages/";)) t)' \
        -eval '(package-initialize)'
 
-BYTECOMP = $(BATCHEMACS) -eval '(progn (require (quote bytecomp)) (setq 
byte-compile-warnings t) (setq byte-compile-error-on-warn t))' -f 
batch-byte-compile
+BYTECOMP = $(BATCHEMACS) \
+       -eval '(require (quote bytecomp))' \
+       -eval '(setq byte-compile-warnings t)' \
+       -eval '(setq byte-compile-error-on-warn t)' \
+       -f batch-byte-compile
 
 OBJS = idris-commands.elc              \
        idris-common-utils.elc          \
@@ -44,20 +50,31 @@ test: getdeps build
 test2: getdeps build
        $(BATCHEMACS) -L . \
                -eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-                -eval '(setq idris-repl-history-file 
"~/.idris2/idris2-histtory.eld")' \
+               -eval '(setq idris-repl-history-file 
"~/.idris2/idris2-history.eld")' \
                -l ert -l idris-tests2.el -f ert-run-tests-batch-and-exit
+
 test3: getdeps build
        $(BATCHEMACS) -L . \
                -eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-                -eval '(setq idris-repl-history-file "idris2-histtory.eld")' \
-                -eval '(setq idris-log-events t)' \
+               -eval '(setq idris-repl-history-file "idris2-history.eld")' \
+               -eval '(setq idris-log-events t)' \
                -l ert -l idris-tests3.el -f ert-run-tests-batch-and-exit
 
 clean:
-       -rm -f $(OBJS)
-       -rm -f test-data/*ibc
-
+       -${RM} -f $(OBJS)
+       -${RM} -f test-data/*ibc
+       -${RM} -rf test-data/build/
+       -${RM} -r docs/auto docs/*.aux docs/*.log docs/*.pdf
 getdeps:
-       $(BATCHEMACS) -eval '(progn (package-refresh-contents) (unless 
(package-installed-p (quote prop-menu)) (package-install (quote prop-menu))))'
+       $(BATCHEMACS) -eval \
+               "(let* \
+                   ((need-pkgs '($(NEED_PKGS))) \
+                    (want-pkgs (seq-remove #'package-installed-p need-pkgs))) \
+                 (unless (null want-pkgs) \
+                   (package-refresh-contents) \
+                   (mapcar #'package-install want-pkgs)))"
+
+docs: docs/documentation.tex
+       -@( cd docs/ && latexmk -xelatex documentation.tex )
 
-.PHONY: clean build test getdeps
+.PHONY: clean build test getdeps docs
diff --git a/documentation.tex b/docs/documentation.tex
similarity index 100%
rename from documentation.tex
rename to docs/documentation.tex
diff --git a/idris-common-utils.el b/idris-common-utils.el
index 444d21a..d08b451 100644
--- a/idris-common-utils.el
+++ b/idris-common-utils.el
@@ -161,13 +161,10 @@ inserted text (that is, relative to point prior to 
insertion)."
          (err-face (if idris-err
                        '(idris-warning-face)
                      ()))
-         (text-face (pcase text-format
-                      (`(:text-formatting :bold)
-                       '(bold))
-                      (`(:text-formatting :italic)
-                       '(italic))
-                      (`(:text-formatting :underline)
-                       '(underline))
+         (text-face (pcase (cadr text-format)
+                      (:bold      '(bold))
+                      (:italic    '(italic))
+                      (:underline '(underline))
                       (_ nil)))
          (link-face (if link-href '(idris-link-face) ()))
          (unique-val (cl-gensym)) ; HACK to stop consecutive mouse-faces from 
interfering
diff --git a/idris-ipkg-mode.el b/idris-ipkg-mode.el
index f77f089..4ce5ea4 100644
--- a/idris-ipkg-mode.el
+++ b/idris-ipkg-mode.el
@@ -53,7 +53,35 @@
     st))
 
 (defconst idris-ipkg-keywords
-  '("package" "opts" "modules" "sourcedir" "makefile" "objs" "executable" 
"main" "libs" "pkgs"))
+  '("package"
+    "authors"
+    "maintainers"
+    "license"
+    "brief"
+    "readme"
+    "homepage"
+    "sourceloc"
+    "bugtracker"
+    "options"
+    "opts"
+    "sourcedir"
+    "builddir"
+    "outputdir"
+    "prebuild"
+    "postbuild"
+    "preinstall"
+    "postinstall"
+    "preclean"
+    "postclean"
+    "version"
+    "depends"
+    "modules"
+    "main"
+    "executable"
+    "makefile"
+    "objs"
+    "libs"
+    "pkgs"))
 
 (defconst idris-ipkg-font-lock-defaults
   `(,idris-ipkg-keywords))
diff --git a/idris-settings.el b/idris-settings.el
index 4045178..5033404 100644
--- a/idris-settings.el
+++ b/idris-settings.el
@@ -118,7 +118,7 @@ The log is placed in `idris-event-buffer-name'."
   :group 'idris-faces)
 
 (defface idris-semantic-postulate-face
-  '((t (:inherit idris-semantic-function-face :weight semi-bold)))
+  '((t (:inherit idris-unsafe-face :weight semi-bold)))
   "The face to be used to highlight postulated values"
   :group 'idris-faces)