[nongnu] elpa/idris-mode a96c77f658 1/4: Remove `save-excursion` block around `(idris-load-file-sync)`

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit a96c77f6588eebb63d87cf1935eabc96d463e304
Author: Marek L 
Commit: Marek L 

Remove `save-excursion` block around `(idris-load-file-sync)`

The idris-load-file-sync should not change the point and if it may
it will be beter add the save-excursion inside rather than duplicate
that everywhere.
---
 idris-commands.el | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/idris-commands.el b/idris-commands.el
index 4cfe3489eb..501732db00 100644
--- a/idris-commands.el
+++ b/idris-commands.el
@@ -535,7 +535,7 @@ Useful for writing papers or slides."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (car (idris-eval `(:case-split ,(cdr what) ,(car what)
 (initial-position (point)))
 (if (<= (length result) 2)
@@ -551,7 +551,7 @@ Useful for writing papers or slides."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (car (idris-eval `(:make-case ,(cdr what) ,(car what))
 (if (<= (length result) 2)
 (message "Can't make cases from %s" (car what))
@@ -581,7 +581,7 @@ Otherwise, case split as a pattern variable."
   (let ((what (idris-thing-at-point))
 (command (if proof :add-proof-clause :add-clause)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (string-trim-left (car (idris-eval `(,command ,(cdr what) 
,(car what))
 final-point
 (prefix (save-excursion; prefix is the indentation to 
insert for the clause
@@ -615,7 +615,7 @@ Otherwise, case split as a pattern variable."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (car (idris-eval `(:add-missing ,(cdr what) ,(car 
what))
 (forward-line 1)
 (insert result)
@@ -625,7 +625,7 @@ Otherwise, case split as a pattern variable."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (car (idris-eval `(:make-with ,(cdr what) ,(car what))
 (beginning-of-line)
 (kill-line)
@@ -636,7 +636,7 @@ Otherwise, case split as a pattern variable."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let* ((result (car (idris-eval `(:make-lemma ,(cdr what) ,(car what)
  (lemma-type (car result)))
 ;; There are two cases here: either a ?hole, or the {name} of a 
provisional defn.
@@ -732,7 +732,7 @@ A plain prefix ARG causes the command to prompt for hints 
and recursion
  (t nil)))
 (what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
 
   (let ((result (car (if (> idris-protocol-version 1)
  (idris-eval `(:proof-search ,(cdr what) ,(car 
what)))
@@ -766,7 +766,7 @@ Idris 2 only."
   (interactive)
   (let ((what (idris-thing-at-point)))
 (when (car what)
-  (save-excursion (idris-load-file-sync))
+  (idris-load-file-sync)
   (let ((result (car (idris-eval `(:generate-def ,(cdr what) ,(car 
what)
 final-point
 (prefix (save-excursion
@@ -822,7 +822,7 @@ Idris 2 only."
   (let ((what (idris-thing-at-point)))
 (unless (car what)
   (error "Could not find a hole at point to refine by"))
-(save-excursion (idris-load-file-sync))
+(idris-load-file-sync)
 (let ((results (car (idris-eval `(:intro ,(cdr what) ,(car what))
   (pcase results
 (`(,result) (idris-replace-hole-with result))
@@ -834,7 +834,7 @@ Idris 2 only."
   (let ((what (idris-thing-at-point)))
 (unless (car what)
   (error "Could not find a hole at point to refine by"))
-(save-excursion (idris-load-file-sync))
+(idris-load-file-sync)
 (let ((result (car (idris-eval `(:refine ,(cdr what) ,(car what) ,name)
   (idris-replace-hole-with result
 
@@ -889,7 +889,7 @@ type-correct, so loading will fail."
   "Get a list of currently open holes."
   (interactive)
   (when (idris-current-buffer-dirty-p)
-(save-excursion (idris-load-file-sync)))
+(idris-load-file-sync))
   (idris-hole-list-show (car (idris-eval '(:metavariables 80)
 
 (defun idris-list-compiler-notes ()



[nongnu] elpa/idris-mode updated (253e2ad909 -> f69b32d689)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch elpa/idris-mode.

  from  253e2ad909 Merge pull request #605 from keram/print-def
   new  a96c77f658 Remove `save-excursion` block around 
`(idris-load-file-sync)`
   new  d122a70fed Simplify code by replacing `let & if` expressions with 
`or`
   new  b0b3cdf549 Fix code indentation to improve readability
   new  f69b32d689 Merge pull request #608 from keram/code-impro4


Summary of changes:
 idris-commands.el | 105 +++---
 idris-common-utils.el |   4 +-
 2 files changed, 50 insertions(+), 59 deletions(-)



[nongnu] elpa/idris-mode b0b3cdf549 3/4: Fix code indentation to improve readability

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit b0b3cdf549b3cfa617106d4bb77f8f0b0e2a2a78
Author: Marek L 
Commit: Marek L 

Fix code indentation to improve readability
---
 idris-commands.el | 69 ---
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/idris-commands.el b/idris-commands.el
index 44e9cbfdfe..07b78d9014 100644
--- a/idris-commands.el
+++ b/idris-commands.el
@@ -101,7 +101,7 @@
 (error "Failed to switch the working directory %s" eval-result)
 
 (define-obsolete-function-alias 'idris-list-holes-on-load 'idris-list-holes 
"2022-12-15"
-   "Use the user's settings from customize to determine whether to list the 
holes.")
+  "Use the user's settings from customize to determine whether to list the 
holes.")
 
 (defun idris-possibly-make-dirty (_beginning _end _length)
   "Make the buffer dirty."
@@ -145,7 +145,8 @@
   (setq idris-load-to-here (copy-marker pos t))
   (setq overlay-arrow-position (copy-marker (save-excursion
   (goto-char pos)
-  (line-beginning-position)) nil)))
+  (line-beginning-position))
+nil)))
 
 (defun idris-no-load-to ()
   (setq idris-load-to-here nil)
@@ -247,7 +248,7 @@ A prefix argument SET-LINE forces loading but only up to 
the current line."
   "Jump to the previous error overlay in the buffer."
   (interactive)
   (let ((warnings-backward (sort (cl-remove-if-not #'(lambda (w) (< 
(overlay-end w) (point))) idris-warnings)
-#'(lambda (w1 w2) (>= (overlay-end w1) 
(overlay-end w2))
+ #'(lambda (w1 w2) (>= (overlay-end w1) 
(overlay-end w2))
 (if warnings-backward
 (goto-char (overlay-end (car warnings-backward)))
   (error "No warnings or errors until beginning of buffer"
@@ -284,9 +285,9 @@ This sets the load position to point, if there is one."
 (defun idris-info-for-name (command name)
   "Pass to Idris compiler COMMAND with NAME as argument and display the 
result."
   (let* ((ty (idris-eval (list command name)))
- (result (car ty))
- (formatting (cdr ty)))
-  (idris-show-info (format "%s" result) formatting)))
+ (result (car ty))
+ (formatting (cdr ty)))
+(idris-show-info (format "%s" result) formatting)))
 
 
 (defun idris-type-at-point (thing)
@@ -454,28 +455,28 @@ KILLFLAG is set if N was explicitly specified."
   (interactive "p\nP")
   (unless (integerp n)
 (signal 'wrong-type-argument (list 'integerp n)))
-   (cond
-;; Under the circumstances that `delete-forward-char' does something
-;; special, delegate to it. This was discovered by reading the source to
-;; it.
-((and (use-region-p)
-  delete-active-region
-  (= n 1))
- (call-interactively 'delete-forward-char n killflag))
-;; If in idris-mode and editing an LIDR file and at the end of a line,
-;; then delete the newline and a leading >, if it exists
-((and (eq major-mode 'idris-mode)
-  (idris-lidr-p)
-  (= n 1)
-  (eolp))
- (delete-char 1 killflag)
- (when (and (not (eolp)) (equal (following-char) ?\>))
-   (delete-char 1 killflag)
-   (when (and (not (eolp)) (equal (following-char) ?\ ))
- (delete-char 1 killflag
-;; Nothing special to do - delegate to `delete-char', just as
-;; `delete-forward-char' does
-(t (delete-char 1 killflag
+  (cond
+   ;; Under the circumstances that `delete-forward-char' does something
+   ;; special, delegate to it. This was discovered by reading the source to
+   ;; it.
+   ((and (use-region-p)
+ delete-active-region
+ (= n 1))
+(call-interactively 'delete-forward-char n killflag))
+   ;; If in idris-mode and editing an LIDR file and at the end of a line,
+   ;; then delete the newline and a leading >, if it exists
+   ((and (eq major-mode 'idris-mode)
+ (idris-lidr-p)
+ (= n 1)
+ (eolp))
+(delete-char 1 killflag)
+(when (and (not (eolp)) (equal (following-char) ?\>))
+  (delete-char 1 killflag)
+  (when (and (not (eolp)) (equal (following-char) ?\ ))
+(delete-char 1 killflag
+   ;; Nothing special to do - delegate to `delete-char', just as
+   ;; `delete-forward-char' does
+   (t (delete-char 1 killflag
 
 
 (defun idris-apropos (what)
@@ -691,7 +692,7 @@ Otherwise, case split as a pattern variable."
   (idris-load-file-sync)
   (if (>=-protocol-version 2 1)
   (let ((name (read-string "MExpression to compile & execute (default 
main): "
- nil nil "main")))
+   nil nil "main")))
 (idris-repl-eval-string (format ":exec %s" name) 0))
 (idris-eval '(:interpret ":exec"
 
@@ -731,7 +732,7 @@ A plain prefix ARG causes the command t

[nongnu] elpa/idris-mode d122a70fed 2/4: Simplify code by replacing `let & if` expressions with `or`

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit d122a70fedb0a800c1cd1a4fc734101b34ddeb7e
Author: Marek L 
Commit: Marek L 

Simplify code by replacing `let & if` expressions with `or`
---
 idris-commands.el | 14 +++---
 idris-common-utils.el |  4 +---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/idris-commands.el b/idris-commands.el
index 501732db00..44e9cbfdfe 100644
--- a/idris-commands.el
+++ b/idris-commands.el
@@ -169,9 +169,7 @@
 Returning these as a cons."
   (let* ((fn (buffer-file-name))
  (ipkg-srcdir (idris-ipkg-find-src-dir))
- (srcdir (if ipkg-srcdir
- ipkg-srcdir
-   (file-name-directory fn
+ (srcdir (or ipkg-srcdir (file-name-directory fn
 (when (and  ;; check that srcdir is prefix of filename - then load relative
(> (length fn) (length srcdir))
(string= (substring fn 0 (length srcdir)) srcdir))
@@ -589,10 +587,7 @@ Otherwise, case split as a pattern variable."
   (forward-line (1- (cdr what)))
   (goto-char (line-beginning-position))
   (re-search-forward "\\(^>?\\s-*\\)" nil t)
-  (let ((prefix (match-string 1)))
-(if prefix
-prefix
-  "")
+  (or (match-string 1) ""
 ;; Go forward until we get to a line with equal or less indentation to
 ;; the type declaration, or the end of the buffer, and insert the
 ;; result
@@ -774,10 +769,7 @@ Idris 2 only."
   (forward-line (1- (cdr what)))
   (goto-char (line-beginning-position))
   (re-search-forward "\\(^>?\\s-*\\)" nil t)
-  (let ((prefix (match-string 1)))
-(if prefix
-prefix
-  "")
+  (or (match-string 1) ""
 (if (string= result "")
 (error "Nothing found")
   (goto-char (line-beginning-position))
diff --git a/idris-common-utils.el b/idris-common-utils.el
index e80c31c638..986f0dbdff 100644
--- a/idris-common-utils.el
+++ b/idris-common-utils.el
@@ -455,8 +455,6 @@ Does not return a line number."
   (cons (get-text-property (point) 'idris-ref)
 (cl-loop for overlay in (overlays-at (point))
  collecting (overlay-get overlay 'idris-ref))
-(if (null ref)
-(car (idris-thing-at-point))
-  (car ref
+(car (or ref (idris-thing-at-point)
 
 (provide 'idris-common-utils)



[nongnu] elpa/idris-mode f69b32d689 4/4: Merge pull request #608 from keram/code-impro4

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit f69b32d689907a1a13cd524eb87d5b6679aeaf76
Merge: 253e2ad909 b0b3cdf549
Author: Jan de Muijnck-Hughes 
Commit: GitHub 

Merge pull request #608 from keram/code-impro4

Minor code improvements without expected change in behaviour
---
 idris-commands.el | 105 +++---
 idris-common-utils.el |   4 +-
 2 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/idris-commands.el b/idris-commands.el
index 4cfe3489eb..07b78d9014 100644
--- a/idris-commands.el
+++ b/idris-commands.el
@@ -101,7 +101,7 @@
 (error "Failed to switch the working directory %s" eval-result)
 
 (define-obsolete-function-alias 'idris-list-holes-on-load 'idris-list-holes 
"2022-12-15"
-   "Use the user's settings from customize to determine whether to list the 
holes.")
+  "Use the user's settings from customize to determine whether to list the 
holes.")
 
 (defun idris-possibly-make-dirty (_beginning _end _length)
   "Make the buffer dirty."
@@ -145,7 +145,8 @@
   (setq idris-load-to-here (copy-marker pos t))
   (setq overlay-arrow-position (copy-marker (save-excursion
   (goto-char pos)
-  (line-beginning-position)) nil)))
+  (line-beginning-position))
+nil)))
 
 (defun idris-no-load-to ()
   (setq idris-load-to-here nil)
@@ -169,9 +170,7 @@
 Returning these as a cons."
   (let* ((fn (buffer-file-name))
  (ipkg-srcdir (idris-ipkg-find-src-dir))
- (srcdir (if ipkg-srcdir
- ipkg-srcdir
-   (file-name-directory fn
+ (srcdir (or ipkg-srcdir (file-name-directory fn
 (when (and  ;; check that srcdir is prefix of filename - then load relative
(> (length fn) (length srcdir))
(string= (substring fn 0 (length srcdir)) srcdir))
@@ -249,7 +248,7 @@ A prefix argument SET-LINE forces loading but only up to 
the current line."
   "Jump to the previous error overlay in the buffer."
   (interactive)
   (let ((warnings-backward (sort (cl-remove-if-not #'(lambda (w) (< 
(overlay-end w) (point))) idris-warnings)
-#'(lambda (w1 w2) (>= (overlay-end w1) 
(overlay-end w2))
+ #'(lambda (w1 w2) (>= (overlay-end w1) 
(overlay-end w2))
 (if warnings-backward
 (goto-char (overlay-end (car warnings-backward)))
   (error "No warnings or errors until beginning of buffer"
@@ -286,9 +285,9 @@ This sets the load position to point, if there is one."
 (defun idris-info-for-name (command name)
   "Pass to Idris compiler COMMAND with NAME as argument and display the 
result."
   (let* ((ty (idris-eval (list command name)))
- (result (car ty))
- (formatting (cdr ty)))
-  (idris-show-info (format "%s" result) formatting)))
+ (result (car ty))
+ (formatting (cdr ty)))
+(idris-show-info (format "%s" result) formatting)))
 
 
 (defun idris-type-at-point (thing)
@@ -456,28 +455,28 @@ KILLFLAG is set if N was explicitly specified."
   (interactive "p\nP")
   (unless (integerp n)
 (signal 'wrong-type-argument (list 'integerp n)))
-   (cond
-;; Under the circumstances that `delete-forward-char' does something
-;; special, delegate to it. This was discovered by reading the source to
-;; it.
-((and (use-region-p)
-  delete-active-region
-  (= n 1))
- (call-interactively 'delete-forward-char n killflag))
-;; If in idris-mode and editing an LIDR file and at the end of a line,
-;; then delete the newline and a leading >, if it exists
-((and (eq major-mode 'idris-mode)
-  (idris-lidr-p)
-  (= n 1)
-  (eolp))
- (delete-char 1 killflag)
- (when (and (not (eolp)) (equal (following-char) ?\>))
-   (delete-char 1 killflag)
-   (when (and (not (eolp)) (equal (following-char) ?\ ))
- (delete-char 1 killflag
-;; Nothing special to do - delegate to `delete-char', just as
-;; `delete-forward-char' does
-(t (delete-char 1 killflag
+  (cond
+   ;; Under the circumstances that `delete-forward-char' does something
+   ;; special, delegate to it. This was discovered by reading the source to
+   ;; it.
+   ((and (use-region-p)
+ delete-active-region
+ (= n 1))
+(call-interactively 'delete-forward-char n killflag))
+   ;; If in idris-mode and editing an LIDR file and at the end of a line,
+   ;; then delete the newline and a leading >, if it exists
+   ((and (eq major-mode 'idris-mode)
+ (idris-lidr-p)
+ (= n 1)
+ (eolp))
+(delete-char 1 killflag)
+(when (and (not (eolp)) (equal (following-char) ?\>))
+  (delete-char 1 killflag)
+  (when (and (not (eolp)) (equal (following-char) ?\ ))
+(delete-char 1 killflag
+ 

[elpa] externals/org dfcf500df5: org-cdlatex-mode: Fix regression from f01390cf05

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit dfcf500df5bbd9d2293cc7e1efd8acb41b8f0f65
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-cdlatex-mode: Fix regression from f01390cf05

* lisp/org.el (org--math-always-on): Rename to `org--math-p' and only
override `texmathp' when current command is `cdlatex-math-symbol' or
when we are inside Org LaTeX math fragment.  Only these two scenarios
are the places where `texmathp' may not work properly in Org files.
We must not return t outside latex fragments as initially suggested by
the docstring because it would break, for example, `cdlatex-dollar'
command.
(org-cdlatex-mode): Use the new function name for advice.
* lisp/org-compat.el (org--math-always-on): Declare obsolete.

Reported-by: Daniel Fleischer 
Link: https://orgmode.org/list/m2cz7sj5zt@gmail.com
---
 lisp/org-compat.el |  3 +++
 lisp/org.el| 27 ---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 6c50852553..0f6dc831a6 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -568,6 +568,9 @@ Counting starts at 1."
 (make-obsolete 'org-let "to be removed" "9.6")
 (make-obsolete 'org-let2 "to be removed" "9.6")
 
+(define-obsolete-function-alias 'org--math-always-on
+  'org--math-p "9.7")
+
 (defun org-compatible-face (inherits specs)
   "Make a compatible face specification.
 If INHERITS is an existing face and if the Emacs version supports
diff --git a/lisp/org.el b/lisp/org.el
index ae6250e522..44c41a729d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15434,13 +15434,15 @@ in Org mode.
 (cdlatex-compute-tables))
   (unless org-cdlatex-texmathp-advice-is-done
 (setq org-cdlatex-texmathp-advice-is-done t)
-(advice-add 'texmathp :around #'org--math-always-on)))
+(advice-add 'texmathp :around #'org--math-p)))
 
-(defun org--math-always-on (orig-fun &rest args)
-  "Always return t in Org buffers.
-This is because we want to insert math symbols without dollars even outside
-the LaTeX math segments.  If Org mode thinks that point is actually inside
-an embedded LaTeX fragment, let `texmathp' do its job.
+(defun org--math-p (orig-fun &rest args)
+  "Return t inside math fragments or running `cdlatex-math-symbol'.
+This function is intended to be an :around advice for `texmathp'.
+
+If Org mode thinks that point is actually inside
+an embedded LaTeX environment, return t when the environment is math
+or let `texmathp' do its job otherwise.
 `\\[org-cdlatex-mode-map]'"
   (interactive)
   (cond
@@ -15450,11 +15452,14 @@ an embedded LaTeX fragment, let `texmathp' do its job.
 t)
(t
 (let ((element (org-element-context)))
-  (or (not (org-inside-LaTeX-fragment-p element))
-  (if (not (eq (org-element-type element) 'latex-fragment))
-  (apply orig-fun args)
-(setq texmathp-why '("Org mode embedded math" . 0))
-   t))
+  (when (org-inside-LaTeX-fragment-p element)
+(pcase (substring-no-properties
+(org-element-property :value element)
+0 2)
+  ((or "\\(" "\\[" (pred (string-match-p (rx string-start "$"
+   (setq texmathp-why '("Org mode embedded math" . 0))
+   t)
+  (_ (apply orig-fun args
 
 (defun turn-on-org-cdlatex ()
   "Unconditionally turn on `org-cdlatex-mode'."



[elpa] externals/consult 000a40c523: README: Mention Compat

2023-01-11 Thread ELPA Syncer
branch: externals/consult
commit 000a40c5234f16f67db714fcb3bf82711c74e77a
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Mention Compat
---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 0f0d70e198..53f4df4550 100644
--- a/README.org
+++ b/README.org
@@ -1065,9 +1065,9 @@ offer functionality based on ~completing-read~.
 If you find a bug or suspect that there is a problem with Consult, please carry
 out the following steps:
 
-1. *Update all the relevant packages to the newest version*.
-   This includes Consult, Vertico or other completion UIs, Marginalia, Embark
-   and Orderless.
+1. *Update all the relevant packages to the newest version*. This includes
+   Consult, Compat, Vertico or other completion UIs, Marginalia, Embark and
+   Orderless.
 2. Either use the default completion UI or ensure that exactly one of
=vertico-mode=, =mct-mode=, or =icomplete-mode= is enabled. The unsupported 
modes
=ivy-mode=, =helm-mode= and =ido-ubiquitous-mode= must be disabled.



[elpa] externals/consult d04c61d6e6 1/2: README update

2023-01-11 Thread ELPA Syncer
branch: externals/consult
commit d04c61d6e63be501b0cac819a95375ef9f77e0d8
Author: Daniel Mendler 
Commit: Daniel Mendler 

README update
---
 README.org | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index 53f4df4550..3ba50e8832 100644
--- a/README.org
+++ b/README.org
@@ -1065,15 +1065,17 @@ offer functionality based on ~completing-read~.
 If you find a bug or suspect that there is a problem with Consult, please carry
 out the following steps:
 
-1. *Update all the relevant packages to the newest version*. This includes
+1. Search through the issue tracker if your issue has been reported before (and
+   has been resolved eventually) in the meantime.
+2. *Update all the relevant packages to the newest version*. This includes
Consult, Compat, Vertico or other completion UIs, Marginalia, Embark and
Orderless.
-2. Either use the default completion UI or ensure that exactly one of
+3. Either use the default completion UI or ensure that exactly one of
=vertico-mode=, =mct-mode=, or =icomplete-mode= is enabled. The unsupported 
modes
=ivy-mode=, =helm-mode= and =ido-ubiquitous-mode= must be disabled.
-3. Ensure that the =completion-styles= variable is properly configured. Try to 
set
+4. Ensure that the =completion-styles= variable is properly configured. Try to 
set
=completion-styles= to a list including =substring= or =orderless=.
-4. Try to reproduce the issue by starting a bare bone Emacs instance with 
=emacs -Q=
+5. Try to reproduce the issue by starting a bare bone Emacs instance with 
=emacs -Q=
on the command line. Execute the following minimal code snippets in the
scratch buffer. This way we can exclude side effects due to configuration
settings. If other packages are relevant to reproduce the issue, include 
them



[elpa] externals/consult updated (000a40c523 -> 414c41b84f)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch externals/consult.

  from  000a40c523 README: Mention Compat
   new  d04c61d6e6 README update
   new  414c41b84f README update


Summary of changes:
 README.org | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)



[elpa] externals/consult 414c41b84f 2/2: README update

2023-01-11 Thread ELPA Syncer
branch: externals/consult
commit 414c41b84f6ea607973217ab8391224bbcd53706
Author: Daniel Mendler 
Commit: Daniel Mendler 

README update
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 3ba50e8832..3e66fe3b15 100644
--- a/README.org
+++ b/README.org
@@ -1065,7 +1065,7 @@ offer functionality based on ~completing-read~.
 If you find a bug or suspect that there is a problem with Consult, please carry
 out the following steps:
 
-1. Search through the issue tracker if your issue has been reported before (and
+1. *Search through the issue tracker* if your issue has been reported before 
(and
has been resolved eventually) in the meantime.
 2. *Update all the relevant packages to the newest version*. This includes
Consult, Compat, Vertico or other completion UIs, Marginalia, Embark and



[nongnu] elpa/idris-mode bb26a21566 6/6: Merge pull request #607 from keram/impro-xref-integration

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit bb26a215664473cb68906c3febe0e8a6ab346796
Merge: f5bf588ef3 c3e11a8117
Author: Jan de Muijnck-Hughes 
Commit: GitHub 

Merge pull request #607 from keram/impro-xref-integration

Fix small bug in idris-xref jump to column and
---
 idris-xref.el   |   4 +-
 test/idris-xref-test.el | 262 ++--
 2 files changed, 121 insertions(+), 145 deletions(-)

diff --git a/idris-xref.el b/idris-xref.el
index bbc6cb88da..f8914116e7 100644
--- a/idris-xref.el
+++ b/idris-xref.el
@@ -93,8 +93,8 @@ update coordinates to be indexed from 1 as expected by Emacs."
candidate))
 (let ((new-fn (idris-xref-filepath term fn)))
   `(,term (:filename ,new-fn)
-  (:start ,(1+ start-line) ,(1+ start-col))
-  (:end ,(1+ end-line) ,(1+ end-col))
+  (:start ,(1+ start-line) ,start-col)
+  (:end ,(1+ end-line) ,end-col)
 
 (defun idris-xref-make-xref (location)
   "Return a new Xref object from LOCATION."
diff --git a/test/idris-xref-test.el b/test/idris-xref-test.el
index 57d62cb63e..7b8bcc4a88 100644
--- a/test/idris-xref-test.el
+++ b/test/idris-xref-test.el
@@ -21,24 +21,20 @@
 
 (require 'ert)
 (require 'idris-xref)
+(eval-when-compile (require 'cl-lib))
 
 (ert-deftest idris-xref-backend-definitions--error-when-no-connection ()
   "Test that the file is loaded before making search for definition."
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+error-msg)
 (with-current-buffer buffer
   (goto-char (point-min))
   (search-forward ": Test")
   (condition-case err
   (funcall-interactively 'xref-find-definitions "Test")
-(error (message "Error: %s" (error-message-string err)))
-(user-error (message "User Error: %s" (error-message-string err)
+(error (setq error-msg (error-message-string err)
 
-(with-current-buffer "*Messages*"
-  (should
-   (string-match-p "Buffer AddClause.idr has no process"
-   (buffer-substring-no-properties (point-min) 
(point-max)
+(should (string-match-p "Buffer AddClause.idr has no process" error-msg))
 
 ;; Cleanup
 (kill-buffer buffer)))
@@ -46,12 +42,12 @@
 (ert-deftest idris-xref-backend-definitions--not-supported-on-Idris-1 ()
   "Test that user error raised when invoking `xref-find-definitions' used on 
Idris1."
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
-(err-msg "did not understand (synchronous Idris evaluation failed)")
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+(stub-err-msg "did not understand (synchronous Idris evaluation 
failed)")
+error-msg)
+
 (cl-flet ((idris-load-file-sync-stub () nil)
   (idris-eval-stub (&optional &rest _args)
-   (user-error err-msg)))
+   (user-error stub-err-msg)))
   (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
   (advice-add 'idris-eval :override #'idris-eval-stub)
 
@@ -62,14 +58,12 @@
 
 (condition-case err
 (funcall-interactively 'xref-find-definitions "Test")
-  (error (message "%s" (error-message-string err)
+  (error (setq error-msg (error-message-string err)
 
 (advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
 (advice-remove 'idris-eval #'idris-eval-stub)))
 
-(with-current-buffer "*Messages*"
-  (should
-   (string-match-p err-msg (buffer-substring-no-properties (point-min) 
(point-max)
+(should (string-match-p stub-err-msg error-msg))
 
 ;; Cleanup
 (kill-buffer buffer)))
@@ -79,8 +73,8 @@
   ;; Arrange
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
 (idris-protocol-version 3)
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+error-msg)
+
 (cl-flet ((idris-load-file-sync-stub () nil)
   (idris-eval-stub (&optional &rest _args) '()))
   (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
@@ -90,21 +84,16 @@
   (with-current-buffer buffer
 (goto-char (point-min))
 (search-forward ": Test")
-;; (with-demoted-errors "Error: %s"
-;;   ;; Act
-;;   (funcall-interactively 'xref-find-definitions "Test"))
+
 (condition-case err
 (funcall-interactively 'xref-find-definitions "Test")
-  (user-error (message "%s" (error-message-string err)
+  (user-error (setq error-msg (error-message-string err)
 
 (advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
 (advice-remove 'idris-eval #'idris-eval-stub)))
 
-(with-c

[nongnu] elpa/idris-mode updated (f69b32d689 -> bb26a21566)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch elpa/idris-mode.

  from  f69b32d689 Merge pull request #608 from keram/code-impro4
   new  f2cd31d1c5 Move test files to test/ directory
   new  eb4b1fb530 Add extra iterations for processing in tests and
   new  19aa3d7b02 Rewrite test idris-test-idris-type-at-point to use stubs
   new  f5bf588ef3 Merge pull request #606 from keram/test-restruct-draft
   new  c3e11a8117 Fix small bug in idris-xref jump to column and
   new  bb26a21566 Merge pull request #607 from keram/impro-xref-integration


Summary of changes:
 .github/workflows/idris2.yml   |   1 -
 Makefile   |  25 +-
 idris-tests.el | 581 -
 idris-tests3.el|  42 --
 idris-xref.el  |   4 +-
 test/idris-commands-test.el| 295 +++
 test/idris-navigate-test.el| 265 ++
 idris-test-utils.el => test/idris-test-utils.el|  18 +-
 test/idris-tests.el| 142 +
 idris-xref-test.el => test/idris-xref-test.el  | 262 +-
 {test-data => test/test-data}/AddClause.idr|   0
 {test-data => test/test-data}/AddMissing.idr   |   0
 {test-data => test/test-data}/CaseSplit.idr|   0
 test/test-data/Empty.idr   |   0
 {test-data => test/test-data}/GenerateDef.idr  |   0
 {test-data => test/test-data}/MakeLemma.idr|   0
 {test-data => test/test-data}/MakeWithBlock.idr|   0
 {test-data => test/test-data}/MetavarTest.idr  |   0
 {test-data => test/test-data}/ProofSearch.idr  |   0
 {test-data => test/test-data}/Refine.idr   |   0
 {test-data => test/test-data}/TypeAtPoint.idr  |   0
 {test-data => test/test-data}/TypeError.idr|   0
 .../test-data}/cmdline/commandlinetest.ipkg|   0
 .../test-data}/cmdline/src/Command/Line/Test.idr   |   0
 .../test-data}/package-test/Packaging.idr  |   0
 .../test-data}/package-test/test.ipkg  |   0
 26 files changed, 843 insertions(+), 792 deletions(-)
 delete mode 100644 idris-tests.el
 delete mode 100644 idris-tests3.el
 create mode 100644 test/idris-commands-test.el
 create mode 100644 test/idris-navigate-test.el
 rename idris-test-utils.el => test/idris-test-utils.el (91%)
 create mode 100644 test/idris-tests.el
 rename idris-xref-test.el => test/idris-xref-test.el (52%)
 rename {test-data => test/test-data}/AddClause.idr (100%)
 rename {test-data => test/test-data}/AddMissing.idr (100%)
 rename {test-data => test/test-data}/CaseSplit.idr (100%)
 create mode 100644 test/test-data/Empty.idr
 rename {test-data => test/test-data}/GenerateDef.idr (100%)
 rename {test-data => test/test-data}/MakeLemma.idr (100%)
 rename {test-data => test/test-data}/MakeWithBlock.idr (100%)
 rename {test-data => test/test-data}/MetavarTest.idr (100%)
 rename {test-data => test/test-data}/ProofSearch.idr (100%)
 rename {test-data => test/test-data}/Refine.idr (100%)
 rename {test-data => test/test-data}/TypeAtPoint.idr (100%)
 rename {test-data => test/test-data}/TypeError.idr (100%)
 rename {test-data => test/test-data}/cmdline/commandlinetest.ipkg (100%)
 rename {test-data => test/test-data}/cmdline/src/Command/Line/Test.idr (100%)
 rename {test-data => test/test-data}/package-test/Packaging.idr (100%)
 rename {test-data => test/test-data}/package-test/test.ipkg (100%)



[nongnu] elpa/idris-mode eb4b1fb530 2/6: Add extra iterations for processing in tests and

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit eb4b1fb530ff048b6d7d42380aeaa5fe52f61549
Author: Marek L 
Commit: Marek L 

Add extra iterations for processing in tests and

cleanup in tests.
(addreses feedback from emacs when trying
byte-compile the test files)

Why:
To improve reliability of tests
---
 test/idris-commands-test.el | 19 ++-
 test/idris-navigate-test.el | 13 -
 test/idris-test-utils.el| 17 +
 test/idris-tests.el |  3 ++-
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/test/idris-commands-test.el b/test/idris-commands-test.el
index b165bbf38f..179a7f16a5 100644
--- a/test/idris-commands-test.el
+++ b/test/idris-commands-test.el
@@ -37,7 +37,7 @@
 (should buffer)
 (with-current-buffer buffer
   (idris-run)
-  (dotimes (_ 5) (accept-process-output nil 0.1))
+  (dotimes (_ 10) (accept-process-output nil 0.1))
   (should idris-process)
   (should idris-connection))
 (idris-delete-ibc t)
@@ -48,7 +48,7 @@
   "Ensure that running Idris and quitting doesn't leave behind unwanted 
buffers."
   (let ((before (normalised-buffer-list)))
 (idris-repl)
-(dotimes (_ 5) (accept-process-output nil 0.1))
+(dotimes (_ 10) (accept-process-output nil 0.1))
 (idris-quit)
 (let* ((after (normalised-buffer-list))
(extra (cl-set-difference after before)))
@@ -61,7 +61,7 @@ In particular, only *idris-events* should remain."
 (idris-log-events t))
 
 (idris-repl)
-(dotimes (_ 5) (accept-process-output nil 0.1))
+(dotimes (_ 10) (accept-process-output nil 0.1))
 (idris-quit)
 (let* ((after (normalised-buffer-list))
(extra (cl-set-difference after before)))
@@ -79,7 +79,7 @@ In particular, only *idris-events* should remain."
   (idris-load-file)
 
   ;; Allow async stuff to happen
-  (dotimes (_ 5) (accept-process-output nil 0.1))
+  (dotimes (_ 10) (accept-process-output nil 0.1))
   (let ((mv-buffer (get-buffer idris-hole-list-buffer-name)))
 ;; The buffer exists and contains characters
 (should (bufferp mv-buffer))
@@ -100,7 +100,7 @@ In particular, only *idris-events* should remain."
 (idris-hole-show-on-load nil))
 (with-current-buffer buffer
   (idris-load-file))
-(dotimes (_ 5) (accept-process-output nil 0.1))
+(dotimes (_ 10) (accept-process-output nil 0.1))
 (let ((mv-buffer (get-buffer idris-hole-list-buffer-name)))
   (should-not (bufferp mv-buffer))
   (should (null mv-buffer)))
@@ -121,7 +121,7 @@ In particular, only *idris-events* should remain."
 ;; Test that hole info is present without need to load file manually
 (with-current-buffer buffer
   (idris-list-holes)
-  (dotimes (_ 5) (accept-process-output nil 0.1))
+  (dotimes (_ 10) (accept-process-output nil 0.1))
   (let ((holes-buffer (get-buffer idris-hole-list-buffer-name)))
 (should (bufferp holes-buffer))
 (should (> (buffer-size holes-buffer) 10)))
@@ -130,7 +130,7 @@ In particular, only *idris-events* should remain."
 ;; Test that the hole info is updated for the other current buffer
 (with-current-buffer other-buffer
   (idris-list-holes)
-  (dotimes (_ 5) (accept-process-output nil 0.1))
+  (dotimes (_ 10) (accept-process-output nil 0.1))
   (let ((holes-buffer (get-buffer idris-hole-list-buffer-name)))
 (should (not (bufferp holes-buffer
   (idris-delete-ibc t))
@@ -150,12 +150,12 @@ In particular, only *idris-events* should remain."
 (let ((buffer (find-file "test-data/ProofSearch.idr")))
   (with-current-buffer buffer
 (idris-load-file)
-(dotimes (_ 5) (accept-process-output nil 0.1))
+(dotimes (_ 10) (accept-process-output nil 0.1))
 (goto-char (point-min))
 (re-search-forward "search_here")
 (goto-char (match-beginning 0))
 (idris-proof-search)
-(dotimes (_ 5) (accept-process-output nil 0.1))
+(dotimes (_ 10) (accept-process-output nil 0.1))
 (should (looking-at-p "lteSucc (lteSucc (lteSucc (lteSucc (lteSucc 
lteZero"))
 (move-beginning-of-line nil)
 (delete-region (point) (line-end-position))
@@ -247,6 +247,7 @@ myReverse xs = revAcc [] xs where
 ;; Assert that we have clean global test state
 (should (not idris-connection))
 (with-current-buffer buffer
+  (switch-to-buffer buffer)
   (goto-char (point-min))
   (re-search-forward "data Test")
   (funcall-interactively 'idris-type-at-point nil)
diff --git a/test/idris-navigate-test.el b/test/idris-navigate-test.el
index e0b4e5b0e9..5e469d4a14 100644
--- a/test/idris-navigate-test.el
+++ b/test/idris-navigate-test.el
@@ -1,13 +1,13 @@
-(require 'idris-navigate)
+;;; idris-navigate-test.el --- Tests for idris-navigate
 
-;; Testing
-;; load-file-name is present in batch mode and buffer-file-name in interactive
-;; (add

[nongnu] elpa/idris-mode 19aa3d7b02 3/6: Rewrite test idris-test-idris-type-at-point to use stubs

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit 19aa3d7b02d8d3d5fbb254c2b1b51e0f3597a68e
Author: Marek L 
Commit: Marek L 

Rewrite test idris-test-idris-type-at-point to use stubs

instead of relying on running Idris connection.
Why:
The event processing nature of the tests makes
it regularly fail on CI.
It is great to have full integration tests but no at the price of
reliability of test suite.
---
 test/idris-commands-test.el | 63 -
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/test/idris-commands-test.el b/test/idris-commands-test.el
index 179a7f16a5..98a430f0f6 100644
--- a/test/idris-commands-test.el
+++ b/test/idris-commands-test.el
@@ -243,30 +243,45 @@ myReverse xs = revAcc [] xs where
 
 (ert-deftest idris-test-idris-type-at-point ()
   "Test that `idris-type-at-point' works."
-  (let ((buffer (find-file-noselect "test-data/AddClause.idr")))
-;; Assert that we have clean global test state
-(should (not idris-connection))
-(with-current-buffer buffer
-  (switch-to-buffer buffer)
-  (goto-char (point-min))
-  (re-search-forward "data Test")
-  (funcall-interactively 'idris-type-at-point nil)
-  ;; Assert that Idris connection is created
-  (should idris-connection)
-  ;; Assert that focus is in the Idris info buffer
-  (should (string= (buffer-name) idris-info-buffer-name))
-  ;; Assert that the info buffer displays a type
-  (should (string-match-p "Test : Type" (buffer-substring-no-properties 
(point-min) (point-max
-
-  ;; TODO: How to emulate "q" key binding to quit info buffer?
-  (idris-info-quit)
-  ;; Assert leaving info buffer will get us back to Idris code buffer
-  (should (eq (current-buffer) buffer))
-
-  ;; Cleanup
-  (idris-delete-ibc t)
-  (kill-buffer))
-(idris-quit)))
+  (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
+file-loaded-p
+eval-args)
+(cl-flet ((idris-load-file-sync-stub () (setq file-loaded-p t) nil)
+  (idris-eval-stub (&optional &rest args)
+   (setq eval-args args)
+   '("Test : Type"
+(0 4 ((:name "AddClause.Test")
+  (:implicit :False)
+  (:key "AQAA")
+  (:decor :type)
+  (:doc-overview "")
+  (:type "Type")
+  (:namespace "AddClause")))
+(7 4 ((:decor :type)
+  (:type "Type")
+  (:doc-overview "The type of types")
+  (:name "Type")))
+(7 4 ((:tt-term "AAAHAAA"))
+  (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
+  (advice-add 'idris-eval :override #'idris-eval-stub)
+
+  (unwind-protect
+  (with-current-buffer buffer
+(switch-to-buffer buffer)
+(goto-char (point-min))
+(re-search-forward "data Test")
+(funcall-interactively 'idris-type-at-point nil)
+(should (eq file-loaded-p t))
+(should (equal eval-args '((:type-of "Test"
+(should (string= (buffer-name) idris-info-buffer-name))
+(should (string-match-p "Test : Type" 
(buffer-substring-no-properties (point-min) (point-max
+(idris-info-quit)
+(should (eq (current-buffer) buffer)))
+
+(advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
+(advice-remove 'idris-eval #'idris-eval-stub)
+(kill-buffer buffer)
+(idris-quit)
 
 ;; Tests by Yasuhiko Watanabe
 ;; https://github.com/idris-hackers/idris-mode/pull/537/files



[nongnu] elpa/idris-mode f2cd31d1c5 1/6: Move test files to test/ directory

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit f2cd31d1c57f82e9914a8ec5ad16aa46d53355a6
Author: Marek L 
Commit: Marek L 

Move test files to test/ directory

Why:
To better separate production code and tests
---
 .github/workflows/idris2.yml   |   1 -
 Makefile   |  25 +-
 idris-tests.el | 581 -
 idris-tests3.el|  42 --
 test/idris-commands-test.el| 279 ++
 test/idris-navigate-test.el| 262 ++
 idris-test-utils.el => test/idris-test-utils.el|   1 +
 test/idris-tests.el| 141 +
 idris-xref-test.el => test/idris-xref-test.el  |   0
 {test-data => test/test-data}/AddClause.idr|   0
 {test-data => test/test-data}/AddMissing.idr   |   0
 {test-data => test/test-data}/CaseSplit.idr|   0
 test/test-data/Empty.idr   |   0
 {test-data => test/test-data}/GenerateDef.idr  |   0
 {test-data => test/test-data}/MakeLemma.idr|   0
 {test-data => test/test-data}/MakeWithBlock.idr|   0
 {test-data => test/test-data}/MetavarTest.idr  |   0
 {test-data => test/test-data}/ProofSearch.idr  |   0
 {test-data => test/test-data}/Refine.idr   |   0
 {test-data => test/test-data}/TypeAtPoint.idr  |   0
 {test-data => test/test-data}/TypeError.idr|   0
 .../test-data}/cmdline/commandlinetest.ipkg|   0
 .../test-data}/cmdline/src/Command/Line/Test.idr   |   0
 .../test-data}/package-test/Packaging.idr  |   0
 .../test-data}/package-test/test.ipkg  |   0
 25 files changed, 693 insertions(+), 639 deletions(-)

diff --git a/.github/workflows/idris2.yml b/.github/workflows/idris2.yml
index 838da56786..f7d83570fb 100644
--- a/.github/workflows/idris2.yml
+++ b/.github/workflows/idris2.yml
@@ -94,6 +94,5 @@ jobs:
   make clean
   make build
   make test2
-  make test3
 
 # -- [ EOF ]
diff --git a/Makefile b/Makefile
index c80e51c4bb..46994f0f13 100644
--- a/Makefile
+++ b/Makefile
@@ -46,32 +46,27 @@ OBJS =  idris-commands.elc  \
 build: getdeps $(OBJS)
 
 test: getdeps build
-   $(BATCHEMACS) -L . -l ert -l idris-tests.el -f 
ert-run-tests-batch-and-exit
+   $(BATCHEMACS) -L . -l ert -l test/idris-tests.el -f 
ert-run-tests-batch-and-exit
 
 test2: getdeps build
$(BATCHEMACS) -L . \
-eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-   -l ert -l idris-tests.el -f ert-run-tests-batch-and-exit
-
-test3: getdeps build
-   $(BATCHEMACS) -L . \
-   -eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-   -l ert -l idris-tests3.el -f ert-run-tests-batch-and-exit
+   -l ert -l test/idris-tests.el -f ert-run-tests-batch-and-exit
 
 clean:
-${RM} -f $(OBJS)
-   -${RM} -f test-data/*ibc
-   -${RM} -rf test-data/build/
+   -${RM} -f test/test-data/*ibc
+   -${RM} -rf test/test-data/build/
-${RM} -r docs/auto docs/*.aux docs/*.log docs/*.pdf
 getdeps:
$(BATCHEMACS) -eval \
"(let* \
-   ((need-pkgs '($(NEED_PKGS))) \
-(want-pkgs (seq-remove #'package-installed-p need-pkgs))) \
- (unless (null want-pkgs) \
-   (package-initialize) \
-   (package-refresh-contents) \
-   (mapcar #'package-install want-pkgs)))"
+   ((need-pkgs '($(NEED_PKGS))) \
+(want-pkgs (seq-remove #'package-installed-p 
need-pkgs))) \
+   (unless (null want-pkgs) \
+   (package-initialize) \
+   (package-refresh-contents) \
+   (mapcar #'package-install want-pkgs)))"
 
 docs: docs/documentation.tex
-@( cd docs/ && latexmk -xelatex documentation.tex )
diff --git a/idris-tests.el b/idris-tests.el
deleted file mode 100644
index 5f3476ab04..00
--- a/idris-tests.el
+++ /dev/null
@@ -1,581 +0,0 @@
-;;; idris-tests.el --- Tests for idris-mode  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2014  David Raymond Christiansen
-
-;; Author: David Raymond Christiansen 
-;; Keywords: languages
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the 

[nongnu] elpa/idris-mode f5bf588ef3 5/6: Merge pull request #606 from keram/test-restruct-draft

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit f5bf588ef37fd710cfb71a3ea74f47f6d606d81d
Merge: f69b32d689 19aa3d7b02
Author: Jan de Muijnck-Hughes 
Commit: GitHub 

Merge pull request #606 from keram/test-restruct-draft

Move test files to test/ directory
---
 .github/workflows/idris2.yml   |   1 -
 Makefile   |  25 +-
 idris-tests.el | 581 -
 idris-tests3.el|  42 --
 test/idris-commands-test.el| 295 +++
 test/idris-navigate-test.el| 265 ++
 idris-test-utils.el => test/idris-test-utils.el|  18 +-
 test/idris-tests.el| 142 +
 idris-xref-test.el => test/idris-xref-test.el  |   0
 {test-data => test/test-data}/AddClause.idr|   0
 {test-data => test/test-data}/AddMissing.idr   |   0
 {test-data => test/test-data}/CaseSplit.idr|   0
 test/test-data/Empty.idr   |   0
 {test-data => test/test-data}/GenerateDef.idr  |   0
 {test-data => test/test-data}/MakeLemma.idr|   0
 {test-data => test/test-data}/MakeWithBlock.idr|   0
 {test-data => test/test-data}/MetavarTest.idr  |   0
 {test-data => test/test-data}/ProofSearch.idr  |   0
 {test-data => test/test-data}/Refine.idr   |   0
 {test-data => test/test-data}/TypeAtPoint.idr  |   0
 {test-data => test/test-data}/TypeError.idr|   0
 .../test-data}/cmdline/commandlinetest.ipkg|   0
 .../test-data}/cmdline/src/Command/Line/Test.idr   |   0
 .../test-data}/package-test/Packaging.idr  |   0
 .../test-data}/package-test/test.ipkg  |   0
 25 files changed, 722 insertions(+), 647 deletions(-)

diff --git a/.github/workflows/idris2.yml b/.github/workflows/idris2.yml
index 838da56786..f7d83570fb 100644
--- a/.github/workflows/idris2.yml
+++ b/.github/workflows/idris2.yml
@@ -94,6 +94,5 @@ jobs:
   make clean
   make build
   make test2
-  make test3
 
 # -- [ EOF ]
diff --git a/Makefile b/Makefile
index c80e51c4bb..46994f0f13 100644
--- a/Makefile
+++ b/Makefile
@@ -46,32 +46,27 @@ OBJS =  idris-commands.elc  \
 build: getdeps $(OBJS)
 
 test: getdeps build
-   $(BATCHEMACS) -L . -l ert -l idris-tests.el -f 
ert-run-tests-batch-and-exit
+   $(BATCHEMACS) -L . -l ert -l test/idris-tests.el -f 
ert-run-tests-batch-and-exit
 
 test2: getdeps build
$(BATCHEMACS) -L . \
-eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-   -l ert -l idris-tests.el -f ert-run-tests-batch-and-exit
-
-test3: getdeps build
-   $(BATCHEMACS) -L . \
-   -eval '(setq idris-interpreter-path (executable-find 
"idris2"))' \
-   -l ert -l idris-tests3.el -f ert-run-tests-batch-and-exit
+   -l ert -l test/idris-tests.el -f ert-run-tests-batch-and-exit
 
 clean:
-${RM} -f $(OBJS)
-   -${RM} -f test-data/*ibc
-   -${RM} -rf test-data/build/
+   -${RM} -f test/test-data/*ibc
+   -${RM} -rf test/test-data/build/
-${RM} -r docs/auto docs/*.aux docs/*.log docs/*.pdf
 getdeps:
$(BATCHEMACS) -eval \
"(let* \
-   ((need-pkgs '($(NEED_PKGS))) \
-(want-pkgs (seq-remove #'package-installed-p need-pkgs))) \
- (unless (null want-pkgs) \
-   (package-initialize) \
-   (package-refresh-contents) \
-   (mapcar #'package-install want-pkgs)))"
+   ((need-pkgs '($(NEED_PKGS))) \
+(want-pkgs (seq-remove #'package-installed-p 
need-pkgs))) \
+   (unless (null want-pkgs) \
+   (package-initialize) \
+   (package-refresh-contents) \
+   (mapcar #'package-install want-pkgs)))"
 
 docs: docs/documentation.tex
-@( cd docs/ && latexmk -xelatex documentation.tex )
diff --git a/idris-tests.el b/idris-tests.el
deleted file mode 100644
index 5f3476ab04..00
--- a/idris-tests.el
+++ /dev/null
@@ -1,581 +0,0 @@
-;;; idris-tests.el --- Tests for idris-mode  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2014  David Raymond Christiansen
-
-;; Author: David Raymond Christiansen 
-;; Keywords: languages
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.

[nongnu] elpa/idris-mode c3e11a8117 4/6: Fix small bug in idris-xref jump to column and

2023-01-11 Thread ELPA Syncer
branch: elpa/idris-mode
commit c3e11a8117d0dc4e965b8d438e979ba9cd363331
Author: Marek L 
Commit: Marek L 

Fix small bug in idris-xref jump to column and

improve it's tests by addressing
warnings from emacs lisp compiler and
removing dependency on *Messages* buffer.
---
 idris-xref.el   |   4 +-
 test/idris-xref-test.el | 262 ++--
 2 files changed, 121 insertions(+), 145 deletions(-)

diff --git a/idris-xref.el b/idris-xref.el
index bbc6cb88da..f8914116e7 100644
--- a/idris-xref.el
+++ b/idris-xref.el
@@ -93,8 +93,8 @@ update coordinates to be indexed from 1 as expected by Emacs."
candidate))
 (let ((new-fn (idris-xref-filepath term fn)))
   `(,term (:filename ,new-fn)
-  (:start ,(1+ start-line) ,(1+ start-col))
-  (:end ,(1+ end-line) ,(1+ end-col))
+  (:start ,(1+ start-line) ,start-col)
+  (:end ,(1+ end-line) ,end-col)
 
 (defun idris-xref-make-xref (location)
   "Return a new Xref object from LOCATION."
diff --git a/test/idris-xref-test.el b/test/idris-xref-test.el
index 57d62cb63e..7b8bcc4a88 100644
--- a/test/idris-xref-test.el
+++ b/test/idris-xref-test.el
@@ -21,24 +21,20 @@
 
 (require 'ert)
 (require 'idris-xref)
+(eval-when-compile (require 'cl-lib))
 
 (ert-deftest idris-xref-backend-definitions--error-when-no-connection ()
   "Test that the file is loaded before making search for definition."
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+error-msg)
 (with-current-buffer buffer
   (goto-char (point-min))
   (search-forward ": Test")
   (condition-case err
   (funcall-interactively 'xref-find-definitions "Test")
-(error (message "Error: %s" (error-message-string err)))
-(user-error (message "User Error: %s" (error-message-string err)
+(error (setq error-msg (error-message-string err)
 
-(with-current-buffer "*Messages*"
-  (should
-   (string-match-p "Buffer AddClause.idr has no process"
-   (buffer-substring-no-properties (point-min) 
(point-max)
+(should (string-match-p "Buffer AddClause.idr has no process" error-msg))
 
 ;; Cleanup
 (kill-buffer buffer)))
@@ -46,12 +42,12 @@
 (ert-deftest idris-xref-backend-definitions--not-supported-on-Idris-1 ()
   "Test that user error raised when invoking `xref-find-definitions' used on 
Idris1."
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
-(err-msg "did not understand (synchronous Idris evaluation failed)")
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+(stub-err-msg "did not understand (synchronous Idris evaluation 
failed)")
+error-msg)
+
 (cl-flet ((idris-load-file-sync-stub () nil)
   (idris-eval-stub (&optional &rest _args)
-   (user-error err-msg)))
+   (user-error stub-err-msg)))
   (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
   (advice-add 'idris-eval :override #'idris-eval-stub)
 
@@ -62,14 +58,12 @@
 
 (condition-case err
 (funcall-interactively 'xref-find-definitions "Test")
-  (error (message "%s" (error-message-string err)
+  (error (setq error-msg (error-message-string err)
 
 (advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
 (advice-remove 'idris-eval #'idris-eval-stub)))
 
-(with-current-buffer "*Messages*"
-  (should
-   (string-match-p err-msg (buffer-substring-no-properties (point-min) 
(point-max)
+(should (string-match-p stub-err-msg error-msg))
 
 ;; Cleanup
 (kill-buffer buffer)))
@@ -79,8 +73,8 @@
   ;; Arrange
   (let ((buffer (find-file-noselect "test-data/AddClause.idr"))
 (idris-protocol-version 3)
-(inhibit-read-only t))
-(with-current-buffer "*Messages*" (erase-buffer))
+error-msg)
+
 (cl-flet ((idris-load-file-sync-stub () nil)
   (idris-eval-stub (&optional &rest _args) '()))
   (advice-add 'idris-load-file-sync :override #'idris-load-file-sync-stub)
@@ -90,21 +84,16 @@
   (with-current-buffer buffer
 (goto-char (point-min))
 (search-forward ": Test")
-;; (with-demoted-errors "Error: %s"
-;;   ;; Act
-;;   (funcall-interactively 'xref-find-definitions "Test"))
+
 (condition-case err
 (funcall-interactively 'xref-find-definitions "Test")
-  (user-error (message "%s" (error-message-string err)
+  (user-error (setq error-msg (error-message-string err)
 
 (advice-remove 'idris-load-file-sync #'idris-load-file-sync-stub)
 (advice-remove 'idris-eval #'idris-eval-s

[elpa] externals/nadvice d19e9ae649: * nadvice.el (advice-add): Fix bug with empty arglists and :around

2023-01-11 Thread Stefan Monnier via
branch: externals/nadvice
commit d19e9ae649374a0f2fab1baa045ed192e0851750
Author: Stefan Monnier 
Commit: Stefan Monnier 

* nadvice.el (advice-add): Fix bug with empty arglists and :around
---
 nadvice.el | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nadvice.el b/nadvice.el
index 58523f69a2..512843e3b5 100644
--- a/nadvice.el
+++ b/nadvice.el
@@ -1,9 +1,9 @@
-;;; nadvice.el --- Forward compatibility for Emacs-24.4's nadvice
+;;; nadvice.el --- Forward compatibility for Emacs-24.4's nadvice  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2018  Free Software Foundation, Inc.
+;; Copyright (C) 2018-2023  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier 
-;; Version: 0.3
+;; Version: 0.4
 ;; Keywords:
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,11 @@
 ;; It was tested on Emacs-22 and I can't see any obvious reason why it
 ;; wouldn't work on older Emacsen.
 
+;;; News:
+
+;; Since 0.3:
+;; - Fix a bug when advising functions that do not take arguments.
+
 ;;; Code:
 
 (declare-function ad-remove-advice "advice")
@@ -73,9 +78,15 @@
 ad-do-it)
   (ad-get-args 0
(t (error "This version of nadvice.el does not handle %S"
- where)
+ where
+;; FIXME: Ideally the arglist here should just be nil,
+;; so that we reuse the original function's arglist, but
+;; if that original arglist is also nil, then we bump into a bug
+;; where (ad-set-args 0 nadvice--rest-arg) signals
+;; (error "ad-set-arguments: No argument at position 0 of `nil'")
+(arglist (if (eq where :around) '(&rest _
 (ad-add-advice symbol
-   `(,function nil t (advice lambda () ,body))
+   `(,function nil t (advice lambda ,arglist ,body))
'around
nil)
 (ad-activate symbol)))



[elpa] externals-release/org 630f86dfc4: Update version number for the 9.6.1 release

2023-01-11 Thread ELPA Syncer
branch: externals-release/org
commit 630f86dfc42472aafd9a4f305e1965cbe92b2891
Author: Bastien 
Commit: Bastien 

Update version number for the 9.6.1 release
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 8d226c2c5a..869ff16a6d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 9.6
+;; Version: 9.6.1
 
 ;; This file is part of GNU Emacs.
 ;;



[elpa] externals/org 07c63df9c7: Merge branch 'bugfix'

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 07c63df9c7f40b17acb5c517baa0d321098f31da
Merge: dfcf500df5 630f86dfc4
Author: Bastien 
Commit: Bastien 

Merge branch 'bugfix'
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 44c41a729d..a35f3260c2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 9.6
+;; Version: 9.6.1
 
 ;; This file is part of GNU Emacs.
 ;;



[elpa] externals/org updated (dfcf500df5 -> 07c63df9c7)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch externals/org.

  from  dfcf500df5 org-cdlatex-mode: Fix regression from f01390cf05
   new  630f86dfc4 Update version number for the 9.6.1 release
   new  07c63df9c7 Merge branch 'bugfix'


Summary of changes:
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[nongnu] elpa/rust-mode 369f81626c 2/2: Merge pull request #310 from czipperz/pub-scoped-beg-defun

2023-01-11 Thread ELPA Syncer
branch: elpa/rust-mode
commit 369f81626c7c2320649db2fe3a57bedf4bcfe7b5
Merge: 26f4582293 5462444b2d
Author: Jim Blandy 
Commit: GitHub 

Merge pull request #310 from czipperz/pub-scoped-beg-defun

Add scoped pub support to beginning-of-defun
---
 rust-mode-tests.el | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index abbfcb600c..978941d2a1 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1094,6 +1094,25 @@ fn test4();")
   (beginning-of-defun 2)
   (should (eq (point) fn-1)
 
+(ert-deftest rust-beginning-of-defun-pub-scoped ()
+  (let (fn-1-start fn-1-end fn-2-start fn-2-end)
+   (with-temp-buffer
+ (rust-mode)
+ (setq fn-1-start (point))
+ (insert "pub(crate::mod1) fn test2() {}\n")
+ (setq fn-1-end (point))
+ (setq fn-2-start (point))
+ (insert "pub(self) fn test1() {}\n")
+ (setq fn-3-end (point))
+
+ (goto-char (point-max))
+
+ (beginning-of-defun)
+ (should (eq (point) fn-2-start))
+
+ (beginning-of-defun)
+ (should (eq (point) fn-1-start)
+
 (ert-deftest rust-end-of-defun-from-middle-of-fn ()
   (rust-test-motion
rust-test-motion-string
@@ -1136,6 +1155,25 @@ fn test4();")
'between-fn1-fn2
#'end-of-defun -2))
 
+(ert-deftest rust-end-of-defun-pub-scoped ()
+  (let (fn-1-start fn-1-end fn-2-start fn-2-end)
+   (with-temp-buffer
+ (rust-mode)
+ (setq fn-1-start (point))
+ (insert "pub(crate::mod1) fn test2() {}\n")
+ (setq fn-1-end (point))
+ (setq fn-2-start (point))
+ (insert "pub(self) fn test1() {}\n")
+ (setq fn-2-end (point))
+
+ (goto-char (point-min))
+
+ (end-of-defun)
+ (should (eq (point) fn-1-end))
+
+ (end-of-defun)
+ (should (eq (point) fn-2-end)
+
 (ert-deftest rust-mark-defun-from-middle-of-fn ()
   (rust-test-region
rust-test-region-string



[nongnu] elpa/rust-mode 5462444b2d 1/2: Test pub scoped defun recognition

2023-01-11 Thread ELPA Syncer
branch: elpa/rust-mode
commit 5462444b2d2a80c94d1d871ee01b2906e3a6cdd3
Author: Chris Gregory 
Commit: Jim Blandy 

Test pub scoped defun recognition
---
 rust-mode-tests.el | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index abbfcb600c..978941d2a1 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1094,6 +1094,25 @@ fn test4();")
   (beginning-of-defun 2)
   (should (eq (point) fn-1)
 
+(ert-deftest rust-beginning-of-defun-pub-scoped ()
+  (let (fn-1-start fn-1-end fn-2-start fn-2-end)
+   (with-temp-buffer
+ (rust-mode)
+ (setq fn-1-start (point))
+ (insert "pub(crate::mod1) fn test2() {}\n")
+ (setq fn-1-end (point))
+ (setq fn-2-start (point))
+ (insert "pub(self) fn test1() {}\n")
+ (setq fn-3-end (point))
+
+ (goto-char (point-max))
+
+ (beginning-of-defun)
+ (should (eq (point) fn-2-start))
+
+ (beginning-of-defun)
+ (should (eq (point) fn-1-start)
+
 (ert-deftest rust-end-of-defun-from-middle-of-fn ()
   (rust-test-motion
rust-test-motion-string
@@ -1136,6 +1155,25 @@ fn test4();")
'between-fn1-fn2
#'end-of-defun -2))
 
+(ert-deftest rust-end-of-defun-pub-scoped ()
+  (let (fn-1-start fn-1-end fn-2-start fn-2-end)
+   (with-temp-buffer
+ (rust-mode)
+ (setq fn-1-start (point))
+ (insert "pub(crate::mod1) fn test2() {}\n")
+ (setq fn-1-end (point))
+ (setq fn-2-start (point))
+ (insert "pub(self) fn test1() {}\n")
+ (setq fn-2-end (point))
+
+ (goto-char (point-min))
+
+ (end-of-defun)
+ (should (eq (point) fn-1-end))
+
+ (end-of-defun)
+ (should (eq (point) fn-2-end)
+
 (ert-deftest rust-mark-defun-from-middle-of-fn ()
   (rust-test-region
rust-test-region-string



[elpa] externals/org e204c3a6cc 1/8: test-ob-shell.el: Split test-ob-shell/dont-error-on-empty-results

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit e204c3a6ccdaf1770db5e931f1116235597a8c0b
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

test-ob-shell.el: Split test-ob-shell/dont-error-on-empty-results

* testing/lisp/test-ob-shell.el
(test-ob-shell/dont-error-on-empty-results): Explicitly test handling
of empty results.
(test-ob-shell/dont-error-on-babel-error): Explicitly test handling of
Babel errors.  On pass, remove buffers created during test.

Original test conflated empty results (a valid Babel return) and Babel
errors.
---
 testing/lisp/test-ob-shell.el | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index b0d9beff46..fc3ecd3c8f 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -34,12 +34,16 @@ unless the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
(org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "\n\necho 2" '()
+(org-babel-expand-body:generic "\n\necho 2" '()
 
 (ert-deftest test-ob-shell/dont-error-on-empty-results ()
-  "Was throwing an elisp error when shell blocks threw errors and
-returned empty results."
-  (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil
+  "Empty results should not cause a Lisp error."
+  (should (null (org-babel-execute:sh "" nil
+
+(ert-deftest test-ob-shell/dont-error-on-babel-error ()
+  "Errors within Babel execution should not cause Lisp errors."
+  (if (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil)))
+  (kill-buffer "*Org-Babel Error Output*")))
 
 (ert-deftest test-ob-shell/session ()
   "This also tests `org-babel-comint-with-output' in



[elpa] externals/org 9485450222 6/8: ob-shell-test.org: Remove ob-shell-test.org

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 9485450222cda5c3f09e02f6055aefea128ea215
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

ob-shell-test.org: Remove ob-shell-test.org

* testing/examples/ob-shell-test.org: Delete file

File was used by test-ob-shell.el to test ob-shell.el.  Tests have
been updated to use temporary buffers, rendering ob-shell-test.org
unnecessary.
---
 testing/examples/ob-shell-test.org | 88 --
 1 file changed, 88 deletions(-)

diff --git a/testing/examples/ob-shell-test.org 
b/testing/examples/ob-shell-test.org
deleted file mode 100644
index 2510f4f96d..00
--- a/testing/examples/ob-shell-test.org
+++ /dev/null
@@ -1,88 +0,0 @@
-#+Title: a collection of examples for ob-shell tests
-#+OPTIONS: ^:nil
-
-* Sample data structures
-#+NAME: sample_array
-| one   |
-| two   |
-| three |
-
-#+NAME: sample_mapping_table
-| first  | one   |
-| second | two   |
-| third  | three |
-
-#+NAME: sample_big_table
-| bread |  2 | kg |
-| spaghetti | 20 | cm |
-| milk  | 50 | dl |
-
-* Array tests
-  :PROPERTIES:
-  :ID:   0ba56632-8dc1-405c-a083-c204bae477cf
-  :END:
-** Generic shell: no arrays
-#+begin_src sh :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one two three
-
-** Bash shell: support for arrays
-Bash will see a simple indexed array. In this test, we check that the
-returned value is indeed only the first item of the array, as opposed to
-the generic serialiation that will return all elements of the array as 
-a single string.
-#+begin_src bash :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one
-
-* Associative array tests (simple map)
-  :PROPERTIES:
-  :ID:   bec1a5b0-4619-4450-a8c0-2a746b44bf8d
-  :END:
-** Generic shell: no special handing
-The shell will see all values as a single string.
-#+begin_src sh :exports results :results output :var table=sample_mapping_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: first one second two third three
-
-** Bash shell: support for associative arrays
-Bash will see a table that contains the first column as the 'index'
-of the associative array, and the second column as the value.
-#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
-echo ${table[second]}
-#+end_src
-
-#+RESULTS:
-: two
-
-* Associative array tests (more than 2 columns)
-  :PROPERTIES:
-  :ID:   82320a48-3409-49d7-85c9-5de1c6d3ff87
-  :END:
-** Generic shell: no special handing
-#+begin_src sh :exports results :results output :var table=sample_big_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: bread 2 kg spaghetti 20 cm milk 50 dl
-   
-** Bash shell: support for associative arrays with lists
-Bash will see an associative array that contains each row as a single
-string. Bash cannot handle lists in associative arrays.
-#+begin_src bash :exports results :results output :var table=sample_big_table
-echo ${table[spaghetti]}
-#+end_src
-
-#+RESULTS:
-: 20 cm
-



[elpa] externals/org 6e0012867d 2/8: test-ob-shell.el: Refactor test-ob-shell/session

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 6e0012867d8594913cf4783d7afdc109b8307de3
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

test-ob-shell.el: Refactor test-ob-shell/session

* testing/lisp/test-ob-shell.el (ob-shell/session): Split
`ob-shell/session' into
`test-ob-shell/session-single-return-returns-string' and
`test-ob-shell/session-multiple-returns-returns-list'.
(ob-shell/session): Rename comint from to test name. On
pass, kill process and remove process buffer.
---
 testing/lisp/test-ob-shell.el | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index fc3ecd3c8f..b08bf84131 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -45,18 +45,28 @@ unless the body of the tangled block does."
   (if (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil)))
   (kill-buffer "*Org-Babel Error Output*")))
 
-(ert-deftest test-ob-shell/session ()
-  "This also tests `org-babel-comint-with-output' in
-ob-comint.el, which was not previously tested."
-  (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")
-(should res)
-(should (listp res)))
-  ;; Test multi-line input.
-  (let ((result (org-babel-execute:sh
-"if true \n then \n echo yes \n fi"
-'((:session . "yes")
+(ert-deftest test-ob-shell/session-single-return-returns-string ()
+  "Sessions with a single result should return a string."
+  (let* ((session-name 
"test-ob-shell/session-evaluation-single-return-returns-string")
+ (kill-buffer-query-functions nil)
+ (result (org-babel-execute:sh
+  (format "echo %s" session-name)
+  `((:session . ,session-name)
 (should result)
-(should (string= "yes" result
+(if (should (string= session-name result))
+(kill-buffer session-name
+
+(ert-deftest test-ob-shell/session-multiple-returns-returns-list ()
+  "Sessions with multiple results should return a list."
+  (let* ((session-name "test-ob-shell/session-multiple-returns-returns-list")
+ (kill-buffer-query-functions nil)
+ (result (org-babel-execute:sh
+  "echo 1; echo 2"
+  `((:session . ,session-name)
+(should result)
+(should (listp result))
+(if (should (equal '((1) (2)) result))
+(kill-buffer session-name
 
 ; A list of tests using the samples in ob-shell-test.org
 (ert-deftest ob-shell/generic-uses-no-arrays ()



[elpa] externals/org 2a0f5a5153 4/8: Refactor ob-shell/bash-uses-assoc-arrays

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 2a0f5a5153546599bd673f7724250a921896c4ca
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

Refactor ob-shell/bash-uses-assoc-arrays

* testing/lisp/test-ob-shell.el (ob-shell/bash-uses-assoc-arrays):
Split test cases into separate tests,
`test-ob-shell/bash-uses-assoc-arrays' and
`test-ob-shell/bash-uses-assoc-arrays-with-lists'.  Rename prefix from
"ob-shell" to "test-ob-shell".
(ob-shell/bash-uses-assoc-arrays): Move comments from
testing/examples/ob-shell-test.org to docstrings.
(ob-shell/bash-uses-assoc-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
---
 testing/lisp/test-ob-shell.el | 53 +++
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index a39c99d9f3..78267880b5 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -118,21 +118,44 @@ echo ${table}
  (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
 (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/bash-uses-assoc-arrays ()
-  "Bash associative arrays"
-  (should
-   (equal "two"
- (org-test-at-id
-  "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
-  (org-babel-next-src-block 2)
-  (org-trim (org-babel-execute-src-block)
-  ;; Bash associative arrays as strings for the row.
-  (should
-   (equal "20 cm"
- (org-test-at-id
-  "82320a48-3409-49d7-85c9-5de1c6d3ff87"
-  (org-babel-next-src-block 2)
-  (org-trim (org-babel-execute-src-block))
+(ert-deftest test-ob-shell/bash-uses-assoc-arrays ()
+  "Bash shell: support for associative arrays
+
+Bash will see a table that contains the first column as the
+'index' of the associative array, and the second column as the
+value. "
+  (org-test-with-temp-text
+  "#+NAME: sample_mapping_table
+| first  | one   |
+| second | two   |
+| third  | three |
+
+#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
+echo ${table[second]}
+
+#+end_src "
+(should
+ (equal "two"
+(org-trim (org-babel-execute-src-block))
+
+(ert-deftest test-ob-shell/bash-uses-assoc-arrays-with-lists ()
+  "Bash shell: support for associative arrays with lists
+
+Bash will see an associative array that contains each row as a single
+string. Bash cannot handle lists in associative arrays."
+  (org-test-with-temp-text
+  "#+NAME: sample_big_table
+| bread |  2 | kg |
+| spaghetti | 20 | cm |
+| milk  | 50 | dl |
+
+#+begin_src bash :exports results :results output :var table=sample_big_table
+echo ${table[spaghetti]}
+
+#+end_src"
+(should
+ (equal "20 cm"
+(org-trim (org-babel-execute-src-block))
 
 (ert-deftest ob-shell/simple-list ()
   "Test list variables in shell."



[elpa] externals/org 9ed2821053 7/8: test-ob-shell.el: Organize tests

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 9ed2821053cf7b0c2f02fe941a54e1d3a9837aeb
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

test-ob-shell.el: Organize tests

* testing/lisp/test-ob-shell.el:
  - Give instructions on how to run tests
  - Require `org-test' explicitly
  - Group tests into sections
  - Insert `page-delimiter's between sections
---
 testing/lisp/test-ob-shell.el | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 3ee81d6b86..5318425e60 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,17 +18,22 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
-
+
 ;;; Comment:
 
+;; See testing/README for how to run tests.
+
+
 ;;; Requirements:
-(org-test-for-executable "sh")
 
 (require 'ob-core)
 
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
+(org-test-for-executable "sh")
+
+
 ;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
   "Expanded shell bodies should not start with a blank line unless
@@ -277,6 +282,7 @@ echo 3
   "- 1\n- 2\n- 3\n"
   (buffer-substring-no-properties (point) (point-max))
 
+
 ;;; Standard output
 
 (ert-deftest test-ob-shell/standard-output-after-success ()
@@ -293,6 +299,7 @@ echo 3
   "echo 1; exit 2" nil)))
   (kill-buffer "*Org-Babel Error Output*")))
 
+
 ;;; Standard error
 
 (ert-deftest test-ob-shell/error-output-after-success ()
@@ -341,6 +348,7 @@ buffer, alongside multiple exit codes."
  (buffer-string)
   (kill-buffer "*Org-Babel Error Output*")))
 
+
 ;;; Exit codes
 
 (ert-deftest test-ob-shell/exit-code ()



[elpa] externals/org 728e7fca81 3/8: test-ob-shell.el: Refactor ob-shell/generic-uses-no-assoc-arrays

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 728e7fca81201993a1a411980b4ec8210d607af9
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

test-ob-shell.el: Refactor ob-shell/generic-uses-no-assoc-arrays

* test-ob-shell.el (ob-shell/generic-uses-no-assoc-arrays): Split test
based on simple versus complex mapping cases,
`test-ob-shell/generic-uses-no-assoc-arrays-simple-map' and
`test-ob-shell/generic-uses-no-assoc-arrays-3-columns'.  Rename prefix
from "ob-shell" to "test-ob-shell".
(ob-shell/generic-uses-no-assoc-arrays): Move
headlines and commentary from `testing/examples/ob-shell-test.org' to
docstring.
(ob-shell/generic-uses-no-assoc-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
---
 testing/lisp/test-ob-shell.el | 52 ++-
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index b08bf84131..a39c99d9f3 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -68,7 +68,6 @@ unless the body of the tangled block does."
 (if (should (equal '((1) (2)) result))
 (kill-buffer session-name
 
-; A list of tests using the samples in ob-shell-test.org
 (ert-deftest ob-shell/generic-uses-no-arrays ()
   "No arrays for generic"
   (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
@@ -81,20 +80,43 @@ unless the body of the tangled block does."
 (org-babel-next-src-block 2)
 (should (equal "one" (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
-  "No associative arrays for generic"
-  (should
-   (equal "first one second two third three"
- (org-test-at-id
-  "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
-  (org-babel-next-src-block)
-  (org-trim (org-babel-execute-src-block)
-  (should
-   (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
- (org-test-at-id
-  "82320a48-3409-49d7-85c9-5de1c6d3ff87"
-  (org-babel-next-src-block)
-  (org-trim (org-babel-execute-src-block))
+(ert-deftest test-ob-shell/generic-uses-no-assoc-arrays-simple-map ()
+  "Generic shell: no special handing for key-value mapping table
+
+No associative arrays for generic.  The shell will see all values
+as a single string."
+  (org-test-with-temp-text
+  "#+NAME: sample_mapping_table
+| first  | one   |
+| second | two   |
+| third  | three |
+
+#+begin_src sh :exports results :results output :var table=sample_mapping_table
+echo ${table}
+
+#+end_src"
+(should
+ (equal "first one second two third three"
+(org-trim (org-babel-execute-src-block))
+
+(ert-deftest test-ob-shell/generic-uses-no-assoc-arrays-3-columns ()
+  "Associative array tests (more than 2 columns)
+
+No associative arrays for generic.  The shell will see all values
+as a single string."
+  (org-test-with-temp-text
+  "#+NAME: sample_big_table
+| bread |  2 | kg |
+| spaghetti | 20 | cm |
+| milk  | 50 | dl |
+
+#+begin_src sh :exports results :results output :var table=sample_big_table
+echo ${table}
+
+#+end_src"
+(should
+ (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
+(org-trim (org-babel-execute-src-block))
 
 (ert-deftest ob-shell/bash-uses-assoc-arrays ()
   "Bash associative arrays"



[elpa] externals/org updated (07c63df9c7 -> 4f319088ba)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch externals/org.

  from  07c63df9c7 Merge branch 'bugfix'
   new  e204c3a6cc test-ob-shell.el: Split 
test-ob-shell/dont-error-on-empty-results
   new  6e0012867d test-ob-shell.el: Refactor test-ob-shell/session
   new  728e7fca81 test-ob-shell.el: Refactor 
ob-shell/generic-uses-no-assoc-arrays
   new  2a0f5a5153 Refactor ob-shell/bash-uses-assoc-arrays
   new  3dbc7849a3 test-ob-shell.el: Refactor test names and kill test 
buffers
   new  9485450222 ob-shell-test.org: Remove ob-shell-test.org
   new  9ed2821053 test-ob-shell.el: Organize tests
   new  4f319088ba Merge branch 'ob-shell-cleanup-tests'


Summary of changes:
 testing/examples/ob-shell-test.org |  88 -
 testing/lisp/test-ob-shell.el  | 383 -
 2 files changed, 248 insertions(+), 223 deletions(-)
 delete mode 100644 testing/examples/ob-shell-test.org



[elpa] externals/org 4f319088ba 8/8: Merge branch 'ob-shell-cleanup-tests'

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 4f319088ba5f11d4b6adf808f39f11dfa52c08e4
Merge: 07c63df9c7 9ed2821053
Author: Matthew Trzcinski 
Commit: Matthew Trzcinski 

Merge branch 'ob-shell-cleanup-tests'
---
 testing/examples/ob-shell-test.org |  88 -
 testing/lisp/test-ob-shell.el  | 383 -
 2 files changed, 248 insertions(+), 223 deletions(-)

diff --git a/testing/examples/ob-shell-test.org 
b/testing/examples/ob-shell-test.org
deleted file mode 100644
index 2510f4f96d..00
--- a/testing/examples/ob-shell-test.org
+++ /dev/null
@@ -1,88 +0,0 @@
-#+Title: a collection of examples for ob-shell tests
-#+OPTIONS: ^:nil
-
-* Sample data structures
-#+NAME: sample_array
-| one   |
-| two   |
-| three |
-
-#+NAME: sample_mapping_table
-| first  | one   |
-| second | two   |
-| third  | three |
-
-#+NAME: sample_big_table
-| bread |  2 | kg |
-| spaghetti | 20 | cm |
-| milk  | 50 | dl |
-
-* Array tests
-  :PROPERTIES:
-  :ID:   0ba56632-8dc1-405c-a083-c204bae477cf
-  :END:
-** Generic shell: no arrays
-#+begin_src sh :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one two three
-
-** Bash shell: support for arrays
-Bash will see a simple indexed array. In this test, we check that the
-returned value is indeed only the first item of the array, as opposed to
-the generic serialiation that will return all elements of the array as 
-a single string.
-#+begin_src bash :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one
-
-* Associative array tests (simple map)
-  :PROPERTIES:
-  :ID:   bec1a5b0-4619-4450-a8c0-2a746b44bf8d
-  :END:
-** Generic shell: no special handing
-The shell will see all values as a single string.
-#+begin_src sh :exports results :results output :var table=sample_mapping_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: first one second two third three
-
-** Bash shell: support for associative arrays
-Bash will see a table that contains the first column as the 'index'
-of the associative array, and the second column as the value.
-#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
-echo ${table[second]}
-#+end_src
-
-#+RESULTS:
-: two
-
-* Associative array tests (more than 2 columns)
-  :PROPERTIES:
-  :ID:   82320a48-3409-49d7-85c9-5de1c6d3ff87
-  :END:
-** Generic shell: no special handing
-#+begin_src sh :exports results :results output :var table=sample_big_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: bread 2 kg spaghetti 20 cm milk 50 dl
-   
-** Bash shell: support for associative arrays with lists
-Bash will see an associative array that contains each row as a single
-string. Bash cannot handle lists in associative arrays.
-#+begin_src bash :exports results :results output :var table=sample_big_table
-echo ${table[spaghetti]}
-#+end_src
-
-#+RESULTS:
-: 20 cm
-
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index b0d9beff46..5318425e60 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,102 +18,193 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
+
 ;;; Comment:
 
-;; Template test file for Org tests
+;; See testing/README for how to run tests.
+
+
+;;; Requirements:
 
-;;; Code:
-(org-test-for-executable "sh")
 (require 'ob-core)
+
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
+(org-test-for-executable "sh")
+
+
+;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
-  "Expanded shell bodies should not start with a blank line
-unless the body of the tangled block does."
+  "Expanded shell bodies should not start with a blank line unless
+the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "echo 2" '(
+(org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "\n\necho 2" '()
+(org-babel-expand-body:generic "\n\necho 2" '()
 
 (ert-deftest test-ob-shell/dont-error-on-empty-results ()
-  "Was throwing an elisp error when shell blocks threw errors and
-returned empty results."
-  (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil
-
-(ert-deftest test-ob-shell/session ()
-  "This also tests `org-babel-comint-with-output' in
-ob-comint.el, which was not previously tested."
-  (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")
-(should res)
-(should (listp res)))
-  ;; Test multi-line input.
-  (let ((result (org-babel-execute:sh
-"if true \n then \n echo yes \n fi"
-'((:session . "yes")
+  "Empty results should 

[elpa] externals/org 3dbc7849a3 5/8: test-ob-shell.el: Refactor test names and kill test buffers

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 3dbc7849a366740fc507063abd048dbe04e73630
Author: Matt Trzcinski 
Commit: Matt Trzcinski 

test-ob-shell.el: Refactor test names and kill test buffers

* testing/lisp/test-ob-shell.el:
(ob-shell/generic-uses-no-arrays): Rename test from
`ob-shell/generic-uses-no-arrays' to
`test-ob-shell/generic-uses-no-arrays'.
(ob-shell/generic-uses-no-arrays): Move comments from
testing/examples/ob-shell-test.org to docstring.
(ob-shell/generic-uses-no-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
(ob-shell/bash-uses-arrays): Rename `ob-shell/bash-uses-arrays' to
`test-ob-shell/bash-uses-arrays'.
(ob-shell/bash-uses-arrays): Move comments from
testing/examples/ob-shell-test.org to docstring.
(ob-shell/bash-uses-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
(ob-shell/simple-list): Change test name from `ob-shell/simple-list'
to `test-ob-shell/simple-list'.
(ob-shell/remote-with-stdin-or-cmdline): Change test name from
`ob-shell/remote-with-stdin-or-cmdline' to
`test-ob-shell/remote-with-stdin-or-cmdline'.
(ob-shell/remote-with-stdin-or-cmdline): On pass, kill buffer created
by test.
(ob-shell/results-table): Rename `ob-shell/results-table' to
`test-ob-shell/results-table'.
(ob-shell/results-list): Rename `ob-shell/results-list' to
`test-ob-shell/results-list'.
 (ob-shell/standard-output-after-success): Rename
`ob-shell/standard-output-after-success' to
`test-ob-shell/standard-output-after-success'.
(ob-shell/standard-output-after-failure): Rename
`ob-shell/standard-output-after-failure' to
`test-ob-shell/standard-output-after-failure'.
(ob-shell/standard-output-after-failure): On pass, kill buffer created
during test.
(ob-shell/error-output-after-success): Rename
`ob-shell/error-output-after-success' to
`test-ob-shell/error-output-after-success'.
(ob-shell/error-output-after-success): On pass, kill buffer created by
test.
(ob-shell/error-output-after-failure): Rename
`ob-shell/error-output-after-failure' to
`test-ob-shell/error-output-after-failure'.
(ob-shell/error-output-after-failure): On pass, kill buffer created by
test.
(ob-shell/error-output-after-failure-multiple): Rename
`ob-shell/error-output-after-failure-multiple' to
`test-ob-shell/error-output-after-failure-multiple'.
(ob-shell/error-output-after-failure-multiple): On pass, kill buffer
created by test.
(ob-shell/exit-code): Rename `ob-shell/exit-code' to
`test-ob-shell/exit-code'.
(ob-shell/exit-code): On pass, kill buffer created by test.
(ob-shell/exit-code-multiple): Rename `ob-shell/exit-code-multiple' to
`test-ob-shell/exit-code-multiple'.
(ob-shell/exit-code-multiple): On pass, kill buffer created by test.
---
 testing/lisp/test-ob-shell.el | 220 +-
 1 file changed, 133 insertions(+), 87 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 78267880b5..3ee81d6b86 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,21 +18,23 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
-;;; Comment:
 
-;; Template test file for Org tests
+;;; Comment:
 
-;;; Code:
+;;; Requirements:
 (org-test-for-executable "sh")
+
 (require 'ob-core)
+
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
+;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
-  "Expanded shell bodies should not start with a blank line
-unless the body of the tangled block does."
+  "Expanded shell bodies should not start with a blank line unless
+the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "echo 2" '(
+(org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
 (org-babel-expand-body:generic "\n\necho 2" '()
 
@@ -68,16 +70,36 @@ unless the body of the tangled block does."
 (if (should (equal '((1) (2)) result))
 (kill-buffer session-name
 
-(ert-deftest ob-shell/generic-uses-no-arrays ()
-  "No arrays for generic"
-  (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
-(org-babel-next-src-block)
+(ert-deftest test-ob-shell/generic-uses-no-arrays ()
+  "Test generic serialization of array into a single string."
+  (org-test-with-temp-text
+  " #+NAME: sample_array
+| one   |
+| two   |
+| three |
+
+#+begin_src sh :exports results :results output :var array=sample_array
+echo ${array}
+
+#+end_src"
 (should (equal "one two three" (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/bas

[elpa] externals/zuul updated (b0cc517949 -> 0208db02df)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch externals/zuul.

  from  b0cc517949 Make it easier to customize sort and face
   new  4a4cebac05 Update useage of compilation-minor-mode
   new  fb25d6ec0b Add binding to rerun build command locally
   new  0208db02df Skip use of deprecated function point-at-eol


Summary of changes:
 zuul.el | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)



[elpa] externals/zuul fb25d6ec0b 2/3: Add binding to rerun build command locally

2023-01-11 Thread ELPA Syncer
branch: externals/zuul
commit fb25d6ec0b15d2fb9d56f55424395de869d29a13
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add binding to rerun build command locally
---
 zuul.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zuul.el b/zuul.el
index 144e38db4e..dab4b9bdeb 100644
--- a/zuul.el
+++ b/zuul.el
@@ -1143,6 +1143,7 @@ Optionally provide extra parameters PARAMS, PARSER, 
METHOD, BUFFER or HEADERS."
 (define-key map (kbd "C-c C-q") #'zuul-quit-build)
 (define-key map (kbd "C-c C-s") #'zuul-switch-buildset)
 (define-key map (kbd "C-c C-r") #'zuul-run-build-command)
+(define-key map (kbd "g") #'zuul-run-build-command)
 map))
 
 (define-derived-mode zuul-log-mode fundamental-mode "Zuul Log"



[elpa] externals/zuul 0208db02df 3/3: Skip use of deprecated function point-at-eol

2023-01-11 Thread ELPA Syncer
branch: externals/zuul
commit 0208db02df6b7a5ceda7c6d5524c15bf1c4d61b4
Author: Niklas Eklund 
Commit: Niklas Eklund 

Skip use of deprecated function point-at-eol
---
 zuul.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zuul.el b/zuul.el
index dab4b9bdeb..4e8cb2af9e 100644
--- a/zuul.el
+++ b/zuul.el
@@ -1125,7 +1125,7 @@ Optionally provide extra parameters PARAMS, PARSER, 
METHOD, BUFFER or HEADERS."
   (goto-char (prop-match-beginning property))
   (search-forward "$")
   (let* ((ov-prompt (make-overlay (prop-match-beginning property) 
(point)))
- (ov-input (make-overlay (point) (point-at-eol
+ (ov-input (make-overlay (point) (line-end-position
 (overlay-put ov-prompt 'face 'zuul-command-prompt-face)
 (overlay-put ov-input 'face 'zuul-prompt-input-face)))
 



[elpa] externals/zuul 4a4cebac05 1/3: Update useage of compilation-minor-mode

2023-01-11 Thread ELPA Syncer
branch: externals/zuul
commit 4a4cebac0507197bce584797d4822fd84ab75d17
Author: Niklas Eklund 
Commit: Niklas Eklund 

Update useage of compilation-minor-mode

Previous implementation had intermittent problems as well as
unnecessary font-lock code.
---
 zuul.el | 27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/zuul.el b/zuul.el
index 439fa4ff45..144e38db4e 100644
--- a/zuul.el
+++ b/zuul.el
@@ -42,6 +42,7 @@
 
 (require 'ansi-color)
 (require 'comint)
+(require 'compile)
 (require 'project)
 (eval-when-compile (require 'rx))
 (require 'subr-x)
@@ -349,16 +350,18 @@ the parameter to pass to it.  Examples of query functions 
are:
   (if (not build-output)
   (message "Build has no output")
 (with-current-buffer (get-buffer-create buffer)
-  (let ((inhibit-read-only t))
-(setq-local default-directory project-root)
-(erase-buffer)
-(insert build-output)
-(zuul-log-mode)
-(setq zuul--current-build zuul--build)
-(setq zuul--current-builds zuul--builds)
-(goto-char (point-max))
-(select-window
- (display-buffer buffer 
zuul-build-display-buffer-action))
+  (setq-local default-directory project-root)
+  (erase-buffer)
+  (insert build-output)
+  (zuul-log-mode)
+  (setq zuul--current-build zuul--build)
+  (setq zuul--current-builds zuul--builds)
+  (goto-char (point-min))
+  (compilation-minor-mode t)
+  (compilation--ensure-parse (point-max))
+  (goto-char (point-max))
+  (select-window
+   (display-buffer buffer zuul-build-display-buffer-action)
 
 (cl-defun zuul-get-builds (&key
change
@@ -1149,11 +1152,7 @@ Optionally provide extra parameters PARAMS, PARSER, 
METHOD, BUFFER or HEADERS."
   (setq zuul--project-files (zuul--project-files))
   (setq-local compilation-parse-errors-filename-function #'zuul--locate-file)
   (setq-local imenu-create-index-function #'zuul--imenu-index)
-  (compilation-minor-mode)
-  (setq-local font-lock-defaults '(compilation-mode-font-lock-keywords t))
   (add-hook 'eldoc-documentation-functions #'zuul--eldoc-function nil t)
-  (read-only-mode)
-  (font-lock-mode)
   (zuul--highlight-cmd))
 
 (provide 'zuul)



[nongnu] elpa/helm b978aee0f0 2/2: Merge pull request #2583 from mosquito-magnet/fix-docstring-error-on-meta-key

2023-01-11 Thread ELPA Syncer
branch: elpa/helm
commit b978aee0f0edce350d42122c1e6fe73f11243a19
Merge: 4e39df9ee0 0d2667db1a
Author: Thierry Volpiatto 
Commit: GitHub 

Merge pull request #2583 from 
mosquito-magnet/fix-docstring-error-on-meta-key

Fix helm-define-key-with-subkeys error on keys with meta
---
 helm-core.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm-core.el b/helm-core.el
index 48e9a3a277..95c9fcd38e 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -350,7 +350,7 @@ i.e. the loop is not entered after running COMMAND."
   ;; COMMAND, SUBKEY and OTHER-SUBKEYS.
   (concat
(format "Run `%s' and bound it to `%s' for subsequent calls."
-   command (if (numberp subkey) (char-to-string subkey) 
subkey))
+   command (if (numberp subkey) (single-key-description 
subkey) subkey))
(if other-subkeys
(helm-basic-docstring-from-alist other-subkeys)
  ""
@@ -364,7 +364,7 @@ i.e. the loop is not entered after running COMMAND."
 " and ")
((> count 1) ",")
(t ""))
-   for key = (if (numberp k) (char-to-string k) k)
+   for key = (if (numberp k) (single-key-description k) k)
concat (format "%s`%s'" sep key) into ks
concat (format "%s`%s'" sep v) into kv
finally return (list ks kv



[nongnu] elpa/helm 0d2667db1a 1/2: Fix helm-define-key-with-subkeys error on keys with meta

2023-01-11 Thread ELPA Syncer
branch: elpa/helm
commit 0d2667db1ab87c7a153406fff4e59ab83c3fc6a2
Author: mosquito-magnet <24659697+mosquito-mag...@users.noreply.github.com>
Commit: mosquito-magnet <24659697+mosquito-mag...@users.noreply.github.com>

Fix helm-define-key-with-subkeys error on keys with meta

char-to-string fails on key combinations including the meta/alt key,
e.g. C-M-u, use single-key-description instead.
---
 helm-core.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm-core.el b/helm-core.el
index 48e9a3a277..95c9fcd38e 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -350,7 +350,7 @@ i.e. the loop is not entered after running COMMAND."
   ;; COMMAND, SUBKEY and OTHER-SUBKEYS.
   (concat
(format "Run `%s' and bound it to `%s' for subsequent calls."
-   command (if (numberp subkey) (char-to-string subkey) 
subkey))
+   command (if (numberp subkey) (single-key-description 
subkey) subkey))
(if other-subkeys
(helm-basic-docstring-from-alist other-subkeys)
  ""
@@ -364,7 +364,7 @@ i.e. the loop is not entered after running COMMAND."
 " and ")
((> count 1) ",")
(t ""))
-   for key = (if (numberp k) (char-to-string k) k)
+   for key = (if (numberp k) (single-key-description k) k)
concat (format "%s`%s'" sep key) into ks
concat (format "%s`%s'" sep v) into kv
finally return (list ks kv



[nongnu] elpa/helm-core updated (4e39df9ee0 -> b978aee0f0)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch elpa/helm-core.

  from  4e39df9ee0 Fix *-header-line docstrings #2579
  adds  0d2667db1a Fix helm-define-key-with-subkeys error on keys with meta
  adds  b978aee0f0 Merge pull request #2583 from 
mosquito-magnet/fix-docstring-error-on-meta-key

No new revisions were added by this update.

Summary of changes:
 helm-core.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



[elpa] externals/org 2ddbee5e63 3/8: test-ob-shell.el: Refactor test-ob-shell/session

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 2ddbee5e639d43d8cb435bd01acac63a579b8f9b
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

test-ob-shell.el: Refactor test-ob-shell/session

* testing/lisp/test-ob-shell.el (ob-shell/session): Split
`ob-shell/session' into
`test-ob-shell/session-single-return-returns-string' and
`test-ob-shell/session-multiple-returns-returns-list'.
(ob-shell/session): Rename comint from to test name. On
pass, kill process and remove process buffer.
---
 testing/lisp/test-ob-shell.el | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index fc3ecd3c8f..b08bf84131 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -45,18 +45,28 @@ unless the body of the tangled block does."
   (if (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil)))
   (kill-buffer "*Org-Babel Error Output*")))
 
-(ert-deftest test-ob-shell/session ()
-  "This also tests `org-babel-comint-with-output' in
-ob-comint.el, which was not previously tested."
-  (let ((res (org-babel-execute:sh "echo 1; echo 2" '((:session . "yes")
-(should res)
-(should (listp res)))
-  ;; Test multi-line input.
-  (let ((result (org-babel-execute:sh
-"if true \n then \n echo yes \n fi"
-'((:session . "yes")
+(ert-deftest test-ob-shell/session-single-return-returns-string ()
+  "Sessions with a single result should return a string."
+  (let* ((session-name 
"test-ob-shell/session-evaluation-single-return-returns-string")
+ (kill-buffer-query-functions nil)
+ (result (org-babel-execute:sh
+  (format "echo %s" session-name)
+  `((:session . ,session-name)
 (should result)
-(should (string= "yes" result
+(if (should (string= session-name result))
+(kill-buffer session-name
+
+(ert-deftest test-ob-shell/session-multiple-returns-returns-list ()
+  "Sessions with multiple results should return a list."
+  (let* ((session-name "test-ob-shell/session-multiple-returns-returns-list")
+ (kill-buffer-query-functions nil)
+ (result (org-babel-execute:sh
+  "echo 1; echo 2"
+  `((:session . ,session-name)
+(should result)
+(should (listp result))
+(if (should (equal '((1) (2)) result))
+(kill-buffer session-name
 
 ; A list of tests using the samples in ob-shell-test.org
 (ert-deftest ob-shell/generic-uses-no-arrays ()



[elpa] externals/org 875845de1b 2/8: test-ob-shell.el: Split test-ob-shell/dont-error-on-empty-results

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 875845de1b4ad70818e19b366daefa6f8eb0241e
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

test-ob-shell.el: Split test-ob-shell/dont-error-on-empty-results

* testing/lisp/test-ob-shell.el
(test-ob-shell/dont-error-on-empty-results): Explicitly test handling
of empty results.
(test-ob-shell/dont-error-on-babel-error): Explicitly test handling of
Babel errors.  On pass, remove buffers created during test.

Original test conflated empty results (a valid Babel return) and Babel
errors.
---
 testing/lisp/test-ob-shell.el | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index b0d9beff46..fc3ecd3c8f 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -34,12 +34,16 @@ unless the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
(org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "\n\necho 2" '()
+(org-babel-expand-body:generic "\n\necho 2" '()
 
 (ert-deftest test-ob-shell/dont-error-on-empty-results ()
-  "Was throwing an elisp error when shell blocks threw errors and
-returned empty results."
-  (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil
+  "Empty results should not cause a Lisp error."
+  (should (null (org-babel-execute:sh "" nil
+
+(ert-deftest test-ob-shell/dont-error-on-babel-error ()
+  "Errors within Babel execution should not cause Lisp errors."
+  (if (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil)))
+  (kill-buffer "*Org-Babel Error Output*")))
 
 (ert-deftest test-ob-shell/session ()
   "This also tests `org-babel-comint-with-output' in



[elpa] externals/org 16ea9f84f6 5/8: Refactor ob-shell/bash-uses-assoc-arrays

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 16ea9f84f650a96ed248b555bd0cb312a8778330
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

Refactor ob-shell/bash-uses-assoc-arrays

* testing/lisp/test-ob-shell.el (ob-shell/bash-uses-assoc-arrays):
Split test cases into separate tests,
`test-ob-shell/bash-uses-assoc-arrays' and
`test-ob-shell/bash-uses-assoc-arrays-with-lists'.  Rename prefix from
"ob-shell" to "test-ob-shell".
(ob-shell/bash-uses-assoc-arrays): Move comments from
testing/examples/ob-shell-test.org to docstrings.
(ob-shell/bash-uses-assoc-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
---
 testing/lisp/test-ob-shell.el | 53 +++
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index a39c99d9f3..78267880b5 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -118,21 +118,44 @@ echo ${table}
  (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
 (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/bash-uses-assoc-arrays ()
-  "Bash associative arrays"
-  (should
-   (equal "two"
- (org-test-at-id
-  "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
-  (org-babel-next-src-block 2)
-  (org-trim (org-babel-execute-src-block)
-  ;; Bash associative arrays as strings for the row.
-  (should
-   (equal "20 cm"
- (org-test-at-id
-  "82320a48-3409-49d7-85c9-5de1c6d3ff87"
-  (org-babel-next-src-block 2)
-  (org-trim (org-babel-execute-src-block))
+(ert-deftest test-ob-shell/bash-uses-assoc-arrays ()
+  "Bash shell: support for associative arrays
+
+Bash will see a table that contains the first column as the
+'index' of the associative array, and the second column as the
+value. "
+  (org-test-with-temp-text
+  "#+NAME: sample_mapping_table
+| first  | one   |
+| second | two   |
+| third  | three |
+
+#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
+echo ${table[second]}
+
+#+end_src "
+(should
+ (equal "two"
+(org-trim (org-babel-execute-src-block))
+
+(ert-deftest test-ob-shell/bash-uses-assoc-arrays-with-lists ()
+  "Bash shell: support for associative arrays with lists
+
+Bash will see an associative array that contains each row as a single
+string. Bash cannot handle lists in associative arrays."
+  (org-test-with-temp-text
+  "#+NAME: sample_big_table
+| bread |  2 | kg |
+| spaghetti | 20 | cm |
+| milk  | 50 | dl |
+
+#+begin_src bash :exports results :results output :var table=sample_big_table
+echo ${table[spaghetti]}
+
+#+end_src"
+(should
+ (equal "20 cm"
+(org-trim (org-babel-execute-src-block))
 
 (ert-deftest ob-shell/simple-list ()
   "Test list variables in shell."



[elpa] externals/org 597ecaa5c1 1/8: Revert "Merge branch 'ob-shell-cleanup-tests'"

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit 597ecaa5c1db659430ee4652b0985d09f6e75599
Author: Matthew Trzcinski 
Commit: Matthew Trzcinski 

Revert "Merge branch 'ob-shell-cleanup-tests'"

This reverts commit 4f319088ba5f11d4b6adf808f39f11dfa52c08e4, reversing
changes made to 07c63df9c7f40b17acb5c517baa0d321098f31da.
---
 testing/examples/ob-shell-test.org |  88 +
 testing/lisp/test-ob-shell.el  | 383 +
 2 files changed, 223 insertions(+), 248 deletions(-)

diff --git a/testing/examples/ob-shell-test.org 
b/testing/examples/ob-shell-test.org
new file mode 100644
index 00..2510f4f96d
--- /dev/null
+++ b/testing/examples/ob-shell-test.org
@@ -0,0 +1,88 @@
+#+Title: a collection of examples for ob-shell tests
+#+OPTIONS: ^:nil
+
+* Sample data structures
+#+NAME: sample_array
+| one   |
+| two   |
+| three |
+
+#+NAME: sample_mapping_table
+| first  | one   |
+| second | two   |
+| third  | three |
+
+#+NAME: sample_big_table
+| bread |  2 | kg |
+| spaghetti | 20 | cm |
+| milk  | 50 | dl |
+
+* Array tests
+  :PROPERTIES:
+  :ID:   0ba56632-8dc1-405c-a083-c204bae477cf
+  :END:
+** Generic shell: no arrays
+#+begin_src sh :exports results :results output :var array=sample_array
+echo ${array}
+#+end_src
+
+#+RESULTS:
+: one two three
+
+** Bash shell: support for arrays
+Bash will see a simple indexed array. In this test, we check that the
+returned value is indeed only the first item of the array, as opposed to
+the generic serialiation that will return all elements of the array as 
+a single string.
+#+begin_src bash :exports results :results output :var array=sample_array
+echo ${array}
+#+end_src
+
+#+RESULTS:
+: one
+
+* Associative array tests (simple map)
+  :PROPERTIES:
+  :ID:   bec1a5b0-4619-4450-a8c0-2a746b44bf8d
+  :END:
+** Generic shell: no special handing
+The shell will see all values as a single string.
+#+begin_src sh :exports results :results output :var table=sample_mapping_table
+echo ${table}
+#+end_src
+
+#+RESULTS:
+: first one second two third three
+
+** Bash shell: support for associative arrays
+Bash will see a table that contains the first column as the 'index'
+of the associative array, and the second column as the value.
+#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
+echo ${table[second]}
+#+end_src
+
+#+RESULTS:
+: two
+
+* Associative array tests (more than 2 columns)
+  :PROPERTIES:
+  :ID:   82320a48-3409-49d7-85c9-5de1c6d3ff87
+  :END:
+** Generic shell: no special handing
+#+begin_src sh :exports results :results output :var table=sample_big_table
+echo ${table}
+#+end_src
+
+#+RESULTS:
+: bread 2 kg spaghetti 20 cm milk 50 dl
+   
+** Bash shell: support for associative arrays with lists
+Bash will see an associative array that contains each row as a single
+string. Bash cannot handle lists in associative arrays.
+#+begin_src bash :exports results :results output :var table=sample_big_table
+echo ${table[spaghetti]}
+#+end_src
+
+#+RESULTS:
+: 20 cm
+
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 5318425e60..b0d9beff46 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,193 +18,102 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
-
 ;;; Comment:
 
-;; See testing/README for how to run tests.
-
-
-;;; Requirements:
+;; Template test file for Org tests
 
+;;; Code:
+(org-test-for-executable "sh")
 (require 'ob-core)
-
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
-(org-test-for-executable "sh")
-
-
-;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
-  "Expanded shell bodies should not start with a blank line unless
-the body of the tangled block does."
+  "Expanded shell bodies should not start with a blank line
+unless the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
-(org-babel-expand-body:generic "echo 2" '(
+   (org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
-(org-babel-expand-body:generic "\n\necho 2" '()
+   (org-babel-expand-body:generic "\n\necho 2" '()
 
 (ert-deftest test-ob-shell/dont-error-on-empty-results ()
-  "Empty results should not cause a Lisp error."
-  (should (null (org-babel-execute:sh "" nil
-
-(ert-deftest test-ob-shell/dont-error-on-babel-error ()
-  "Errors within Babel execution should not cause Lisp errors."
-  (if (should (null (org-babel-execute:sh "ls NoSuchFileOrDirectory.txt" nil)))
-  (kill-buffer "*Org-Babel Error Output*")))
-
-(ert-deftest test-ob-shell/session-single-return-returns-string ()
-  "Sessions with a single result should return a string."
-  (let* ((session-name

[elpa] externals/org updated (4f319088ba -> bcca8819c3)

2023-01-11 Thread ELPA Syncer
elpasync pushed a change to branch externals/org.

  from  4f319088ba Merge branch 'ob-shell-cleanup-tests'
   new  597ecaa5c1 Revert "Merge branch 'ob-shell-cleanup-tests'"
   new  875845de1b test-ob-shell.el: Split 
test-ob-shell/dont-error-on-empty-results
   new  2ddbee5e63 test-ob-shell.el: Refactor test-ob-shell/session
   new  c61112c850 test-ob-shell.el: Refactor 
ob-shell/generic-uses-no-assoc-arrays
   new  16ea9f84f6 Refactor ob-shell/bash-uses-assoc-arrays
   new  d7ff5b2462 test-ob-shell.el: Refactor test names and kill test 
buffers
   new  ccd5977f62 ob-shell-test.org: Remove ob-shell-test.org
   new  bcca8819c3 test-ob-shell.el: Organize tests


Summary of changes:



[elpa] externals/org d7ff5b2462 6/8: test-ob-shell.el: Refactor test names and kill test buffers

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit d7ff5b24624dde2b1a86050441df8a2b8c0ed0a2
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

test-ob-shell.el: Refactor test names and kill test buffers

* testing/lisp/test-ob-shell.el:
(ob-shell/generic-uses-no-arrays): Rename test from
`ob-shell/generic-uses-no-arrays' to
`test-ob-shell/generic-uses-no-arrays'.
(ob-shell/generic-uses-no-arrays): Move comments from
testing/examples/ob-shell-test.org to docstring.
(ob-shell/generic-uses-no-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
(ob-shell/bash-uses-arrays): Rename `ob-shell/bash-uses-arrays' to
`test-ob-shell/bash-uses-arrays'.
(ob-shell/bash-uses-arrays): Move comments from
testing/examples/ob-shell-test.org to docstring.
(ob-shell/bash-uses-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
(ob-shell/simple-list): Change test name from `ob-shell/simple-list'
to `test-ob-shell/simple-list'.
(ob-shell/remote-with-stdin-or-cmdline): Change test name from
`ob-shell/remote-with-stdin-or-cmdline' to
`test-ob-shell/remote-with-stdin-or-cmdline'.
(ob-shell/remote-with-stdin-or-cmdline): On pass, kill buffer created
by test.
(ob-shell/results-table): Rename `ob-shell/results-table' to
`test-ob-shell/results-table'.
(ob-shell/results-list): Rename `ob-shell/results-list' to
`test-ob-shell/results-list'.
 (ob-shell/standard-output-after-success): Rename
`ob-shell/standard-output-after-success' to
`test-ob-shell/standard-output-after-success'.
(ob-shell/standard-output-after-failure): Rename
`ob-shell/standard-output-after-failure' to
`test-ob-shell/standard-output-after-failure'.
(ob-shell/standard-output-after-failure): On pass, kill buffer created
during test.
(ob-shell/error-output-after-success): Rename
`ob-shell/error-output-after-success' to
`test-ob-shell/error-output-after-success'.
(ob-shell/error-output-after-success): On pass, kill buffer created by
test.
(ob-shell/error-output-after-failure): Rename
`ob-shell/error-output-after-failure' to
`test-ob-shell/error-output-after-failure'.
(ob-shell/error-output-after-failure): On pass, kill buffer created by
test.
(ob-shell/error-output-after-failure-multiple): Rename
`ob-shell/error-output-after-failure-multiple' to
`test-ob-shell/error-output-after-failure-multiple'.
(ob-shell/error-output-after-failure-multiple): On pass, kill buffer
created by test.
(ob-shell/exit-code): Rename `ob-shell/exit-code' to
`test-ob-shell/exit-code'.
(ob-shell/exit-code): On pass, kill buffer created by test.
(ob-shell/exit-code-multiple): Rename `ob-shell/exit-code-multiple' to
`test-ob-shell/exit-code-multiple'.
(ob-shell/exit-code-multiple): On pass, kill buffer created by test.
---
 testing/lisp/test-ob-shell.el | 220 +-
 1 file changed, 133 insertions(+), 87 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 78267880b5..3ee81d6b86 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,21 +18,23 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
-;;; Comment:
 
-;; Template test file for Org tests
+;;; Comment:
 
-;;; Code:
+;;; Requirements:
 (org-test-for-executable "sh")
+
 (require 'ob-core)
+
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
+;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
-  "Expanded shell bodies should not start with a blank line
-unless the body of the tangled block does."
+  "Expanded shell bodies should not start with a blank line unless
+the body of the tangled block does."
   (should-not (string-match "^[\n\r][\t ]*[\n\r]"
-   (org-babel-expand-body:generic "echo 2" '(
+(org-babel-expand-body:generic "echo 2" '(
   (should (string-match "^[\n\r][\t ]*[\n\r]"
 (org-babel-expand-body:generic "\n\necho 2" '()
 
@@ -68,16 +70,36 @@ unless the body of the tangled block does."
 (if (should (equal '((1) (2)) result))
 (kill-buffer session-name
 
-(ert-deftest ob-shell/generic-uses-no-arrays ()
-  "No arrays for generic"
-  (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
-(org-babel-next-src-block)
+(ert-deftest test-ob-shell/generic-uses-no-arrays ()
+  "Test generic serialization of array into a single string."
+  (org-test-with-temp-text
+  " #+NAME: sample_array
+| one   |
+| two   |
+| three |
+
+#+begin_src sh :exports results :results output :var array=sample_array
+echo ${array}
+
+#+end_src"
 (should (equal "one two three" (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/

[elpa] externals/org bcca8819c3 8/8: test-ob-shell.el: Organize tests

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit bcca8819c3c7184d744a41d6cb899fc3f77c46c3
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

test-ob-shell.el: Organize tests

* testing/lisp/test-ob-shell.el:
  - Give instructions on how to run tests
  - Require `org-test' explicitly
  - Group tests into sections
  - Insert `page-delimiter's between sections
---
 testing/lisp/test-ob-shell.el | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 3ee81d6b86..5318425e60 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -18,17 +18,22 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
-
+
 ;;; Comment:
 
+;; See testing/README for how to run tests.
+
+
 ;;; Requirements:
-(org-test-for-executable "sh")
 
 (require 'ob-core)
 
 (unless (featurep 'ob-shell)
   (signal 'missing-test-dependency "Support for Shell code blocks"))
 
+(org-test-for-executable "sh")
+
+
 ;;; Code:
 (ert-deftest test-ob-shell/dont-insert-spaces-on-expanded-bodies ()
   "Expanded shell bodies should not start with a blank line unless
@@ -277,6 +282,7 @@ echo 3
   "- 1\n- 2\n- 3\n"
   (buffer-substring-no-properties (point) (point-max))
 
+
 ;;; Standard output
 
 (ert-deftest test-ob-shell/standard-output-after-success ()
@@ -293,6 +299,7 @@ echo 3
   "echo 1; exit 2" nil)))
   (kill-buffer "*Org-Babel Error Output*")))
 
+
 ;;; Standard error
 
 (ert-deftest test-ob-shell/error-output-after-success ()
@@ -341,6 +348,7 @@ buffer, alongside multiple exit codes."
  (buffer-string)
   (kill-buffer "*Org-Babel Error Output*")))
 
+
 ;;; Exit codes
 
 (ert-deftest test-ob-shell/exit-code ()



[elpa] externals/org c61112c850 4/8: test-ob-shell.el: Refactor ob-shell/generic-uses-no-assoc-arrays

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit c61112c8506fb5001bea86fc5a929331ee0a1750
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

test-ob-shell.el: Refactor ob-shell/generic-uses-no-assoc-arrays

* test-ob-shell.el (ob-shell/generic-uses-no-assoc-arrays): Split test
based on simple versus complex mapping cases,
`test-ob-shell/generic-uses-no-assoc-arrays-simple-map' and
`test-ob-shell/generic-uses-no-assoc-arrays-3-columns'.  Rename prefix
from "ob-shell" to "test-ob-shell".
(ob-shell/generic-uses-no-assoc-arrays): Move
headlines and commentary from `testing/examples/ob-shell-test.org' to
docstring.
(ob-shell/generic-uses-no-assoc-arrays): Remove dependency on
testing/examples/ob-shell-test.org.
---
 testing/lisp/test-ob-shell.el | 52 ++-
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index b08bf84131..a39c99d9f3 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -68,7 +68,6 @@ unless the body of the tangled block does."
 (if (should (equal '((1) (2)) result))
 (kill-buffer session-name
 
-; A list of tests using the samples in ob-shell-test.org
 (ert-deftest ob-shell/generic-uses-no-arrays ()
   "No arrays for generic"
   (org-test-at-id "0ba56632-8dc1-405c-a083-c204bae477cf"
@@ -81,20 +80,43 @@ unless the body of the tangled block does."
 (org-babel-next-src-block 2)
 (should (equal "one" (org-trim (org-babel-execute-src-block))
 
-(ert-deftest ob-shell/generic-uses-no-assoc-arrays ()
-  "No associative arrays for generic"
-  (should
-   (equal "first one second two third three"
- (org-test-at-id
-  "bec1a5b0-4619-4450-a8c0-2a746b44bf8d"
-  (org-babel-next-src-block)
-  (org-trim (org-babel-execute-src-block)
-  (should
-   (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
- (org-test-at-id
-  "82320a48-3409-49d7-85c9-5de1c6d3ff87"
-  (org-babel-next-src-block)
-  (org-trim (org-babel-execute-src-block))
+(ert-deftest test-ob-shell/generic-uses-no-assoc-arrays-simple-map ()
+  "Generic shell: no special handing for key-value mapping table
+
+No associative arrays for generic.  The shell will see all values
+as a single string."
+  (org-test-with-temp-text
+  "#+NAME: sample_mapping_table
+| first  | one   |
+| second | two   |
+| third  | three |
+
+#+begin_src sh :exports results :results output :var table=sample_mapping_table
+echo ${table}
+
+#+end_src"
+(should
+ (equal "first one second two third three"
+(org-trim (org-babel-execute-src-block))
+
+(ert-deftest test-ob-shell/generic-uses-no-assoc-arrays-3-columns ()
+  "Associative array tests (more than 2 columns)
+
+No associative arrays for generic.  The shell will see all values
+as a single string."
+  (org-test-with-temp-text
+  "#+NAME: sample_big_table
+| bread |  2 | kg |
+| spaghetti | 20 | cm |
+| milk  | 50 | dl |
+
+#+begin_src sh :exports results :results output :var table=sample_big_table
+echo ${table}
+
+#+end_src"
+(should
+ (equal "bread 2 kg spaghetti 20 cm milk 50 dl"
+(org-trim (org-babel-execute-src-block))
 
 (ert-deftest ob-shell/bash-uses-assoc-arrays ()
   "Bash associative arrays"



[elpa] externals/org ccd5977f62 7/8: ob-shell-test.org: Remove ob-shell-test.org

2023-01-11 Thread ELPA Syncer
branch: externals/org
commit ccd5977f6278eddb1ab9f2c998b43e407b28aa59
Author: Matt Trzcinski 
Commit: Matthew Trzcinski 

ob-shell-test.org: Remove ob-shell-test.org

* testing/examples/ob-shell-test.org: Delete file

File was used by test-ob-shell.el to test ob-shell.el.  Tests have
been updated to use temporary buffers, rendering ob-shell-test.org
unnecessary.
---
 testing/examples/ob-shell-test.org | 88 --
 1 file changed, 88 deletions(-)

diff --git a/testing/examples/ob-shell-test.org 
b/testing/examples/ob-shell-test.org
deleted file mode 100644
index 2510f4f96d..00
--- a/testing/examples/ob-shell-test.org
+++ /dev/null
@@ -1,88 +0,0 @@
-#+Title: a collection of examples for ob-shell tests
-#+OPTIONS: ^:nil
-
-* Sample data structures
-#+NAME: sample_array
-| one   |
-| two   |
-| three |
-
-#+NAME: sample_mapping_table
-| first  | one   |
-| second | two   |
-| third  | three |
-
-#+NAME: sample_big_table
-| bread |  2 | kg |
-| spaghetti | 20 | cm |
-| milk  | 50 | dl |
-
-* Array tests
-  :PROPERTIES:
-  :ID:   0ba56632-8dc1-405c-a083-c204bae477cf
-  :END:
-** Generic shell: no arrays
-#+begin_src sh :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one two three
-
-** Bash shell: support for arrays
-Bash will see a simple indexed array. In this test, we check that the
-returned value is indeed only the first item of the array, as opposed to
-the generic serialiation that will return all elements of the array as 
-a single string.
-#+begin_src bash :exports results :results output :var array=sample_array
-echo ${array}
-#+end_src
-
-#+RESULTS:
-: one
-
-* Associative array tests (simple map)
-  :PROPERTIES:
-  :ID:   bec1a5b0-4619-4450-a8c0-2a746b44bf8d
-  :END:
-** Generic shell: no special handing
-The shell will see all values as a single string.
-#+begin_src sh :exports results :results output :var table=sample_mapping_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: first one second two third three
-
-** Bash shell: support for associative arrays
-Bash will see a table that contains the first column as the 'index'
-of the associative array, and the second column as the value.
-#+begin_src bash :exports :results output results :var 
table=sample_mapping_table
-echo ${table[second]}
-#+end_src
-
-#+RESULTS:
-: two
-
-* Associative array tests (more than 2 columns)
-  :PROPERTIES:
-  :ID:   82320a48-3409-49d7-85c9-5de1c6d3ff87
-  :END:
-** Generic shell: no special handing
-#+begin_src sh :exports results :results output :var table=sample_big_table
-echo ${table}
-#+end_src
-
-#+RESULTS:
-: bread 2 kg spaghetti 20 cm milk 50 dl
-   
-** Bash shell: support for associative arrays with lists
-Bash will see an associative array that contains each row as a single
-string. Bash cannot handle lists in associative arrays.
-#+begin_src bash :exports results :results output :var table=sample_big_table
-echo ${table[spaghetti]}
-#+end_src
-
-#+RESULTS:
-: 20 cm
-



[nongnu] elpa/inf-ruby 997b3c5f9d: Stop using ruby-mode-variables (it was deleted from ruby-mode)

2023-01-11 Thread ELPA Syncer
branch: elpa/inf-ruby
commit 997b3c5f9d9d7ff72b1a1cbdb55b1f575748a9ca
Author: Dmitry Gutov 
Commit: Dmitry Gutov 

Stop using ruby-mode-variables (it was deleted from ruby-mode)

Fixes #168
---
 inf-ruby.el | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/inf-ruby.el b/inf-ruby.el
index 68a94fc338..d7ec4d809c 100755
--- a/inf-ruby.el
+++ b/inf-ruby.el
@@ -11,7 +11,7 @@
 ;; URL: http://github.com/nonsequitur/inf-ruby
 ;; Created: 8 April 1998
 ;; Keywords: languages ruby
-;; Version: 2.6.2
+;; Version: 2.7.0
 ;; Package-Requires: ((emacs "24.3"))
 
 ;; This program is free software: you can redistribute it and/or modify
@@ -294,12 +294,20 @@ The following commands are available:
 
 \\{inf-ruby-mode-map}"
   (setq comint-prompt-regexp inf-ruby-prompt-pattern)
-  (ruby-mode-variables)
+
+  (setq-local comment-start "# ")
+  (setq-local comment-end "")
+  (setq-local comment-column ruby-comment-column)
+  (setq-local comment-start-skip "#+ *")
+
+  (setq-local parse-sexp-ignore-comments t)
+  (setq-local parse-sexp-lookup-properties t)
+
   (when (bound-and-true-p ruby-use-smie)
-(set (make-local-variable 'smie-forward-token-function)
- #'inf-ruby-smie--forward-token)
-(set (make-local-variable 'smie-backward-token-function)
- #'inf-ruby-smie--backward-token))
+(smie-setup ruby-smie-grammar #'ruby-smie-rules
+:forward-token  #'inf-ruby-smie--forward-token
+:backward-token #'inf-ruby-smie--backward-token))
+
   (add-hook 'comint-output-filter-functions 'inf-ruby-output-filter nil t)
   (setq comint-get-old-input 'inf-ruby-get-old-input)
   (set (make-local-variable 'compilation-error-regexp-alist)



[elpa] externals/wisi 511d382b2b 1/2: Release version 4.2.0

2023-01-11 Thread Stephen Leake
branch: externals/wisi
commit 511d382b2be240a601c7e5807532d8b09e37785c
Author: Stephen Leake 
Commit: Stephen Leake 

Release version 4.2.0
---
 Alire.make |  10 +
 ELPA.make  |  34 +-
 NEWS   |  31 +-
 README |   2 +-
 alire_rules.make   |  16 +
 emacs_wisi_common_parse.adb|   3 +-
 emacs_wisi_common_parse.ads|   3 +-
 gen_emacs_wisi_lr_parse.adb|  12 +-
 gen_emacs_wisi_lr_text_rep_parse.adb   |  12 +-
 gen_run_wisi_lr_parse.adb  |  12 +-
 gen_run_wisi_lr_text_rep_parse.adb |  12 +-
 install.sh |   2 +-
 prj-alire.el   |  11 +
 prj-wisi.el|  30 ++
 run_wisi_common_parse.adb  |  10 +-
 run_wisi_common_parse.ads  |   5 +-
 standard_common.gpr|   7 +
 wisi-fringe.el | 107 +-
 wisi-parse_context.adb |   3 +-
 wisi-parse_context.ads |   2 +-
 wisi-prj.el|  24 +-
 wisi-process-parse.el  |  40 ++-
 wisi-run-indent-test.el|  57 ++-
 wisi-skel.el   |   8 +-
 wisi.el| 101 --
 wisi.texi  |  12 +-
 wisitoken-bnf-generate.adb |  36 +-
 wisitoken-bnf-output_ada.adb   |  12 +-
 wisitoken-bnf.adb  |   1 +
 wisitoken-bnf.ads  |  13 +-
 wisitoken-generate-lr-lr1_generate.adb | 629 +
 wisitoken-generate-lr-lr1_generate.ads |  18 +-
 wisitoken-lexer-re2c.ads   |   2 +-
 wisitoken-parse-lr-parser-parse.adb|   3 +-
 wisitoken-parse-lr-parser.adb  |   6 +
 wisitoken-parse-lr-parser.ads  |  12 +-
 wisitoken-parse.ads|   1 +
 wisitoken-parse_table-mode.el  |  10 +-
 wisitoken-user_guide.texinfo   |   6 +-
 wisitoken_grammar_actions.adb  |   2 +-
 wisitoken_grammar_actions.ads  |   2 +-
 wisitoken_grammar_main.adb |   2 +-
 wisitoken_grammar_main.ads |   2 +-
 wisitoken_grammar_re2c.c   |   2 +-
 wisitoken_grammar_re2c_c.ads   |   2 +-
 45 files changed, 411 insertions(+), 916 deletions(-)

diff --git a/Alire.make b/Alire.make
new file mode 100644
index 00..74f5027966
--- /dev/null
+++ b/Alire.make
@@ -0,0 +1,10 @@
+# Build Ada parts of Emacs wisi with Alire; see build/Makefile for non-Alire 
build
+
+STEPHES_ADA_LIBRARY_ALIRE_PREFIX ?= $(CURDIR)/../org.stephe_leake.sal
+
+include $(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
+
+# Local Variables:
+# eval: (unless dvc-doing-ediff-p (load-file "prj-wisi.el"))
+# End:
+# end of file
diff --git a/ELPA.make b/ELPA.make
index 27829eef96..566092f31a 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -1,31 +1,31 @@
-# For compiling in elpa
+# For compiling wisi code in elpa worktree
 
-.PHONY : all force
-
-all : byte-compile autoloads
+#export Standard_Common_Build := Debug
 
-ifeq ($(shell uname),Linux)
-EMACS_EXE ?= emacs
+.PHONY : all force
 
-else ifeq ($(shell uname),Darwin)
-EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs"
+all : build_ada byte-compile
 
-else
-# windows
-# specify uniscribe to workaround weird Windows harfbuzz bug
-EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe
+build_ada : wisi.gpr force
+   gprbuild -p -j8 wisi.gpr
 
-endif
+wisi.gpr : wisi.gpr.gp
+   gnatprep -DELPA="yes" wisi.gpr.gp wisi.gpr
 
-BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn 
t)(batch-byte-compile))"
+BYTE_COMPILE := "(progn (setq package-load-list '((wisi) (ada-mode) 
(gnat-compiler) all)) (package-initialize)(setq byte-compile-error-on-warn 
t)(batch-byte-compile))"
 byte-compile : byte-compile-clean
-   $(EMACS_EXE) -Q -batch -L . --eval $(BYTE_COMPILE) *.el
+   emacs -Q -batch -L . --eval $(BYTE_COMPILE) *.el
 
 byte-compile-clean :
rm -f *.elc
 
-autoloads : force
-   $(EMACS_EXE) -Q -batch --eval "(progn (setq generated-autoload-file 
(expand-file-name \"autoloads.el\"))(update-directory-autoloads \".\"))"
+clean : force
+   rm -rf wisi.gpr obj *parse_table*
 
+recursive-clean : force
+   gprclean -r -P wisi.gpr
 
+# Local Variables:
+# eval: (unless dvc-doing-ediff-p (load-file "prj-wisi.el"))
+# End:
 # end of file
diff --git a/NEWS b/NEWS
index 478b6f91ef..058168d67c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,40 @@
 GNU Emacs wisi NEWS -- history of user-visible changes.
 
-Copyright (C) 2014 - 2022 Free Software Foundation, Inc.
+Copyright (C) 2014 - 2023 Free Software Foundation, Inc.
 
 Please send wisi bug reports to bug-gnu-em...@gnu.org, with
 'wisi' in the subject. If possible, use M-x report-emacs-bug.
 
 
+* wisi 4.2.0
+3 Jan 2023
+
+** New user variables wisi-disable-co

[elpa] externals/wisi 4fee1845ac 2/2: * prj-alire.el: Add copyright notice

2023-01-11 Thread Stephen Leake
branch: externals/wisi
commit 4fee1845acd1df2bef926046464615a67767abc3
Author: Stephen Leake 
Commit: Stephen Leake 

* prj-alire.el: Add copyright notice
---
 prj-alire.el | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/prj-alire.el b/prj-alire.el
index 773c435d3f..269b4d8f25 100644
--- a/prj-alire.el
+++ b/prj-alire.el
@@ -1,9 +1,27 @@
 ;; Set up building with Alire -*- no-byte-compile : t -*-
+;;
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
+;;
+;; This file is part of GNU Emacs.
+;;
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see .
+
 
 (wisi-prj-select-cache
  "prj-alire.el"
  (create-alire-prj
-  :name "wisi stephe-3 Alire eglot"
+  :name "wisi main Alire"
   :gpr-file gpr-file
   :xref-label 'gpr_query)
  "Makefile")



[elpa] externals/wisi updated (e7d848deff -> 4fee1845ac)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals/wisi.

  from  e7d848deff ; Prefer HTTPS to HTTP in most URLs
   new  511d382b2b Release version 4.2.0
   new  4fee1845ac * prj-alire.el: Add copyright notice


Summary of changes:
 Alire.make |  10 +
 ELPA.make  |  34 +-
 NEWS   |  31 +-
 README |   2 +-
 alire_rules.make   |  16 +
 emacs_wisi_common_parse.adb|   3 +-
 emacs_wisi_common_parse.ads|   3 +-
 gen_emacs_wisi_lr_parse.adb|  12 +-
 gen_emacs_wisi_lr_text_rep_parse.adb   |  12 +-
 gen_run_wisi_lr_parse.adb  |  12 +-
 gen_run_wisi_lr_text_rep_parse.adb |  12 +-
 install.sh |   2 +-
 prj-alire.el   |  29 ++
 prj-wisi.el|  30 ++
 run_wisi_common_parse.adb  |  10 +-
 run_wisi_common_parse.ads  |   5 +-
 standard_common.gpr|   7 +
 wisi-fringe.el | 107 +-
 wisi-parse_context.adb |   3 +-
 wisi-parse_context.ads |   2 +-
 wisi-prj.el|  24 +-
 wisi-process-parse.el  |  40 ++-
 wisi-run-indent-test.el|  57 ++-
 wisi-skel.el   |   8 +-
 wisi.el| 101 --
 wisi.texi  |  12 +-
 wisitoken-bnf-generate.adb |  36 +-
 wisitoken-bnf-output_ada.adb   |  12 +-
 wisitoken-bnf.adb  |   1 +
 wisitoken-bnf.ads  |  13 +-
 wisitoken-generate-lr-lr1_generate.adb | 629 +
 wisitoken-generate-lr-lr1_generate.ads |  18 +-
 wisitoken-lexer-re2c.ads   |   2 +-
 wisitoken-parse-lr-parser-parse.adb|   3 +-
 wisitoken-parse-lr-parser.adb  |   6 +
 wisitoken-parse-lr-parser.ads  |  12 +-
 wisitoken-parse.ads|   1 +
 wisitoken-parse_table-mode.el  |  10 +-
 wisitoken-user_guide.texinfo   |   6 +-
 wisitoken_grammar_actions.adb  |   2 +-
 wisitoken_grammar_actions.ads  |   2 +-
 wisitoken_grammar_main.adb |   2 +-
 wisitoken_grammar_main.ads |   2 +-
 wisitoken_grammar_re2c.c   |   2 +-
 wisitoken_grammar_re2c_c.ads   |   2 +-
 45 files changed, 429 insertions(+), 916 deletions(-)
 create mode 100644 Alire.make
 create mode 100644 alire_rules.make
 mode change 100644 => 100755 install.sh
 create mode 100644 prj-alire.el
 create mode 100644 prj-wisi.el



[nongnu] elpa/rust-mode 4ea4920319 1/2: Use when-let as appropriate.

2023-01-11 Thread ELPA Syncer
branch: elpa/rust-mode
commit 4ea4920319094a47f58dc7b455c0daac50d61850
Author: Jim Blandy 
Commit: Jim Blandy 

Use when-let as appropriate.
---
 rust-mode.el | 45 ++---
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/rust-mode.el b/rust-mode.el
index 780474f16f..4bb1bcb67d 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -15,7 +15,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'rx))
+(eval-when-compile
+  (require 'rx)
+  (require 'subr-x))
 
 (defvar rust-load-optional-libraries t
   "Whether loading `rust-mode' also loads optional libraries.
@@ -948,12 +950,11 @@ and end."
 (defun rust-string-interpolation-matcher (limit)
   "Match next Rust interpolation marker before LIMIT and set match data if 
found.
 Returns nil if not within a Rust string."
-  (when (rust-in-str)
-(let ((match (rust-next-string-interpolation limit)))
-  (when match
-(set-match-data match)
-(goto-char (cadr match))
-match
+  (when-let (((rust-in-str))
+ (match (rust-next-string-interpolation limit)))
+(set-match-data match)
+(goto-char (cadr match))
+match))
 
 (defun rust-syntax-class-before-point ()
   (when (> (point) 1)
@@ -976,19 +977,18 @@ Returns nil if not within a Rust string."
;; We need to be able to back up past the Fn(args) -> RT form as well.  If
;; we're looking back at this, we want to end up just after "Fn".
((member (char-before) '(?\] ?\) ))
-(let* ((is-paren (rust-looking-back-str ")"))
-   (dest (save-excursion
-   (backward-sexp)
-   (rust-rewind-irrelevant)
-   (or
-(when (rust-looking-back-str "->")
-  (backward-char 2)
-  (rust-rewind-irrelevant)
-  (when (rust-looking-back-str ")")
-(backward-sexp)
-(point)))
-(and is-paren (point))
-  (when dest
+(let ((is-paren (rust-looking-back-str ")")))
+  (when-let ((dest (save-excursion
+ (backward-sexp)
+ (rust-rewind-irrelevant)
+ (or
+  (when (rust-looking-back-str "->")
+(backward-char 2)
+(rust-rewind-irrelevant)
+(when (rust-looking-back-str ")")
+  (backward-sexp)
+  (point)))
+  (and is-paren (point))
 (goto-char dest))
 
 (defun rust-rewind-to-decl-name ()
@@ -1365,9 +1365,8 @@ whichever comes first."
 (defun rust-syntax-propertize (start end)
   "A `syntax-propertize-function' to apply properties from START to END."
   (goto-char start)
-  (let ((str-start (rust-in-str-or-cmnt)))
-(when str-start
-  (rust--syntax-propertize-raw-string str-start end)))
+  (when-let ((str-start (rust-in-str-or-cmnt)))
+(rust--syntax-propertize-raw-string str-start end))
   (funcall
(syntax-propertize-rules
 ;; Character literals.



[nongnu] elpa/rust-mode c12348e405 2/2: Merge pull request #489 from jimblandy/use-when-let

2023-01-11 Thread ELPA Syncer
branch: elpa/rust-mode
commit c12348e40531fc7e7325368621a0e5f8031d99b2
Merge: 369f81626c 4ea4920319
Author: Jim Blandy 
Commit: GitHub 

Merge pull request #489 from jimblandy/use-when-let

Use when-let as appropriate.
---
 rust-mode.el | 45 ++---
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/rust-mode.el b/rust-mode.el
index 780474f16f..4bb1bcb67d 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -15,7 +15,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'rx))
+(eval-when-compile
+  (require 'rx)
+  (require 'subr-x))
 
 (defvar rust-load-optional-libraries t
   "Whether loading `rust-mode' also loads optional libraries.
@@ -948,12 +950,11 @@ and end."
 (defun rust-string-interpolation-matcher (limit)
   "Match next Rust interpolation marker before LIMIT and set match data if 
found.
 Returns nil if not within a Rust string."
-  (when (rust-in-str)
-(let ((match (rust-next-string-interpolation limit)))
-  (when match
-(set-match-data match)
-(goto-char (cadr match))
-match
+  (when-let (((rust-in-str))
+ (match (rust-next-string-interpolation limit)))
+(set-match-data match)
+(goto-char (cadr match))
+match))
 
 (defun rust-syntax-class-before-point ()
   (when (> (point) 1)
@@ -976,19 +977,18 @@ Returns nil if not within a Rust string."
;; We need to be able to back up past the Fn(args) -> RT form as well.  If
;; we're looking back at this, we want to end up just after "Fn".
((member (char-before) '(?\] ?\) ))
-(let* ((is-paren (rust-looking-back-str ")"))
-   (dest (save-excursion
-   (backward-sexp)
-   (rust-rewind-irrelevant)
-   (or
-(when (rust-looking-back-str "->")
-  (backward-char 2)
-  (rust-rewind-irrelevant)
-  (when (rust-looking-back-str ")")
-(backward-sexp)
-(point)))
-(and is-paren (point))
-  (when dest
+(let ((is-paren (rust-looking-back-str ")")))
+  (when-let ((dest (save-excursion
+ (backward-sexp)
+ (rust-rewind-irrelevant)
+ (or
+  (when (rust-looking-back-str "->")
+(backward-char 2)
+(rust-rewind-irrelevant)
+(when (rust-looking-back-str ")")
+  (backward-sexp)
+  (point)))
+  (and is-paren (point))
 (goto-char dest))
 
 (defun rust-rewind-to-decl-name ()
@@ -1365,9 +1365,8 @@ whichever comes first."
 (defun rust-syntax-propertize (start end)
   "A `syntax-propertize-function' to apply properties from START to END."
   (goto-char start)
-  (let ((str-start (rust-in-str-or-cmnt)))
-(when str-start
-  (rust--syntax-propertize-raw-string str-start end)))
+  (when-let ((str-start (rust-in-str-or-cmnt)))
+(rust--syntax-propertize-raw-string str-start end))
   (funcall
(syntax-propertize-rules
 ;; Character literals.



[elpa] externals-release/wisi updated (dd717efa4b -> 6b011cf077)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals-release/wisi.

  from  dd717efa4b Delete "beta" from version
  adds  8ee3847f8c Update to wisi 4.1.1
  adds  42884728cd Finish commit for upgrade to 4.1.1
  adds  c101d1009a ; Fix typos
  adds  6eb5e05ae6 * .gitignore: Ignore autoloads.el
  adds  e7d848deff ; Prefer HTTPS to HTTP in most URLs
  adds  511d382b2b Release version 4.2.0
  adds  4fee1845ac * prj-alire.el: Add copyright notice
   new  9ddff6cdf1 * install.sh: Delete; copied from ada-mode but not edited
   new  6b011cf077 Resolve conflicts, finish merge


Summary of changes:
 .gitignore  |1 +
 Alire.make  |   10 +
 ELPA.make   |   31 +
 NEWS|   47 +-
 README  |9 +-
 alire_rules.make|   16 +
 doclicense.texi |4 +-
 emacs_wisi_common_parse.adb |  110 +-
 emacs_wisi_common_parse.ads |6 +-
 gen_emacs_wisi_lr_parse.adb |   29 +-
 gen_emacs_wisi_lr_parse.ads |   14 +-
 gen_emacs_wisi_lr_text_rep_parse.adb|   96 +-
 gen_emacs_wisi_lr_text_rep_parse.ads|   15 +-
 gen_emacs_wisi_packrat_parse.adb|  180 -
 gen_emacs_wisi_packrat_parse.ads|   42 -
 gen_run_wisi_lr_parse.adb   |   44 +-
 gen_run_wisi_lr_parse.ads   |   14 +-
 gen_run_wisi_lr_text_rep_parse.adb  |   49 +-
 gen_run_wisi_lr_text_rep_parse.ads  |   15 +-
 gen_run_wisi_packrat_parse.adb  |  241 -
 gen_run_wisi_packrat_parse.ads  |   36 -
 gnat-core.el|  487 --
 install.sh  |   15 -
 prj-alire.el|   29 +
 prj-wisi.el |   30 +
 run_wisi_common_parse.adb   |  183 +-
 run_wisi_common_parse.ads   |8 +-
 sal-gen_definite_doubly_linked_lists.adb|4 +-
 sal-gen_definite_doubly_linked_lists.ads|3 +-
 sal-gen_indefinite_doubly_linked_lists.adb  |   41 +-
 sal-gen_indefinite_doubly_linked_lists.ads  |5 +-
 sal.adb |2 +-
 standard_common.gpr |   10 +-
 wisi-fringe.el  |  113 +-
 wisi-parse-common.el|   61 +-
 wisi-parse_context.adb  |   87 +-
 wisi-parse_context.ads  |   53 +-
 wisi-prj.el |  315 +-
 wisi-process-parse.el   |  299 +-
 wisi-run-indent-test.el |  220 +-
 wisi-skel.el|   18 +-
 wisi.adb|   73 +-
 wisi.ads|   13 +-
 wisi.el |  410 +-
 wisi.texi   |   28 +-
 wisitoken-bnf-generate.adb  |   77 +-
 wisitoken-bnf-generate_packrat.adb  |   75 +-
 wisitoken-bnf-generate_utils.adb|   18 +-
 wisitoken-bnf-output_ada.adb|   53 +-
 wisitoken-bnf-output_ada_common.adb |  232 +-
 wisitoken-bnf-output_ada_common.ads |   12 +-
 wisitoken-bnf-output_ada_emacs.adb  |   23 +-
 wisitoken-bnf.adb   |1 +
 wisitoken-bnf.ads   |   16 +-
 wisitoken-generate-lr-lalr_generate.adb |   25 +-
 wisitoken-generate-lr-lalr_generate.ads |   19 +-
 wisitoken-generate-lr-lr1_generate.adb  |  652 +-
 wisitoken-generate-lr-lr1_generate.ads  |   24 +-
 wisitoken-lexer-re2c.adb|6 +-
 wisitoken-lexer.adb |4 +-
 wisitoken-parse-lr-mckenzie_recover-explore.adb |7 +-
 wisitoken-parse-lr-mckenzie_recover.adb |   10 +-
 wisitoken-parse-lr-parser-parse.adb |9 +-
 wisitoken-parse-lr-parser.adb   |  194 +-
 wisitoken-parse-lr-parser.ads   |   24 +-
 wisitoken-parse-lr-parser_no_recover.adb|   72 +-
 wisitoken-parse-lr-parser_no_recover.ads|   12 -
 wisitoken-parse-lr.adb  |   13 +
 wisitoken-parse-lr.ads  |6 +-
 wisitoken-parse-packrat-generated.adb   |   43 +-
 wisitoken-parse-packrat-generated.ads   |   41 +-
 wisitoken-parse-packrat-procedural.adb  |  258 +-
 wisitoken-parse-packrat-procedural.ads  |   40 +-
 wisitoken-parse-packrat.adb |  212 +-
 wisitoken-parse

[elpa] externals-release/gpr-mode updated (1932e3a42c -> 823df70936)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals-release/gpr-mode.

  from  1932e3a42c Add files to gpr-mode
  adds  1030be428b * build.sh, install.sh: Set executable bit
  adds  781e7993cc * install.sh: Just copy executable; clean up
  adds  24e67684df Fix header comment style
  adds  924bad9645 Fix header comment style again, improve install.sh
  adds  69de22ba68 Resolve conflicts, finish merge
  adds  eb53a24c6d ; Fix typo
  adds  823df70936 ; Prefer HTTPS to HTTP in URLs

No new revisions were added by this update.

Summary of changes:
 build.sh   |  0
 doclicense.texi|  4 ++--
 gpr-indent-user-options.el |  6 +++---
 gpr-mode.el|  4 ++--
 gpr-mode.texi  |  2 +-
 gpr-process.el |  2 +-
 gpr-skel.el|  6 +++---
 gpr.wy |  2 +-
 gpr_process_actions.adb|  2 +-
 gpr_process_actions.ads|  2 +-
 gpr_process_main.adb   |  2 +-
 gpr_process_main.ads   |  2 +-
 gpr_re2c.c |  2 +-
 gpr_re2c_c.ads |  2 +-
 install.sh | 35 +++
 prj-eglot.el   | 40 
 16 files changed, 34 insertions(+), 79 deletions(-)
 mode change 100644 => 100755 build.sh
 mode change 100644 => 100755 install.sh
 delete mode 100644 prj-eglot.el



[elpa] externals-release/gpr-query updated (57365547c8 -> da47f81da1)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals-release/gpr-query.

  from  57365547c8 Add files to gpr-query
  adds  a9cb407ef8 Misc improve
  adds  32c123e157 Misc fixes
  adds  5a62db91fc * prj-eglot.el: Delete
  adds  542cbf35d6 * ELPA.make (all): Add docs
  adds  5104f6f836 * prj.el ("gpr-query.prj"): Use elpa package dirs
  adds  99f50385ee * gpr-query.el (gpr-query-session-wait): Restore busy 
message
  adds  3a8e67a795 Delete gpr-query minor mode; fix executable bit
  adds  fd1670eded * install.sh: Just copy alr build binary, clean up
  adds  6356b18639 * build.sh: Show compiler
  adds  ca70129df3 Finish merge
  adds  41b736e746 ; Fix typos
  adds  dbbf1ab955 * Alire.make: Match prj.el rename.
  adds  89e32005c0 ; Prefer HTTPS to HTTP in URLs
  adds  92ac06f23d Release version 1.0.2
  adds  da47f81da1 * alire.toml: Fix gnat version

No new revisions were added by this update.

Summary of changes:
 .gitignore  |  7 +++
 Alire.make  |  7 ---
 ELPA.make   | 44 ++--
 NEWS|  6 ++
 README  |  5 +
 alire.toml  |  4 ++--
 build.sh|  3 ++-
 doclicense.texi |  4 ++--
 gpr-query.el| 56 
 gpr-query.prj   |  1 -
 gpr-query.texi  | 32 ++--
 install.sh  | 17 +++--
 notes.text  | 24 +---
 prj-eglot.el| 41 -
 prj.el  |  4 ++--
 15 files changed, 82 insertions(+), 173 deletions(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 build.sh
 mode change 100644 => 100755 install.sh
 delete mode 100644 prj-eglot.el



[elpa] externals-release/wisi 9ddff6cdf1 1/2: * install.sh: Delete; copied from ada-mode but not edited

2023-01-11 Thread Stephen Leake
branch: externals-release/wisi
commit 9ddff6cdf1dca93b7a661b2874a15a43c180f61b
Author: Stephen Leake 
Commit: Stephen Leake 

* install.sh: Delete; copied from ada-mode but not edited
---
 install.sh | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/install.sh b/install.sh
deleted file mode 100755
index 886fc94eed..00
--- a/install.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Install executables for Ada mode.
-#
-# See build.sh for build (must be run before install).
-
-# $1 : optional --prefix=
-#
-# If you don't have write permission in the GNAT installation
-# directory, you need to use --prefix=, or run with root priviledges.
-
-WISI_DIR=`ls -d ../wisi-3.1.?`
-
-gprinstall -f -p -P ada_mode_wisi_parse.gpr -aP $WISI_DIR 
--install-name=ada_mode_wisi_parse $1 
-
-# end of file.



[elpa] externals-release/ada-mode updated (64acce8bda -> cdf3e4640e)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals-release/ada-mode.

  from  64acce8bda Release 7.3.1; fix install.sh bug
  adds  0215ceee18 Update to 8.0.2 devel release; split out gnat-compiler, 
gpr-mode, gpr-query
  adds  6daaf0ccbe Fix ada-mode.texi bug
  adds  b16f2ce40b * install.sh: Fix comment on argument
  adds  e72d65d459 * build.sh: Move *_parse_table.txt to bin, so install.sh 
copies it
  adds  27395c6f1e Finish merge
  adds  4ae81da579 Fix typos
  adds  e419adcb8f ; Prefer HTTPS to HTTP in URLs
  adds  c3d62e181d Release version 8.0.3
   new  cdf3e4640e Resolve conflicts, finish merge


Summary of changes:
 Alire.make  |11 +
 Makefile => ELPA.make   |15 +-
 NEWS|47 +-
 README  |30 +-
 ada-build.el|65 +-
 ada-compiler-gnat.el|   837 -
 ada-core.el |   427 +-
 ada-eglot.el|   422 +
 ada-gnat-xref.el|   332 -
 ada-imenu.el| 2 +-
 ada-indent-user-options.el  | 4 +-
 ada-mode.casing | 7 +
 ada-mode.el |   648 +-
 ada-mode.texi   |   452 +-
 ada-skel.el | 8 +-
 ada_annex_p-process.el  |10 +-
 ada_annex_p.wy  |67 +-
 ada_annex_p_process_actions.adb |20 +-
 ada_annex_p_process_actions.ads |11 +-
 ada_annex_p_process_lalr_main.adb   |  2503 +-
 ada_annex_p_process_lalr_main.ads   |17 +-
 ada_annex_p_process_lr1_main.adb|32 +-
 ada_annex_p_process_lr1_main.ads|19 +-
 ada_annex_p_re2c.c  | 36588 +-
 ada_annex_p_re2c_c.ads  | 2 +-
 ada_mode.prj| 1 +
 ada_mode_wisi_lalr_parse.ads| 8 +-
 ada_mode_wisi_lr1_parse.ads | 8 +-
 ada_mode_wisi_parse.gpr.gp  |   150 -
 benchmark-xref.el   | 2 +-
 build.sh|70 +-
 create_makefile_conf.sh |19 -
 doclicense.texi | 4 +-
 gpr-indent-user-options.el  |48 -
 gpr-mode.el |   429 -
 gpr-mode.texi   |   256 -
 gpr-process.el  |   148 -
 gpr-query.el|  1090 -
 gpr-skel.el |   137 -
 gpr.wy  |   384 -
 gpr_mode_wisi_parse.ads |37 -
 gpr_process_actions.adb |   418 -
 gpr_process_actions.ads |   305 -
 gpr_process_main.adb|  2625 --
 gpr_process_main.ads|31 -
 gpr_query.adb   |  1379 -
 gpr_re2c.c  |  7693 --
 gpr_re2c_c.ads  |74 -
 install.sh  |31 +-
 prj.el  |37 +-
 run_ada_lalr_parse.ads  | 8 +-
 run_ada_lr1_parse.ads   | 8 +-
 run_gpr_parse.ads   |35 -
 wisi-ada.adb|54 +-
 wisi-ada.ads| 4 -
 wisi-gpr.adb|79 -
 wisi-gpr.ads|60 -
 wisitoken-parse-lr-mckenzie_recover-ada.adb |17 +-
 58 files changed, 21035 insertions(+), 37190 deletions(-)
 create mode 100644 Alire.make
 rename Makefile => ELPA.make (68%)
 delete mode 100644 ada-compiler-gnat.el
 create mode 100644 ada-eglot.el
 delete mode 100644 ada-gnat-xref.el
 create mode 100644 ada-mode.casing
 delete mode 100644 ada_mode_wisi_parse.gpr.gp
 delete mode 100755 create_makefile_conf.sh
 delete mode 100644 gpr-indent-user-options.el
 delete mode 100644 gpr-mode.el
 delete mode 100644 gpr-mode.texi
 delete mode 100644 gpr-process.el
 delete mode 100644 gpr-query.el
 delete mode 100644 gpr-skel.el
 delete mode 100644 gpr.wy
 delete mode 100644 gpr_mode_wisi_parse.ads
 delete mode 100644 gpr_process_actions.adb
 delete mode 100644 gpr_process_actions.ads
 delete mode 100644 gpr_process_main.adb
 delete mode 100644 gpr_process_main.ads
 delete mode 100644 gpr_query.adb
 delete mode 100644 gpr_re2c.c
 delete mode 100644 gpr_re2c_c.ads
 delete mode 100644 run_gpr_parse.ads
 delete mode 100644 wisi-gpr.adb
 delete mode 100644 wisi-gpr.ads



[elpa] externals-release/gnat-compiler updated (abad4b333c -> 959c4d3596)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals-release/gnat-compiler.

  from  abad4b333c Add files to gnat-compiler
  adds  a60dfd29b2 File header fixes
  adds  178098364e * ELPA.make: New file
  adds  97d26c0f18 Fix bug in alire-get-env; create-alire-project now works 
for als
  adds  f1493ed944 Fix byte-compile
  adds  98a036fd6b * gnat-alire.el (alire-get-env): Handle comments in alr 
printenv output
  adds  e69c29af4d Misc cleanups, fix bug in gnat-find-als
  adds  c13ca26054 Add wisi-prj-default
  adds  0a14c9a2ca * gnat-alire.el (create-alire-project): Respect 
convention for create-%s-xref
  adds  2273ebad7f Misc fixes
  adds  b9a35edb56 ; Fix typos
  adds  319951218d * ELPA.make: Delete WISI; not useful
  adds  5b0d334fd9 * ELPA.make (EMACS_EXE): Delete harfbuzz workaround
  adds  ec01992149 ; Prefer HTTPS to HTTP in URLs
  adds  7496273a2e Match ada-mode function rename
  adds  8ca2e5bcd2 Finish merge
  adds  d330e13e65 Rename create-alire-project to create-alire-prj
  adds  959c4d3596 Release version 1.0.1

No new revisions were added by this update.

Summary of changes:
 .gitignore   |  3 +++
 ELPA.make| 37 ++
 NEWS | 17 
 gnat-alire.el| 81 
 gnat-compiler.el | 75 ++-
 gnat-xref.el |  4 +--
 notes.text   | 19 +
 7 files changed, 181 insertions(+), 55 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 ELPA.make
 create mode 100644 NEWS
 create mode 100644 notes.text



[elpa] externals/wisi updated (4fee1845ac -> 9ddff6cdf1)

2023-01-11 Thread Stephen Leake
stephen_leake pushed a change to branch externals/wisi.

  from  4fee1845ac * prj-alire.el: Add copyright notice
   new  9ddff6cdf1 * install.sh: Delete; copied from ada-mode but not edited


Summary of changes:
 install.sh | 15 ---
 1 file changed, 15 deletions(-)
 delete mode 100755 install.sh



[nongnu] elpa/oblivion-theme 751687dd61: Cleanup: format

2023-01-11 Thread ELPA Syncer
branch: elpa/oblivion-theme
commit 751687dd6163593fca2b21bb06a75ac2597de055
Author: Campbell Barton 
Commit: Campbell Barton 

Cleanup: format
---
 oblivion-theme.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/oblivion-theme.el b/oblivion-theme.el
index 928162a320..b105cdc974 100644
--- a/oblivion-theme.el
+++ b/oblivion-theme.el
@@ -149,8 +149,7 @@
;; tab-bar-mode.
`(tab-bar ((t (:bold t :foreground ,ob-aluminium3 :background 
,ob-aluminium6+5
`(tab-bar-tab
- ((t
-   (:foreground ,ob-aluminium3 :background ,ob-aluminium6+16 :box 
(:line-width -1 :color ,ob-aluminium4)
+ ((t (:foreground ,ob-aluminium3 :background ,ob-aluminium6+16 :box 
(:line-width -1 :color ,ob-aluminium4)
`(tab-bar-tab-inactive ((t (:bold nil :italic t :foreground ,ob-aluminium3 
:background ,ob-aluminium6+16
 
;; which-func (shows in the mode-line).