[elpa] externals/org updated (4280762e4c -> 98a771cc3b)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  4280762e4c org-refile: Restore previous behaviour of not revealing 
the refiled headline
   new  2d6f26c057 org-fold: Prevent folding level 1 headlines
   new  e359b01a63 doc/org-manual.org: Fix clocktable dynamic block examples
   new  98a771cc3b test-ob-octave: Add missing `provide'


Summary of changes:
 doc/org-manual.org | 12 ++--
 lisp/org-fold.el   |  5 +
 testing/lisp/test-ob-octave.el |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

[elpa] externals/org 98a771cc3b 3/3: test-ob-octave: Add missing `provide'

[ELPA Syncer]

branch: externals/org
commit 98a771cc3bb56886a0682088a9767655efe4c9be
Author: Nick Dokos 
Commit: Ihor Radchenko 

test-ob-octave: Add missing `provide'
---
 testing/lisp/test-ob-octave.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/lisp/test-ob-octave.el b/testing/lisp/test-ob-octave.el
index 7e20add991..6113b40f31 100644
--- a/testing/lisp/test-ob-octave.el
+++ b/testing/lisp/test-ob-octave.el
@@ -63,3 +63,5 @@
   (org-test-at-id "cc2d82bb-2ac0-45be-a0c8-d1463b86a3ba"
 (org-babel-next-src-block 5)
 (should (equal nil (org-babel-execute-src-block)
+
+(provide 'test-ob-octave)

[elpa] externals/org 2d6f26c057 1/3: org-fold: Prevent folding level 1 headlines

[ELPA Syncer]

branch: externals/org
commit 2d6f26c057fad23745dae17b80b53874a906858a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-fold: Prevent folding level 1 headlines

* lisp/org-fold.el (org-fold--reveal-outline-maybe): Never keep level
1 headlines inserted inside folded region hidden.  Such headlines can
often be added to end of buffer by capture.  This change prevents such
headlines to be hidden.

Reported in 
https://orgmode.org/list/CABUh-74vvn7i06T3zB=38_bffbks9j9h8nxgp_-eecoapgy...@mail.gmail.com
---
 lisp/org-fold.el | 5 +
 1 file changed, 5 insertions(+)

diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 0c978a377f..fb6c66bba5 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -929,6 +929,11 @@ This function is intended to be used as :fragile property 
of
   (beginning-of-line)
   ;; Make sure that headline is not partially hidden
   (unless (org-fold-folded-p nil 'headline) (org-fold-region (max 
(point-min) (1- (point))) (line-end-position) nil 'headline))
+  ;; Never hide level 1 headlines
+  (save-excursion
+(goto-char (line-end-position))
+(when (re-search-forward (rx bol "* ") (cdr region) t)
+  (org-fold-region (match-beginning 0) (line-end-position) nil 
'headline)))
   ;; Check the validity of headline
   (unless (let ((case-fold-search t))
(looking-at (rx-to-string `(or (regex ,(org-item-re))

[elpa] externals/org e359b01a63 2/3: doc/org-manual.org: Fix clocktable dynamic block examples

[ELPA Syncer]

branch: externals/org
commit e359b01a63afd5c6a79b993c1e2ea98252308402
Author: Nick Dokos 
Commit: Ihor Radchenko 

doc/org-manual.org: Fix clocktable dynamic block examples
---
 doc/org-manual.org | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index af54dc4e87..6768ca98dd 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -6665,7 +6665,7 @@ into the buffer by ~org-clock-report~:
 #+cindex: @samp{BEGIN clocktable}
 #+begin_example
 ,#+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+vindex: org-clocktable-defaults
@@ -6849,7 +6849,7 @@ day, you could write:
 
 #+begin_example
 ,#+BEGIN: clocktable :maxlevel 2 :block today :scope tree1 :link t
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6858,7 +6858,7 @@ To use a specific time range you could write[fn:80]
 #+begin_example
 ,#+BEGIN: clocktable :tstart "<2006-08-10 Thu 10:00>"
 :tend "<2006-08-10 Thu 12:00>"
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6866,7 +6866,7 @@ A range starting a week ago and ending right now could be 
written as
 
 #+begin_example
 ,#+BEGIN: clocktable :tstart "<-1w>" :tend ""
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6874,7 +6874,7 @@ A summary of the current subtree with % times would be
 
 #+begin_example
 ,#+BEGIN: clocktable :scope subtree :link t :formula %
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6883,7 +6883,7 @@ last week would be
 
 #+begin_example
 ,#+BEGIN: clocktable :scope agenda :block lastweek :compact t
-,#+END: clocktable
+,#+END:
 #+end_example
 
 *** Resolving idle time and continuous clocking

[elpa] externals/eglot 3bd9cb5c51 1/2: Rework bug-reporting templates

[ELPA Syncer]

branch: externals/eglot
commit 3bd9cb5c51d7c93897772b4cf4534bb2d3e9ccaa
Author: João Távora 
Commit: João Távora 

Rework bug-reporting templates
---
 .github/ISSUE_TEMPLATE/bug_report.md | 120 +--
 .github/ISSUE_TEMPLATE/config.yml|  15 +
 2 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md 
b/.github/ISSUE_TEMPLATE/bug_report.md
index edda64d99f..2829b6cb86 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -5,15 +5,14 @@ title: ''
 labels: ''
 assignees: ''
 ---
-
  
- ```sh
- # Type this in a shell to start an Emacs with Eglot configured
- $ /path/to/a/certain/version/of/emacs -Q -f package-initialize -L 
/path/to/git-cloned/eglot -l eglot.el 
- ```
- 
- 
- 
- ```lisp
- ;; Example of a minimal configuration
- ;;
- (add-to-list 'eglot-server-programs '(foo-mode "foo-server"))
- (setq eglot-special-option-2000 '(foo bar with the airplane)) 
- (some-clearly-identified-third-party-package)
-  ```
- 
- 
 
-  Some users also provide whole Git repositories perfectly
-  "sandboxing" a configuration and setup.  If you're confident on
-  how do to this, that also works.
-  
-  Thank you very much.
-  
-  (Adapted this template from RollupJS's bug tracker). -->
+[1]: https://stackoverflow.com/help/minimal-reproducible-example
diff --git a/.github/ISSUE_TEMPLATE/config.yml 
b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00..02577de421
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,15 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "Discuss Eglot, request features, report bugs informally"
+url: https://github.com/joaotavora/eglot/discussions
+about: Ask questions, request features, answer questions
+  - name: "Additional Support: Emacs Help"
+url: https://lists.gnu.org/mailman/listinfo/help-gnu-emacs
+about: Search, ask and answer questions
+  - name: "Additional Support: Emacs StackExchange"
+url: https://emacs.stackexchange.com/questions/tagged/eglot
+about: Search, ask and answer questions
+  - name: "Additional Support: Emacs Reddit"
+url: https://www.reddit.com/r/emacs
+about: Search, ask and answer questions
+  

[elpa] externals/eglot updated (777a7169c2 -> 734a1ee224)

[ELPA Syncer]

elpasync pushed a change to branch externals/eglot.

  from  777a7169c2 Close #922: Add out-of-box support for Futhark LSP server
   new  3bd9cb5c51 Rework bug-reporting templates
   new  734a1ee224 Fix #936: ensure non-null :settings param in 
didChangeConfiguration notif


Summary of changes:
 .github/ISSUE_TEMPLATE/bug_report.md | 120 +--
 .github/ISSUE_TEMPLATE/config.yml|  15 +
 eglot.el |  11 ++--
 3 files changed, 79 insertions(+), 67 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

[elpa] externals/eglot 734a1ee224 2/2: Fix #936: ensure non-null :settings param in didChangeConfiguration notif

[ELPA Syncer]

branch: externals/eglot
commit 734a1ee224d591073ffb12b460df1c4a76510f30
Author: João Távora 
Commit: João Távora 

Fix #936: ensure non-null :settings param in didChangeConfiguration notif

* eglot.el (eglot-signal-didChangeConfiguration): Use eglot--{}
---
 eglot.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eglot.el b/eglot.el
index 348ae4b42c..fd82b76c5b 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2198,11 +2198,12 @@ When called interactively, use the currently active 
server"
server :workspace/didChangeConfiguration
(list
 :settings
-(cl-loop for (section . v) in eglot-workspace-configuration
- collect (if (keywordp section)
- section
-   (intern (format ":%s" section)))
- collect v
+(or (cl-loop for (section . v) in eglot-workspace-configuration
+ collect (if (keywordp section)
+ section
+   (intern (format ":%s" section)))
+ collect v)
+eglot--{}
 
 (cl-defmethod eglot-handle-request
   (server (_method (eql workspace/configuration)) &key items)

[elpa] branch externals/sql-cassandra created (now a203380be4)

[Filipp Gunbin]

fgunbin pushed a change to branch externals/sql-cassandra.

at  a203380be4 Initial commit

This branch includes the following new commits:

   new  a203380be4 Initial commit

[elpa] externals/sql-cassandra a203380be4: Initial commit

[Filipp Gunbin]

branch: externals/sql-cassandra
commit a203380be4fb70e914945703fb8b022186694e35
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Initial commit
---
 packages/sql-cassandra/sql-cassandra.el | 195 
 1 file changed, 195 insertions(+)

diff --git a/packages/sql-cassandra/sql-cassandra.el 
b/packages/sql-cassandra/sql-cassandra.el
new file mode 100644
index 00..825e4fca92
--- /dev/null
+++ b/packages/sql-cassandra/sql-cassandra.el
@@ -0,0 +1,195 @@
+;;; sql-cassandra.el --- Cassandra support for sql.el  -*- lexical-binding: t; 
-*-
+
+;; Copyright (C) 2022-2022  Free Software Foundation, Inc.
+
+;; Author: Filipp Gunbin 
+;; Maintainer: Filipp Gunbin 
+;; Version: 0.1
+;; Keywords: sql, cassandra, cql, cqlsh
+
+;; 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 GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Code:
+
+(require 'sql)
+(require 'seq)
+
+(defcustom sql-cassandra-program "cqlsh"
+  "Command to start the Cassandra client."
+  :type 'file
+  :group 'SQL)
+
+(defcustom sql-cassandra-options
+  '("--no-color")
+  "List of additional options for `sql-cassandra-program'."
+  :type '(repeat string)
+  :group 'SQL)
+
+(defcustom sql-cassandra-login-params
+  `((user :default ,(user-login-name))
+password
+(database :default "system")
+(server :default "localhost")
+(port :default 9042))
+  "List of login parameters needed to connect to Cassandra cluster."
+  :type 'sql-login-params
+  :group 'SQL)
+
+
+(defconst sql-cassandra-special-commands
+  '("capture" "cls" "copy" "describe" "expand" "login" "serial"
+"source" "unicode" "clear" "consistency" "desc" "exit" "help"
+"paging" "show" "tracing")
+  "Special commands recognized by cqlsh.
+
+Refer to:
+https://cassandra.apache.org/doc/latest/cassandra/tools/cqlsh.html#special-commands";)
+
+(defconst sql-cassandra-native-types
+  '("ascii" "bigint" "blob" "boolean" "counter" "date" "decimal"
+"double" "duration" "float" "inet" "int" "smallint" "text" "time"
+"timestamp" "timeuuid" "tinyint" "uuid" "varchar" "varint")
+  "Cassandra native types.
+
+Refer to
+ 
https://cassandra.apache.org/doc/latest/cassandra/cql/types.html#native-types";)
+
+(defconst sql-cassandra-reserved-types
+  '("bitstring" "byte" "complex" "enum" "interval" "macaddr")
+  "Cassandra reserved types.
+
+Refer to
+ 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-b-cql-reserved-types.";)
+
+(defconst sql-cassandra-keywords
+  '("add" "aggregate" "all" "allow" "alter" "and" "apply" "as" "asc"
+"ascii" "authorize" "batch" "begin" "bigint" "blob" "boolean"
+"by" "called" "clustering" "columnfamily" "compact" "contains"
+"count" "counter" "create" "custom" "date" "decimal" "delete"
+"desc" "describe" "distinct" "double" "drop" "entries" "execute"
+"exists" "filtering" "finalfunc" "float" "from" "frozen" "full"
+"function" "functions" "grant" "if" "in" "index" "inet" "infinity"
+"initcond" "input" "insert" "int" "into" "json" "key" "keys"
+"keyspace" "keyspaces" "language" "limit" "list" "login" "map"
+"modify" "nan" "nologin" "norecursive" "nosuperuser" "not" "null"
+"of" "on" "options" "or" "order" "password" "permission" "permissions"
+"primary" "rename" "replace" "returns" "revoke" "role" "roles"
+"schema" "select" "set" "sfunc" "smallint" "static" "storage"
+"stype" "superuser" "table" "text" "time" "timestamp" "timeuuid"
+"tinyint" "to" "token" "trigger" "truncate" "ttl" "tuple" "type"
+"unlogged" "update" "use" "user" "users" "using" "uuid" "values"
+"varchar" "varint" "where" "with" "writetime")
+  "Cassandra keywords.
+
+Refer to 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-A";)
+
+(defvar sql-cassandra-font-lock-keywords
+  (eval-when-compile
+(list
+ `(,(concat "^\\s-*" (regexp-opt sql-cassandra-special-commands) ".*$")
+   . font-lock-doc-face)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-type-face nil sql-cassandra-native-types)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-type-face nil sql-cassandra-reserved-types)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-keyword-face nil
+   (seq-remove (lambda (el)
+ (member el sql-cassandra-native-types))
+   sql-cassandra-keywords)
+
+
+
+(defun sql-c

[elpa] main f2a8444b2e: * elpa-packages (sql-cassandra): New package

[Filipp Gunbin]

branch: main
commit f2a8444b2eaf74211504e4bdfed925bbcd5452f5
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

* elpa-packages (sql-cassandra): New package
---
 elpa-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 06003bc5fb..bd04950149 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -565,6 +565,7 @@
  ("sotlisp":url 
"https://github.com/Malabarba/speed-of-thought-lisp";)
  ("spinner":url "https://github.com/Malabarba/spinner.el";)
  ("sql-beeline":url nil)
+ ("sql-cassandra"  :url nil)
  ("sql-indent"  :url "https://github.com/alex-hhh/emacs-sql-indent";)
  ("sql-smie":url nil)
  ("ssh-deploy" :url "https://github.com/cjohansson/emacs-ssh-deploy";)
@@ -634,7 +635,7 @@
  ("vc-hgcmd"   :url "https://github.com/muffinmad/emacs-vc-hgcmd";
   :auto-sync t)
  ("vc-backup"  :url "https://git.sr.ht/~pkal/vc-backup";
-  :auto-sync t) 
+  :auto-sync t)
  ("vcard"  :url nil)
  ("vdiff"   :url "https://github.com/justbur/emacs-vdiff";)
  ("vcl-mode"   :url "git://git.gnu.org.ua/vcl-mode")

[elpa] branch externals/sql-cassandra deleted (was a203380be4)

[Filipp Gunbin]

fgunbin pushed a change to branch externals/sql-cassandra.

   was  a203380be4 Initial commit

This change permanently discards the following revisions:

  discards  a203380be4 Initial commit

[elpa] externals/sql-cassandra 19a9bf5412: Initial commit

[Filipp Gunbin]

branch: externals/sql-cassandra
commit 19a9bf54120c816f9635ed144b5be67bb11a31ea
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Initial commit
---
 sql-cassandra.el | 195 +++
 1 file changed, 195 insertions(+)

diff --git a/sql-cassandra.el b/sql-cassandra.el
new file mode 100644
index 00..825e4fca92
--- /dev/null
+++ b/sql-cassandra.el
@@ -0,0 +1,195 @@
+;;; sql-cassandra.el --- Cassandra support for sql.el  -*- lexical-binding: t; 
-*-
+
+;; Copyright (C) 2022-2022  Free Software Foundation, Inc.
+
+;; Author: Filipp Gunbin 
+;; Maintainer: Filipp Gunbin 
+;; Version: 0.1
+;; Keywords: sql, cassandra, cql, cqlsh
+
+;; 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 GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Code:
+
+(require 'sql)
+(require 'seq)
+
+(defcustom sql-cassandra-program "cqlsh"
+  "Command to start the Cassandra client."
+  :type 'file
+  :group 'SQL)
+
+(defcustom sql-cassandra-options
+  '("--no-color")
+  "List of additional options for `sql-cassandra-program'."
+  :type '(repeat string)
+  :group 'SQL)
+
+(defcustom sql-cassandra-login-params
+  `((user :default ,(user-login-name))
+password
+(database :default "system")
+(server :default "localhost")
+(port :default 9042))
+  "List of login parameters needed to connect to Cassandra cluster."
+  :type 'sql-login-params
+  :group 'SQL)
+
+
+(defconst sql-cassandra-special-commands
+  '("capture" "cls" "copy" "describe" "expand" "login" "serial"
+"source" "unicode" "clear" "consistency" "desc" "exit" "help"
+"paging" "show" "tracing")
+  "Special commands recognized by cqlsh.
+
+Refer to:
+https://cassandra.apache.org/doc/latest/cassandra/tools/cqlsh.html#special-commands";)
+
+(defconst sql-cassandra-native-types
+  '("ascii" "bigint" "blob" "boolean" "counter" "date" "decimal"
+"double" "duration" "float" "inet" "int" "smallint" "text" "time"
+"timestamp" "timeuuid" "tinyint" "uuid" "varchar" "varint")
+  "Cassandra native types.
+
+Refer to
+ 
https://cassandra.apache.org/doc/latest/cassandra/cql/types.html#native-types";)
+
+(defconst sql-cassandra-reserved-types
+  '("bitstring" "byte" "complex" "enum" "interval" "macaddr")
+  "Cassandra reserved types.
+
+Refer to
+ 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-b-cql-reserved-types.";)
+
+(defconst sql-cassandra-keywords
+  '("add" "aggregate" "all" "allow" "alter" "and" "apply" "as" "asc"
+"ascii" "authorize" "batch" "begin" "bigint" "blob" "boolean"
+"by" "called" "clustering" "columnfamily" "compact" "contains"
+"count" "counter" "create" "custom" "date" "decimal" "delete"
+"desc" "describe" "distinct" "double" "drop" "entries" "execute"
+"exists" "filtering" "finalfunc" "float" "from" "frozen" "full"
+"function" "functions" "grant" "if" "in" "index" "inet" "infinity"
+"initcond" "input" "insert" "int" "into" "json" "key" "keys"
+"keyspace" "keyspaces" "language" "limit" "list" "login" "map"
+"modify" "nan" "nologin" "norecursive" "nosuperuser" "not" "null"
+"of" "on" "options" "or" "order" "password" "permission" "permissions"
+"primary" "rename" "replace" "returns" "revoke" "role" "roles"
+"schema" "select" "set" "sfunc" "smallint" "static" "storage"
+"stype" "superuser" "table" "text" "time" "timestamp" "timeuuid"
+"tinyint" "to" "token" "trigger" "truncate" "ttl" "tuple" "type"
+"unlogged" "update" "use" "user" "users" "using" "uuid" "values"
+"varchar" "varint" "where" "with" "writetime")
+  "Cassandra keywords.
+
+Refer to 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-A";)
+
+(defvar sql-cassandra-font-lock-keywords
+  (eval-when-compile
+(list
+ `(,(concat "^\\s-*" (regexp-opt sql-cassandra-special-commands) ".*$")
+   . font-lock-doc-face)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-type-face nil sql-cassandra-native-types)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-type-face nil sql-cassandra-reserved-types)
+ (apply #'sql-font-lock-keywords-builder
+   'font-lock-keyword-face nil
+   (seq-remove (lambda (el)
+ (member el sql-cassandra-native-types))
+   sql-cassandra-keywords)
+
+
+
+(defun sql-comint-cassandra (product options &optional buf-name)
+  "Create comint

[elpa] branch externals/sql-cassandra created (now 19a9bf5412)

[Filipp Gunbin]

fgunbin pushed a change to branch externals/sql-cassandra.

at  19a9bf5412 Initial commit

This branch includes the following new commits:

   new  19a9bf5412 Initial commit

[elpa] externals/sql-cassandra 1358c2eda1: .gitignore: New file

[Filipp Gunbin]

branch: externals/sql-cassandra
commit 1358c2eda10cf905e9228e5da4d2e0fb96211292
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

.gitignore: New file
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..6a5760af08
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/sql-cassandra-pkg.el
+/sql-cassandra-autoloads.el
+*.elc

[elpa] externals/sql-cassandra 3e919c88b2: Move defconsts inside eval-when-compile

[Filipp Gunbin]

branch: externals/sql-cassandra
commit 3e919c88b248e6030694c1d090c81a487cf549ba
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Move defconsts inside eval-when-compile
---
 sql-cassandra.el | 69 
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/sql-cassandra.el b/sql-cassandra.el
index 825e4fca92..dd783aca6c 100644
--- a/sql-cassandra.el
+++ b/sql-cassandra.el
@@ -47,52 +47,53 @@
   :group 'SQL)
 
 
-(defconst sql-cassandra-special-commands
-  '("capture" "cls" "copy" "describe" "expand" "login" "serial"
-"source" "unicode" "clear" "consistency" "desc" "exit" "help"
-"paging" "show" "tracing")
-  "Special commands recognized by cqlsh.
+(eval-when-compile
+  (defconst sql-cassandra-special-commands
+'("capture" "cls" "copy" "describe" "expand" "login" "serial"
+  "source" "unicode" "clear" "consistency" "desc" "exit" "help"
+  "paging" "show" "tracing")
+"Special commands recognized by cqlsh.
 
 Refer to:
 
https://cassandra.apache.org/doc/latest/cassandra/tools/cqlsh.html#special-commands";)
 
-(defconst sql-cassandra-native-types
-  '("ascii" "bigint" "blob" "boolean" "counter" "date" "decimal"
-"double" "duration" "float" "inet" "int" "smallint" "text" "time"
-"timestamp" "timeuuid" "tinyint" "uuid" "varchar" "varint")
-  "Cassandra native types.
+  (defconst sql-cassandra-native-types
+'("ascii" "bigint" "blob" "boolean" "counter" "date" "decimal"
+  "double" "duration" "float" "inet" "int" "smallint" "text" "time"
+  "timestamp" "timeuuid" "tinyint" "uuid" "varchar" "varint")
+"Cassandra native types.
 
 Refer to
  
https://cassandra.apache.org/doc/latest/cassandra/cql/types.html#native-types";)
 
-(defconst sql-cassandra-reserved-types
-  '("bitstring" "byte" "complex" "enum" "interval" "macaddr")
-  "Cassandra reserved types.
+  (defconst sql-cassandra-reserved-types
+'("bitstring" "byte" "complex" "enum" "interval" "macaddr")
+"Cassandra reserved types.
 
 Refer to
  
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-b-cql-reserved-types.";)
 
-(defconst sql-cassandra-keywords
-  '("add" "aggregate" "all" "allow" "alter" "and" "apply" "as" "asc"
-"ascii" "authorize" "batch" "begin" "bigint" "blob" "boolean"
-"by" "called" "clustering" "columnfamily" "compact" "contains"
-"count" "counter" "create" "custom" "date" "decimal" "delete"
-"desc" "describe" "distinct" "double" "drop" "entries" "execute"
-"exists" "filtering" "finalfunc" "float" "from" "frozen" "full"
-"function" "functions" "grant" "if" "in" "index" "inet" "infinity"
-"initcond" "input" "insert" "int" "into" "json" "key" "keys"
-"keyspace" "keyspaces" "language" "limit" "list" "login" "map"
-"modify" "nan" "nologin" "norecursive" "nosuperuser" "not" "null"
-"of" "on" "options" "or" "order" "password" "permission" "permissions"
-"primary" "rename" "replace" "returns" "revoke" "role" "roles"
-"schema" "select" "set" "sfunc" "smallint" "static" "storage"
-"stype" "superuser" "table" "text" "time" "timestamp" "timeuuid"
-"tinyint" "to" "token" "trigger" "truncate" "ttl" "tuple" "type"
-"unlogged" "update" "use" "user" "users" "using" "uuid" "values"
-"varchar" "varint" "where" "with" "writetime")
-  "Cassandra keywords.
-
-Refer to 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-A";)
+  (defconst sql-cassandra-keywords
+'("add" "aggregate" "all" "allow" "alter" "and" "apply" "as" "asc"
+  "ascii" "authorize" "batch" "begin" "bigint" "blob" "boolean"
+  "by" "called" "clustering" "columnfamily" "compact" "contains"
+  "count" "counter" "create" "custom" "date" "decimal" "delete"
+  "desc" "describe" "distinct" "double" "drop" "entries" "execute"
+  "exists" "filtering" "finalfunc" "float" "from" "frozen" "full"
+  "function" "functions" "grant" "if" "in" "index" "inet" "infinity"
+  "initcond" "input" "insert" "int" "into" "json" "key" "keys"
+  "keyspace" "keyspaces" "language" "limit" "list" "login" "map"
+  "modify" "nan" "nologin" "norecursive" "nosuperuser" "not" "null"
+  "of" "on" "options" "or" "order" "password" "permission" "permissions"
+  "primary" "rename" "replace" "returns" "revoke" "role" "roles"
+  "schema" "select" "set" "sfunc" "smallint" "static" "storage"
+  "stype" "superuser" "table" "text" "time" "timestamp" "timeuuid"
+  "tinyint" "to" "token" "trigger" "truncate" "ttl" "tuple" "type"
+  "unlogged" "update" "use" "user" "users" "using" "uuid" "values"
+  "varchar" "varint" "where" "with" "writetime")
+"Cassandra keywords.
+
+Refer to 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#appendix-A";))
 
 (defvar sql-cassandra-font-lock-keywords
   (eval-when-compile

[elpa] externals/eglot 7f1f093472: Close #905: Add out-of-box support for PureScript LSP server

[ELPA Syncer]

branch: externals/eglot
commit 7f1f09347214ebb6e0395f3e27a04f87f544ffdd
Author: Tomasz Hołubowicz <45176912+alternate...@users.noreply.github.com>
Commit: GitHub 

Close #905: Add out-of-box support for PureScript LSP server

* eglot.el (eglot-server-programs): Support purescript lsp.
* README.md: Update.
* NEWS.md: Update.

Copyright-paperwork-exempt: Yes
---
 NEWS.md   | 2 ++
 README.md | 2 ++
 eglot.el  | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 5ef15eac22..9f77dfc398 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -46,6 +46,7 @@ available.  The special support code for RLS has been removed.
 - clojure-lsp ([#813][github#813])
 - racket-langserver ([#694][github#694])
 - futhark lsp ([#922](github#922))
+- purescript-language-server ([#905](github#905))
 
 # 1.8 (12/1/2022)
 
@@ -375,4 +376,5 @@ and now said bunch of references-->
 [github#893]: https://github.com/joaotavora/eglot/issues/893
 [github#899]: https://github.com/joaotavora/eglot/issues/899
 [github#901]: https://github.com/joaotavora/eglot/issues/901
+[github#905]: https://github.com/joaotavora/eglot/issues/905
 [github#922]: https://github.com/joaotavora/eglot/issues/922
diff --git a/README.md b/README.md
index 376c7a0d46..010ab30dcf 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ find-library` can help you tell if that happened.
 * Nix's [rnix-lsp][rnix-lsp]
 * Ocaml's [ocaml-lsp][ocaml-lsp]
 * PHP's [php-language-server][php-language-server]
+* PureScript's [purescript-language-server][purescript-language-server]
 * Python's [pylsp][pylsp], [pyls][pyls] or [pyright][pyright]
 * R's [languageserver][r-languageserver]
 * Racket's [racket-langserver][racket-langserver]
@@ -522,6 +523,7 @@ for the request form, and we'll send it to you.
 [rnix-lsp]: https://github.com/nix-community/rnix-lsp
 [ocaml-lsp]: https://github.com/ocaml/ocaml-lsp/
 [php-language-server]: https://github.com/felixfbecker/php-language-server
+[purescript-language-server]: 
https://github.com/nwolverson/purescript-language-server
 [pyls]: https://github.com/palantir/python-language-server
 [pylsp]: https://github.com/python-lsp/python-lsp-server
 [pyright]: https://github.com/microsoft/pyright
diff --git a/eglot.el b/eglot.el
index fd82b76c5b..3d1b19c905 100644
--- a/eglot.el
+++ b/eglot.el
@@ -195,7 +195,8 @@ language-server/bin/php-language-server.php"))
 (json-mode . ,(eglot-alternatives 
'(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio"
 (dockerfile-mode . ("docker-langserver" 
"--stdio"))
 (clojure-mode . ("clojure-lsp"))
-(csharp-mode . ("omnisharp" "-lsp")))
+(csharp-mode . ("omnisharp" "-lsp"))
+(purescript-mode . 
("purescript-language-server" "--stdio")))
   "How the command `eglot' guesses the server to start.
 An association list of (MAJOR-MODE . CONTACT) pairs.  MAJOR-MODE
 identifies the buffers that are to be managed by a specific

[elpa] externals/org updated (98a771cc3b -> 1ed9e42238)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  98a771cc3b test-ob-octave: Add missing `provide'
   new  e142bd8a9a org-fold: Fix folding blank lines after newly inserted 
heading
   new  1ed9e42238 org-todo: Fix point moving after setting todo keyword in 
empty heading


Summary of changes:
 lisp/org-fold.el | 19 ---
 lisp/org.el  | 21 +
 2 files changed, 29 insertions(+), 11 deletions(-)

[elpa] externals/org e142bd8a9a 1/2: org-fold: Fix folding blank lines after newly inserted heading

[ELPA Syncer]

branch: externals/org
commit e142bd8a9ad4a32daa574244e291b151b13d7713
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-fold: Fix folding blank lines after newly inserted heading

* lisp/org-fold.el (org-fold--reveal-outline-maybe): Reveal blank
lines after newly inserted heading after a folded heading.
---
 lisp/org-fold.el | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index fb6c66bba5..9abf97c3cc 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -928,7 +928,19 @@ This function is intended to be used as :fragile property 
of
   (backward-char)
   (beginning-of-line)
   ;; Make sure that headline is not partially hidden
-  (unless (org-fold-folded-p nil 'headline) (org-fold-region (max 
(point-min) (1- (point))) (line-end-position) nil 'headline))
+  (unless (org-fold-folded-p nil 'headline)
+(org-fold-region (max (point-min) (1- (point)))
+ (let ((endl (line-end-position)))
+   (save-excursion
+ (goto-char endl)
+ (skip-chars-forward "\n\t\r ")
+ ;; Unfold blank lines.
+ (if (or (and (looking-at-p "\\*")
+  (> (point) (1+ endl)))
+ (eq (point) (point-max)))
+ (point)
+   endl)))
+ nil 'headline))
   ;; Never hide level 1 headlines
   (save-excursion
 (goto-char (line-end-position))
@@ -936,8 +948,9 @@ This function is intended to be used as :fragile property of
   (org-fold-region (match-beginning 0) (line-end-position) nil 
'headline)))
   ;; Check the validity of headline
   (unless (let ((case-fold-search t))
-   (looking-at (rx-to-string `(or (regex ,(org-item-re))
-  (regex 
,org-outline-regexp-bol) ; the match-data will be used later
+   (looking-at (rx-to-string
+ `(or (regex ,(org-item-re))
+ (regex ,org-outline-regexp-bol)
t
 
 (defun org-fold--reveal-drawer-or-block-maybe (region spec)

[nongnu] elpa/git-commit b620f9d9d2: magit-emacs-Q-command: Add compat to load-path

[ELPA Syncer]

branch: elpa/git-commit
commit b620f9d9d2047df5b367a248a5b528e5dcb2d67d
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-emacs-Q-command: Add compat to load-path

Re #4669.
---
 default.mk | 2 ++
 lisp/magit-base.el | 1 +
 2 files changed, 3 insertions(+)

diff --git a/default.mk b/default.mk
index a7544e1672..4312170acd 100644
--- a/default.mk
+++ b/default.mk
@@ -142,6 +142,8 @@ endif
 
 ## Load-Path #
 
+# Remember to also update magit-emacs-Q-command!
+
 ifndef LOAD_PATH
 
 USER_EMACS_DIR = $(HOME)/.emacs.d
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 0538f52db2..289982ddd2 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -876,6 +876,7 @@ See info node `(magit)Debugging Tools' for more 
information."
   ((not (equal lib "libgit"))
(error "Cannot find mandatory dependency %s" 
lib)
  '(;; Like `LOAD_PATH' in `default.mk'.
+   "compat"
"dash"
"libgit"
"transient"

[nongnu] elpa/magit updated (713bebef9e -> b620f9d9d2)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  713bebef9e magit--rev-dereference: Handle nil REV
  adds  b620f9d9d2 magit-emacs-Q-command: Add compat to load-path

No new revisions were added by this update.

Summary of changes:
 default.mk | 2 ++
 lisp/magit-base.el | 1 +
 2 files changed, 3 insertions(+)

[nongnu] elpa/magit-section updated (713bebef9e -> b620f9d9d2)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  713bebef9e magit--rev-dereference: Handle nil REV
  adds  b620f9d9d2 magit-emacs-Q-command: Add compat to load-path

No new revisions were added by this update.

Summary of changes:
 default.mk | 2 ++
 lisp/magit-base.el | 1 +
 2 files changed, 3 insertions(+)

[elpa] externals/org 1ed9e42238 2/2: org-todo: Fix point moving after setting todo keyword in empty heading

[ELPA Syncer]

branch: externals/org
commit 1ed9e42238bc0cc721f41dec8ab5f01a65d862d9
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-todo: Fix point moving after setting todo keyword in empty heading

* lisp/org.el (org-todo): Insert new todo keyword before
`save-excursion' markers.  This avoids apparent point movement when a
new keyword is inserted into an empty heading.
Before: "* " -> "* TODO";
After: "* " -> "* TODO";

Fixes https://orgmode.org/list/87mtg6265i@yandex.com
---
 lisp/org.el | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c675fc1541..1d5fc39038 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8976,14 +8976,19 @@ When called through ELisp, arg is also interpreted in 
the following way:
(throw 'exit nil)
(store-match-data match-data)
 (org-fold-core-ignore-modifications
-(save-excursion
-  (goto-char (match-beginning 0))
-  (setf (buffer-substring (match-beginning 0) (match-end 0)) 
"")
-  (insert-and-inherit next)
-  (unless (org-invisible-p (line-beginning-position))
-(org-fold-region (line-beginning-position)
-  (line-end-position)
-  nil
+(goto-char (match-beginning 0))
+  (replace-match "")
+  ;; We need to use `insert-before-markers-and-inherit'
+  ;; because: (1) We want to preserve the folding state
+  ;; text properties; (2) We do not want to make point
+  ;; move before new todo state when inserting a new todo
+  ;; into an empty heading.  In (2), the above
+  ;; `save-excursion' is relying on markers saved before.
+  (insert-before-markers-and-inherit next)
+  (unless (org-invisible-p (line-beginning-position))
+(org-fold-region (line-beginning-position)
+  (line-end-position)
+  nil)))
(cond ((and org-state (equal this org-state))
   (message "TODO state was already %s" (org-trim next)))
  ((not (pos-visible-in-window-p hl-pos))

[nongnu] elpa/geiser updated (77adf19d38 -> 1b1fdd2be4)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser.

  from  77adf19d38 Byte-compilation warnings fixed
   new  18faa0ba32 Suggestive patch for simplified completion
   new  1b1fdd2be4 geiser-capf: new module to break cyclic dependencies


Summary of changes:
 doc/cheat.texi |   4 +-
 elisp/geiser-capf.el   |  90 +++
 elisp/geiser-company.el| 148 -
 elisp/geiser-completion.el |  39 +---
 elisp/geiser-mode.el   |  12 +---
 elisp/geiser-reload.el |   4 +-
 elisp/geiser-repl.el   |  11 +---
 readme.org |  11 ++--
 8 files changed, 107 insertions(+), 212 deletions(-)
 create mode 100644 elisp/geiser-capf.el
 delete mode 100644 elisp/geiser-company.el

[nongnu] elpa/geiser 1b1fdd2be4 2/2: geiser-capf: new module to break cyclic dependencies

[ELPA Syncer]

branch: elpa/geiser
commit 1b1fdd2be47fcbadab4b224266d30dee4484a4b0
Author: jao 
Commit: jao 

geiser-capf: new module to break cyclic dependencies
---
 doc/cheat.texi |  4 +--
 elisp/geiser-capf.el   | 90 ++
 elisp/geiser-completion.el | 69 +--
 elisp/geiser-mode.el   |  5 +--
 elisp/geiser-reload.el |  3 +-
 elisp/geiser-repl.el   |  5 +--
 6 files changed, 101 insertions(+), 75 deletions(-)

diff --git a/doc/cheat.texi b/doc/cheat.texi
index ba0eb0e40f..105d0c3176 100644
--- a/doc/cheat.texi
+++ b/doc/cheat.texi
@@ -127,7 +127,7 @@ third key not modified by @key{Control}; e.g.,
 @tab @code{completion-at-point}
 @tab Complete identifier at point
 @item M-`, C-.
-@tab @code{geiser-completion--complete-module}
+@tab @code{geiser-capf-complete-module}
 @tab Complete module name at point
 @end multitable
 
@@ -164,7 +164,7 @@ third key not modified by @key{Control}; e.g.,
 @tab @code{completion-at-point}
 @tab Complete identifier at point
 @item M-`, C-.
-@tab @code{geiser-completion--complete-module}
+@tab @code{geiser-capf-complete-module}
 @tab Complete module name at point
 @item C-c [, C-c C-[
 @tab @code{geiser-squarify}
diff --git a/elisp/geiser-capf.el b/elisp/geiser-capf.el
new file mode 100644
index 00..73a6f07d12
--- /dev/null
+++ b/elisp/geiser-capf.el
@@ -0,0 +1,90 @@
+;;; geiser-capf.el -- Setup for Geiser's CAPFs
+
+;; Copyright (c) 2022  Jose Antonio Ortega Ruiz
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see .
+
+;; Start date: Sat Apr 23, 2022 18:39
+
+
+
+(require 'geiser-autodoc)
+(require 'geiser-impl)
+(require 'geiser-eval)
+(require 'geiser-doc)
+(require 'geiser-completion)
+(require 'geiser-edit)
+
+(defun geiser-capf--company-docsig (id)
+  (ignore-errors
+(when (not (geiser-autodoc--inhibit))
+  (let ((help (geiser-autodoc--autodoc `((,id 0)) nil)))
+(and help (substring-no-properties help))
+
+(defun geiser-capf--company-doc-buffer (id)
+  (let* ((impl geiser-impl--implementation)
+ (module (geiser-eval--get-module))
+ (symbol (make-symbol id))
+ (ds (geiser-doc--get-docstring symbol module)))
+(when (consp ds)
+  (with-current-buffer (get-buffer-create "*company-documentation*")
+(geiser-doc--render-docstring ds symbol module impl)
+(current-buffer)
+
+(defun geiser-capf--company-location (id)
+  (ignore-errors
+(when (not (geiser-autodoc--inhibit))
+  (let ((id (make-symbol id)))
+(condition-case nil
+(geiser-edit-module id 'noselect)
+  (error (geiser-edit-symbol id 'noselect)))
+
+(defun geiser-capf--thing-at-point (module &optional predicate)
+  (with-syntax-table scheme-mode-syntax-table
+(let* ((beg (geiser-completion--symbol-begin module))
+   (end (or (geiser-completion--prefix-end beg module) beg))
+   (prefix (and (> end beg) (buffer-substring-no-properties beg end)))
+   (prefix (and prefix
+(if (string-match "\\([^-]+\\)-" prefix)
+(match-string 1 prefix)
+  prefix)))
+   (cmps (and prefix (geiser-completion--complete prefix module
+  (when cmps
+(list beg end cmps
+  :company-docsig #'geiser-capf--company-docsig
+  :company-doc-buffer #'geiser-capf--company-doc-buffer
+  :company-location #'geiser-capf--company-location)
+
+
+(defun geiser-capf--for-symbol (&optional predicate)
+  (geiser-capf--thing-at-point nil predicate))
+
+(defun geiser-capf--for-module (&optional predicate)
+  (geiser-capf--thing-at-point t predicate))
+
+(defun geiser-capf--for-filename ()
+  (when (geiser-syntax--in-string-p)
+(let ((comint-completion-addsuffix "\""))
+  (ignore-errors (comint-filename-completion)
+
+(defun geiser-capf-setup (enable)
+  (set (make-local-variable 'completion-at-point-functions)
+   (if enable
+   '(geiser-capf--for-symbol
+ geiser-capf--for-module
+ geiser-capf--for-filename)
+ (default-value 'completion-at-point-functions
+
+(defun geiser-capf-complete-module ()
+  "Complete module name at point."
+  (interactive)
+  (let ((completion-at-point-functions '(geiser-completion--for-module)))
+(call-interactively 'completion-at-point)))
+
+
+
+(provide 'geiser-capf)
+;;; geiser-capf.el ends here
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 7696ec5c8f..599e72ff0d 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -1,6 +1,6 @@
 ;;; geiser-completion.el -- tab completion
 
-;; Copyright (C) 2009, 2010, 2011, 2012, 2018, 2020, 2021 Jose Antonio 

[nongnu] elpa/geiser 18faa0ba32 1/2: Suggestive patch for simplified completion

[ELPA Syncer]

branch: elpa/geiser
commit 18faa0ba32c9ce751c16960b2a39b3880b523272
Author: Daniel Mendler 
Commit: jao 

Suggestive patch for simplified completion

NOTE: The patch is largely untested.

Modifications:

- Update readme.org
- Remove geiser-company
- Move Company extensions to geiser-completion

Omissions:

- geiser-company--inhibit-autodoc has been removed. Eldoc handling
  should be implemented in the frontend, not in the backend.
  See for example:
  
https://github.com/minad/corfu/blob/04fbfce3d7e9c125a7fd22a34455a508247a522b/corfu.el#L1212
- The quickhelp-string action and geiser-company--docstring have been
  removed. company-quickhelp can use `:company-doc-buffer` instead with
  minimal overhead.
  See:
  
https://github.com/company-mode/company-quickhelp/blob/3ca2708b4e5190205aca01d65fe1b391963a53f9/company-quickhelp.el#L138
- The automatic Company setup has been removed. Personally I am not a
  fan of such auto configuration. It is better if completion is
  configured consistently in the user configuration. You may want to
  restore the auto configuration for backward compatibility. It depends
  on your backward compatibility story. I am fine with rare breaking
  changes from time to time.
- There is a cyclic dependency between geiser-edit/geiser-doc and
  geiser-completion, which should be untangled.
---
 elisp/geiser-company.el| 148 -
 elisp/geiser-completion.el |  32 +-
 elisp/geiser-mode.el   |   7 ---
 elisp/geiser-reload.el |   1 -
 elisp/geiser-repl.el   |   6 --
 readme.org |  11 ++--
 6 files changed, 37 insertions(+), 168 deletions(-)

diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
deleted file mode 100644
index adc3654b6a..00
--- a/elisp/geiser-company.el
+++ /dev/null
@@ -1,148 +0,0 @@
-;;; geiser-company.el -- integration with company-mode
-
-;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2016 Jose Antonio Ortega 
Ruiz
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the Modified BSD License. You should
-;; have received a copy of the license along with this program. If
-;; not, see .
-
-;; Start date: Mon Aug 24, 2009 12:44
-
-
-;;; Code:
-
-(require 'geiser-autodoc)
-(require 'geiser-completion)
-(require 'geiser-edit)
-(require 'geiser-base)
-(require 'geiser-doc)
-
-(eval-when-compile (require 'cl-lib))
-
-
-;;; Helpers:
-
-(defvar-local geiser-company--enabled-flag nil)
-
-(defvar-local geiser-company--autodoc-flag nil)
-
-(defvar-local geiser-company--completions nil)
-
-(defun geiser-company--candidates (prefix)
-  (and (equal prefix (car geiser-company--completions))
-   (cdr geiser-company--completions)))
-
-(defun geiser-company--doc (id)
-  (ignore-errors
-(when (not (geiser-autodoc--inhibit))
-  (let ((help (geiser-autodoc--autodoc `((,id 0)) nil)))
-(and help (substring-no-properties help))
-
-(defun geiser-company--doc-buffer (id)
-  (let* ((impl geiser-impl--implementation)
- (module (geiser-eval--get-module))
- (symbol (make-symbol id))
- (ds (geiser-doc--get-docstring symbol module)))
-(if (or (not ds) (not (listp ds)))
-(progn
-  (message "No documentation available for '%s'" symbol)
-  nil)
-  (with-current-buffer (get-buffer-create "*company-documentation*")
-(geiser-doc--render-docstring ds symbol module impl)
-(current-buffer)
-
-(defun geiser-company--docstring (id)
-  (let* ((module (geiser-eval--get-module))
- (symbol (make-symbol id))
- (ds (geiser-doc--get-docstring symbol module)))
-(and ds
- (listp ds)
- (concat (geiser-autodoc--str* (cdr (assoc "signature" ds)))
- "\n\n"
- (cdr (assoc "docstring" ds))
-
-(defun geiser-company--location (id)
-  (ignore-errors
-(when (not (geiser-autodoc--inhibit))
-  (let ((id (make-symbol id)))
-(condition-case nil
-(geiser-edit-module id 'noselect)
-  (error (geiser-edit-symbol id 'noselect)))
-
-(defun geiser-company--prefix-at-point ()
-  (ignore-errors
-(when (and (not (geiser-autodoc--inhibit)) geiser-company--enabled-flag)
-  (if (nth 8 (syntax-ppss)) 'stop
-(let* ((prefix (and (looking-at-p "\\_>")
-(geiser-completion--prefix nil)))
-   (cmps1 (and prefix
-   (geiser-completion--complete prefix nil)))
-   (cmps2 (and prefix
-   (geiser-completion--complete prefix t)))
-   (mprefix (and (not cmps1) (not cmps2)
- (geiser-completion--prefix t)))
-   (cmps3 (and mprefix (geiser-completion--complete mprefix t)))
- 

[elpa] externals/cape 29130e3522: Fix quotation

[ELPA Syncer]

branch: externals/cape
commit 29130e35225fa8e5f5ecc86f2ad2425f7ec3c35d
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix quotation
---
 cape.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cape.el b/cape.el
index e3af53ddba..fe0376460e 100644
--- a/cape.el
+++ b/cape.el
@@ -74,7 +74,7 @@ If t, check all other buffers (subject to dabbrev ignore 
rules).
 Any other non-nil value only checks some other buffers, as per
 `dabbrev-select-buffers-function'."
   :type '(choice (const :tag "off" nil)
- (const :tag "some" 'some)
+ (const :tag "some" some)
  (other :tag "all" t)))
 
 (defcustom cape-file-directory-must-exist t

[elpa] externals/corfu updated (aeb6697d95 -> a37d7272a5)

[ELPA Syncer]

elpasync pushed a change to branch externals/corfu.

  from  aeb6697d95 Remove obsolete mode alias `corfu-global-mode`
   new  e94d9a24eb README: Update configuration
   new  a37d7272a5 README update


Summary of changes:
 README.org | 27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

[elpa] externals/corfu a37d7272a5 2/2: README update

[ELPA Syncer]

branch: externals/corfu
commit a37d7272a5fa45bcba106f5ba2fb8867f6153ec7
Author: Daniel Mendler 
Commit: Daniel Mendler 

README update
---
 README.org | 25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/README.org b/README.org
index 143d93412d..ac2f841283 100644
--- a/README.org
+++ b/README.org
@@ -96,15 +96,6 @@ Here is an example configuration:
 :init
 (global-corfu-mode))
 
-  ;; Use Dabbrev with Corfu!
-  (use-package dabbrev
-;; Swap M-/ and C-M-/
-:bind (("M-/" . dabbrev-completion)
-   ("C-M-/" . dabbrev-expand))
-;; Other useful Dabbrev configurations.
-:custom
-(dabbrev-ignored-buffer-regexps '("\\.\\(?:pdf\\|jpe?g\\|png\\)\\'")))
-
   ;; A few more useful configurations...
   (use-package emacs
 :init
@@ -121,6 +112,22 @@ Here is an example configuration:
 (setq tab-always-indent 'complete))
 #+end_src
 
+Dabbrev completion is based on =completion-in-region= and can be used with 
Corfu.
+You may want to swap the =dabbrev-completion= with the =dabbrev-expand= key for
+easier access, if you prefer completion. Also take a look at the =cape-dabbrev=
+completion at point function provided by my 
[[https://github.com/minad/cape][Cape]] package.
+
+#+begin_src emacs-lisp
+  ;; Use Dabbrev with Corfu!
+  (use-package dabbrev
+;; Swap M-/ and C-M-/
+:bind (("M-/" . dabbrev-completion)
+   ("C-M-/" . dabbrev-expand))
+;; Other useful Dabbrev configurations.
+:custom
+(dabbrev-ignored-buffer-regexps '("\\.\\(?:pdf\\|jpe?g\\|png\\)\\'")))
+#+end_src
+
 If you start to configure the package more deeply, I recommend to give the
 Orderless completion style a try for filtering. Orderless completion is
 different from the familiar prefix TAB completion. Corfu can be used with the

[elpa] externals/corfu e94d9a24eb 1/2: README: Update configuration

[ELPA Syncer]

branch: externals/corfu
commit e94d9a24eb463971376864da7ed1bc4faacb5dfc
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Update configuration
---
 README.org | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index 2ea5c13182..143d93412d 100644
--- a/README.org
+++ b/README.org
@@ -85,21 +85,25 @@ Here is an example configuration:
 ;; (corfu-echo-documentation nil) ;; Disable documentation in the echo area
 ;; (corfu-scroll-margin 5);; Use scroll margin
 
-;; You may want to enable Corfu only for certain modes.
+;; Enable Corfu only for certain modes.
 ;; :hook ((prog-mode . corfu-mode)
 ;;(shell-mode . corfu-mode)
 ;;(eshell-mode . corfu-mode))
 
 ;; Recommended: Enable Corfu globally.
-;; This is recommended since dabbrev can be used globally (M-/).
+;; This is recommended since Dabbrev can be used globally (M-/).
+;; See also `corfu-excluded-modes'.
 :init
 (global-corfu-mode))
 
-  ;; Use dabbrev with Corfu!
+  ;; Use Dabbrev with Corfu!
   (use-package dabbrev
 ;; Swap M-/ and C-M-/
 :bind (("M-/" . dabbrev-completion)
-   ("C-M-/" . dabbrev-expand)))
+   ("C-M-/" . dabbrev-expand))
+;; Other useful Dabbrev configurations.
+:custom
+(dabbrev-ignored-buffer-regexps '("\\.\\(?:pdf\\|jpe?g\\|png\\)\\'")))
 
   ;; A few more useful configurations...
   (use-package emacs

[elpa] externals/hyperbole 1039e84b61: Add hui-kill-ring-save tests (#192)

[ELPA Syncer]

branch: externals/hyperbole
commit 1039e84b61a81c0917f718e328918aab1b564afa
Author: Mats Lidell 
Commit: GitHub 

Add hui-kill-ring-save tests (#192)
---
 ChangeLog |  8 +
 test/hui-tests.el | 95 ++-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e89d730950..7e14052086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-26  Mats Lidell  
+
+* test/hui-tests.el (hui--kill-ring-save--yank-in-same-kotl)
+(hui--kill-ring-save--yank-in-other-kotl)
+(hui--kill-ring-save--yank-in-other-file)
+(hui--kill-ring-save--yank-in-other-file-other-dir): Add
+hui-kill-ring-save tests.
+
 2022-04-24  Bob Weiner  
 
 * hib-kbd.el (kbd-key:act): Fix to handle non-special key series that
diff --git a/test/hui-tests.el b/test/hui-tests.el
index 00335816b5..d9ef10edbd 100644
--- a/test/hui-tests.el
+++ b/test/hui-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:30-Jan-21 at 12:00:00
-;; Last-Mod: 24-Apr-22 at 19:00:26 by Mats Lidell
+;; Last-Mod: 25-Apr-22 at 23:50:46 by Mats Lidell
 ;;
 ;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -318,6 +318,99 @@ Ensure modifying the button but keeping the label does not 
create a double label
   (should (string-match kotl-file (car klink
   (delete-file kotl-file
 
+(ert-deftest hui--kill-ring-save--yank-in-same-kotl ()
+  "Yank saved klink into same kotl file."
+  (skip-unless (not noninteractive))
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl")))
+(unwind-protect
+(progn
+  (find-file kotl-file)
+  (klink:create "1")
+  (kotl-mode:beginning-of-cell)
+
+  (forward-char 1)
+  (call-interactively #'hui-kill-ring-save)
+
+  (kotl-mode:add-cell)
+  (yank)
+  (kotl-mode:beginning-of-cell)
+  (should (looking-at-p "<@ 1>"))
+  (forward-char 1)
+  (should (equal (hattr:get (hbut:at-p) 'actype) 'klink:act)))
+  (delete-file kotl-file
+
+(ert-deftest hui--kill-ring-save--yank-in-other-kotl ()
+  "Yank saved klink into other kotl file."
+  (skip-unless (not noninteractive))
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl"))
+(other-file (make-temp-file "hypb" nil ".kotl")))
+(unwind-protect
+(progn
+  (find-file kotl-file)
+  (klink:create "1")
+  (kotl-mode:beginning-of-cell)
+
+  (forward-char 1)
+  (call-interactively #'hui-kill-ring-save)
+
+  (find-file other-file)
+  (yank)
+  (kotl-mode:beginning-of-cell)
+  (should (looking-at-p (concat "<" (file-name-nondirectory kotl-file) 
", 1>")))
+  (forward-char 1)
+  (should (equal (hattr:get (hbut:at-p) 'actype) 'klink:act)))
+  (delete-file kotl-file)
+  (delete-file other-file
+
+(ert-deftest hui--kill-ring-save--yank-in-other-file ()
+  "Yank saved klink into other file."
+  (skip-unless (not noninteractive))
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl"))
+(other-file (make-temp-file "hypb" nil ".txt")))
+(unwind-protect
+(progn
+  (find-file kotl-file)
+  (klink:create "1")
+  (kotl-mode:beginning-of-cell)
+
+  (forward-char 1)
+  (call-interactively #'hui-kill-ring-save)
+
+  (find-file other-file)
+  (yank)
+  (beginning-of-buffer)
+  (should (looking-at-p (concat "<" (file-name-nondirectory kotl-file) 
", 1>")))
+  (forward-char 1)
+  (should (equal (hattr:get (hbut:at-p) 'actype) 'klink:act)))
+  (delete-file kotl-file)
+  (delete-file other-file
+
+(ert-deftest hui--kill-ring-save--yank-in-other-file-other-dir ()
+  "Yank saved klink into other file in other dir."
+  (skip-unless (not noninteractive))
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl"))
+(other-dir (make-temp-file "hypb" t))
+(other-file "other-file"))
+(unwind-protect
+(progn
+  (find-file kotl-file)
+  (klink:create "1")
+  (kotl-mode:beginning-of-cell)
+
+  (forward-char 1)
+  (call-interactively #'hui-kill-ring-save)
+
+  (find-file (concat (file-name-as-directory other-dir) other-file))
+  (yank)
+  (save-buffer 0)
+  (beginning-of-buffer)
+  (should (looking-at-p (concat "<" kotl-file ", 1>")))
+  (forward-char 1)
+  (should (equal (hattr:get (hbut:at-p) 'actype) 'klink:act)))
+  (delete-file kotl-file)
+  (delete-file other-file)
+  (delete-directory other-dir
+
 ;; This file can't be byte-compiled without `with-simulated-input' which
 ;; is not part of the actual dependencies, so:
 ;;   Local Variables:

[elpa] main 0ccd4781d7: * elpa-packages (dtache): Update URL

[Tassilo Horn]

branch: main
commit 0ccd4781d7a3a0c46f1e7a6b7ad1baff222ac25e
Author: Niklas Eklund 
Commit: Tassilo Horn 

* elpa-packages (dtache): Update URL
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index bd04950149..cc7a923a26 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -187,7 +187,7 @@
  ("dismal" :url nil)
  ("djvu"   :url nil)
  ("docbook":url nil)
- ("dtache" :url "https://gitlab.com/niklaseklund/dtache";
+ ("dtache" :url "https://git.sr.ht/~niklaseklund/dtache";
   :news "CHANGELOG.org"
   :readme "README.org"
   :auto-sync t)

[elpa] externals/embark 218ed96037: xref-find-references should ignore its target (fix #480)

[ELPA Syncer]

branch: externals/embark
commit 218ed96037bc09d859af3b365cc44e06dbf8b561
Author: Omar Antolín 
Commit: Omar Antolín 

xref-find-references should ignore its target (fix #480)
---
 embark.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/embark.el b/embark.el
index 95626be084..7bb38cba21 100644
--- a/embark.el
+++ b/embark.el
@@ -421,6 +421,7 @@ entry of `embark-target-injection-hooks' whose key is the 
action."
 (format-encode-region embark--ignore-target)
 (format-decode-region embark--ignore-target)
 (xref-find-definitions embark--ignore-target)
+(xref-find-references embark--ignore-target)
 (sort-regexp-fields embark--ignore-target)
 (align-regexp embark--ignore-target))
   "Alist associating commands with post-injection setup hooks.

[elpa] externals/embark-consult updated (19e0de0786 -> 218ed96037)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  19e0de0786 Rename embark-kill-ring-save to embark-copy-as-kill
  adds  218ed96037 xref-find-references should ignore its target (fix #480)

No new revisions were added by this update.

Summary of changes:
 embark.el | 1 +
 1 file changed, 1 insertion(+)

[nongnu] elpa/git-commit 61450cf56b: manual: Fix pasto

[ELPA Syncer]

branch: elpa/git-commit
commit 61450cf56bf5a63f354540f510569c26762cd1c0
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Fix pasto

Closes #4672.
---
 docs/magit.org  | 3 +--
 docs/magit.texi | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 9d72725cf1..ed7dfb8ed0 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -4778,7 +4778,6 @@ to setup the buffer, except for the key bindings.  All 
other setup
 happens in the function ~git-commit-setup~, which among other things runs
 the hook ~git-commit-setup-hook~.
 
-
 - User Option: git-commit-setup-hook ::
 
   Hook run at the end of ~git-commit-setup~.
@@ -4822,7 +4821,7 @@ The following functions are suitable for this hook:
 
   Show usage information in the echo area.
 
-- User Option: git-commit-setup-hook ::
+- User Option: git-commit-post-finish-hook ::
 
   Hook run after the user finished writing a commit message.
 
diff --git a/docs/magit.texi b/docs/magit.texi
index 62e516f59f..86dbf3e154 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -5938,7 +5938,6 @@ to setup the buffer, except for the key bindings.  All 
other setup
 happens in the function @code{git-commit-setup}, which among other things runs
 the hook @code{git-commit-setup-hook}.
 
-
 @defopt git-commit-setup-hook
 Hook run at the end of @code{git-commit-setup}.
 @end defopt
@@ -5982,7 +5981,7 @@ Hyperlink bug references in the buffer.
 Show usage information in the echo area.
 @end defun
 
-@defopt git-commit-setup-hook
+@defopt git-commit-post-finish-hook
 Hook run after the user finished writing a commit message.
 
 This hook is only run after pressing @code{C-c C-c} in a buffer used to

[nongnu] elpa/magit updated (b620f9d9d2 -> 61450cf56b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  b620f9d9d2 magit-emacs-Q-command: Add compat to load-path
  adds  61450cf56b manual: Fix pasto

No new revisions were added by this update.

Summary of changes:
 docs/magit.org  | 3 +--
 docs/magit.texi | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

[nongnu] elpa/magit-section updated (b620f9d9d2 -> 61450cf56b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  b620f9d9d2 magit-emacs-Q-command: Add compat to load-path
  adds  61450cf56b manual: Fix pasto

No new revisions were added by this update.

Summary of changes:
 docs/magit.org  | 3 +--
 docs/magit.texi | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

[elpa] externals/embark 70f720f914: Fix crazy bug: revert of an xref export buffer erased another buffer

[ELPA Syncer]

branch: externals/embark
commit 70f720f914b78bd11f84b0790df5f125945dd50f
Author: Omar Antolín 
Commit: Omar Antolín 

Fix crazy bug: revert of an xref export buffer erased another buffer

Thanks to @slayer152 for reporting this over on minad/consult#557.
---
 embark-consult.el | 34 +++---
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/embark-consult.el b/embark-consult.el
index 171081314c..46386f3667 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -226,21 +226,25 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
   (set-buffer
(xref--show-xref-buffer
 (lambda ()
-  (catch 'xref-items
-(minibuffer-with-setup-hook
-(lambda ()
-  (insert input)
-  (add-hook 'minibuffer-exit-hook
-(lambda ()
-  (throw 'xref-items
-(xref-items
- (or
-  (plist-get
-   (embark--maybe-transform-candidates)
-   :candidates)
-  (user-error "No candidates for export")
-nil t))
-  (consult-xref fetcher
+  (let ((candidates (funcall fetcher)))
+(if (null (cdr candidates))
+candidates
+  (catch 'xref-items
+(minibuffer-with-setup-hook
+(lambda ()
+  (insert input)
+  (add-hook
+   'minibuffer-exit-hook
+   (lambda ()
+ (throw 'xref-items
+   (xref-items
+(or
+ (plist-get
+  (embark--maybe-transform-candidates)
+  :candidates)
+ (user-error "No candidates for export")
+   nil t))
+  (consult-xref fetcher))
 `((fetched-xrefs . ,(xref-items items))
   (window . ,(embark--target-window))
   (auto-jump . ,xref-auto-jump-to-first-xref)

[elpa] externals/embark-consult updated (218ed96037 -> 70f720f914)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  218ed96037 xref-find-references should ignore its target (fix #480)
  adds  70f720f914 Fix crazy bug: revert of an xref export buffer erased 
another buffer

No new revisions were added by this update.

Summary of changes:
 embark-consult.el | 34 +++---
 1 file changed, 19 insertions(+), 15 deletions(-)

[elpa] main 6b4db7ab08: * elpa-packages (fontaine): New package

[Protesilaos Stavrou]

branch: main
commit 6b4db7ab0838889f9d26faa726bdfe56ed2f7af2
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

* elpa-packages (fontaine): New package
---
 elpa-packages | 4 
 1 file changed, 4 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index cc7a923a26..9c9f35267d 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -285,6 +285,10 @@
  ("flymake":core "lisp/progmodes/flymake.el")
  ("flymake-proselint"  :url 
"https://git.sr.ht/~manuel-uberti/flycheck-proselint";
   :auto-sync t)
+ ("fontaine"
+  :url "https://git.sr.ht/~protesilaos/fontaine";
+  :auto-sync t
+  :ignored-files ("COPYING" "doclicense.texi"))
  ("frame-tabs" :url nil)
  ("frog-menu"  :url "https://github.com/clemera/frog-menu";)
  ("fsm":url nil)

[elpa] externals/consult dcedf0e6b9 1/3: consult-mark: Copy mark-marker to avoid side effect from push-mark (Fix #562)

[ELPA Syncer]

branch: externals/consult
commit dcedf0e6b965d742d68ad6601482a69263dc33d3
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult-mark: Copy mark-marker to avoid side effect from push-mark (Fix 
#562)

push-mark is executed in consult--jump
---
 consult.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consult.el b/consult.el
index fb1d961f90..cc23562b71 100644
--- a/consult.el
+++ b/consult.el
@@ -2918,7 +2918,7 @@ The symbol at point is added to the future history."
   (consult--read
(consult--with-increased-gc
 (consult--mark-candidates
- (or markers (cons (mark-marker) mark-ring
+ (or markers (cons (copy-marker (mark-marker)) mark-ring
:prompt "Go to mark: "
:annotate (consult--line-prefix)
:category 'consult-location

[elpa] externals/consult e168d92d20 2/3: Revert "consult-mark: Copy mark-marker to avoid side effect from push-mark (Fix #562)"

[ELPA Syncer]

branch: externals/consult
commit e168d92d201cbde571e47420f46372f08233079c
Author: Daniel Mendler 
Commit: Daniel Mendler 

Revert "consult-mark: Copy mark-marker to avoid side effect from push-mark 
(Fix #562)"

This reverts commit dcedf0e6b965d742d68ad6601482a69263dc33d3.
---
 consult.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consult.el b/consult.el
index cc23562b71..fb1d961f90 100644
--- a/consult.el
+++ b/consult.el
@@ -2918,7 +2918,7 @@ The symbol at point is added to the future history."
   (consult--read
(consult--with-increased-gc
 (consult--mark-candidates
- (or markers (cons (copy-marker (mark-marker)) mark-ring
+ (or markers (cons (mark-marker) mark-ring
:prompt "Go to mark: "
:annotate (consult--line-prefix)
:category 'consult-location

[elpa] externals/consult updated (ed44a20c23 -> 8c6c63b613)

[ELPA Syncer]

elpasync pushed a change to branch externals/consult.

  from  ed44a20c23 README: Add link to consult-ag
   new  dcedf0e6b9 consult-mark: Copy mark-marker to avoid side effect from 
push-mark (Fix #562)
   new  e168d92d20 Revert "consult-mark: Copy mark-marker to avoid side 
effect from push-mark (Fix #562)"
   new  8c6c63b613 consult--jump: Always copy marker before push-mark to be 
safe (See #562)


Summary of changes:
 consult.el | 3 +++
 1 file changed, 3 insertions(+)

[elpa] branch externals/fontaine created (now f4e59c0493)

[ELPA Syncer]

elpasync pushed a change to branch externals/fontaine.

at  f4e59c0493 Prepare release of version 0.1.0

This branch includes the following new commits:

   new  7896f2cdf5 Set up fontaine
   new  cbbc9be7ea Suggest more appropriate key binding
   new  545243f8bd Add Elisp for store/restore state
   new  6b5862891a Update documentation and sample configuration
   new  f4e59c0493 Prepare release of version 0.1.0

[elpa] externals/fontaine cbbc9be7ea 2/5: Suggest more appropriate key binding

[ELPA Syncer]

branch: externals/fontaine
commit cbbc9be7ea6602baa777353e69257cfc3a974d49
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Suggest more appropriate key binding
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index a54ec929c1..71b826bf38 100644
--- a/README.org
+++ b/README.org
@@ -225,7 +225,7 @@ Remember to read the relevant doc strings.
 ;; respects the key binding conventions.  Evaluate:
 ;;
 ;; (info "(elisp) Key Binding Conventions")
-(define-key global-map (kbd "C-c p") #'fontaine-set-preset)
+(define-key global-map (kbd "C-c f") #'fontaine-set-preset)
 #+end_src
 
 * GNU Free Documentation License

[elpa] externals/fontaine 7896f2cdf5 1/5: Set up fontaine

[ELPA Syncer]

branch: externals/fontaine
commit 7896f2cdf5b2b71c718a580eec44677a0da48234
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Set up fontaine
---
 .gitignore  |   5 +
 CHANGELOG.org   |  19 ++
 COPYING | 674 
 README.org  | 720 
 doclicense.texi | 505 +++
 fontaine.el | 480 +
 6 files changed, 2403 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..1736143963
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.elc
+*-autoloads.el
+*-pkg.el
+fontaine.info
+fontaine.texi
diff --git a/CHANGELOG.org b/CHANGELOG.org
new file mode 100644
index 00..12164fde27
--- /dev/null
+++ b/CHANGELOG.org
@@ -0,0 +1,19 @@
+#+TITLE: Change log of fontaine.el
+#+AUTHOR: Protesilaos Stavrou
+#+EMAIL: i...@protesilaos.com
+#+OPTIONS: ':nil toc:nil num:nil author:nil email:nil
+
+This document contains the release notes for each tagged commit on the
+project's main git repository: .
+
+The newest release is at the top.  For further details, please consult
+the manual: .
+
+* Version 0.1.0 on 2022-04-26
+
+Initial release of the package.  Please read the manual.
+
+The core idea for this package was implemented in the =prot-fonts.el=
+file that is part of [[https://gitlab.com/protesilaos/dotfiles][my dotfiles]] 
(now deprecated).  I was using it at
+least since November 2020, though the underlying code was probably
+implemented at an earlier date.
diff --git a/COPYING b/COPYING
new file mode 100644
index 00..89d9142746
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.

[elpa] externals/fontaine 6b5862891a 4/5: Update documentation and sample configuration

[ELPA Syncer]

branch: externals/fontaine
commit 6b5862891aba9dccddf315c90c1a5a72a0875cd3
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Update documentation and sample configuration
---
 README.org  | 29 +++--
 fontaine.el | 22 +++---
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index 71b826bf38..9146c42610 100644
--- a/README.org
+++ b/README.org
@@ -122,8 +122,18 @@ command is for interactive use only and is supposed to be 
used for
 previewing certain styles before eventually codifying them as presets.
 
 Changing the ~bold~ and ~italic~ faces only has a noticeable effect if
-the underlying does not hardcode a weight and slant but inherits from
-those faces instead (e.g. the ~modus-themes~).
+the underlying theme does not hardcode a weight and slant but inherits
+from those faces instead (e.g. the ~modus-themes~).
+
+#+vindex: fontaine-latest-state-file
+#+findex: fontaine-store-latest-preset
+#+findex: fontaine-restore-latest-preset
+The latest value of ~fontaine-set-preset~ is stored in a file whose
+location is defined in ~fontaine-latest-state-file~.  Saving is done by
+the ~fontaine-store-latest-preset~ function, which should be assigned to
+a hook (e.g. ~kill-emacs-hook~).  To restore that value, the user can
+call the function ~fontaine-restore-latest-preset~ (such as by adding it
+to their init file).
 
 As for the name of this package, it is the French word for "fountain"
 which, in turn, is what the font or source is.  However, I will not
@@ -189,6 +199,9 @@ Remember to read the relevant doc strings.
 #+begin_src emacs-lisp
 (require 'fontaine)
 
+(setq fontaine-latest-state-file
+  (locate-user-emacs-file "fontaine-latest-state.eld"))
+
 (setq fontaine-presets
   '((regular
  :default-family "Hack"
@@ -221,11 +234,23 @@ Remember to read the relevant doc strings.
  :italic-slant italic
  :line-spacing 1)))
 
+(fontaine-restore-latest-preset)
+
+;; Use `fontaine-recovered-preset' if available, else fall back to the
+;; desired style from `fontaine-presets'.
+(if-let ((state fontaine-recovered-preset))
+(fontaine-set-preset state)
+  (fontaine-set-preset 'regular))
+
+;; The other side of `fontaine-restore-latest-preset'.
+(add-hook 'kill-emacs-hook #'fontaine-store-latest-preset)
+
 ;; fontaine does not define any key bindings.  This is just a sample that
 ;; respects the key binding conventions.  Evaluate:
 ;;
 ;; (info "(elisp) Key Binding Conventions")
 (define-key global-map (kbd "C-c f") #'fontaine-set-preset)
+(define-key global-map (kbd "C-c F") #'fontaine-set-face-font)
 #+end_src
 
 * GNU Free Documentation License
diff --git a/fontaine.el b/fontaine.el
index 172e8314e8..695a300823 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -72,6 +72,17 @@
 ;; command is for interactive use only and is supposed to be used for
 ;; previewing certain styles before eventually codifying them as presets.
 ;;
+;; Changing the `bold' and `italic' faces only has a noticeable effect if
+;; the underlying theme does not hardcode a weight and slant but inherits
+;; from those faces instead (e.g. the `modus-themes').
+;;
+;; The latest value of `fontaine-set-preset' is stored in a file whose
+;; location is defined in `fontaine-latest-state-file'.  Saving is done by
+;; the `fontaine-store-latest-preset' function, which should be assigned to
+;; a hook (e.g. `kill-emacs-hook').  To restore that value, the user can
+;; call the function `fontaine-restore-latest-preset' (such as by adding it
+;; to their init file).
+;;
 ;; As for the name of this package, it is the French word for "fountain"
 ;; which, in turn, is what the font or source is.  However, I will not
 ;; blame you if you can only interpret it as a descriptive acronym: FONTs
@@ -224,8 +235,12 @@ Use the desired preset with the command 
`fontaine-set-preset'."
 
 (defcustom fontaine-latest-state-file
   (locate-user-emacs-file "fontaine-latest-state.eld")
-  "File to save the value of `fontaine-set-preset'.
-Saving is done by the `fontaine-store-latest-preset' function."
+  "File to save the latest value of `fontaine-set-preset'.
+Saving is done by the `fontaine-store-latest-preset' function,
+which should be assigned to a hook (e.g. `kill-emacs-hook').
+
+This is then used to restore the last value with the function
+`fontaine-restore-latest-preset'."
   :type 'file
   :group 'fontaine)
 
@@ -506,7 +521,8 @@ Can be assigned to `kill-emacs-hook'."
 
 ;;;###autoload
 (defun fontaine-restore-latest-preset ()
-  "Restore latest preset set by `fontaine-set-preset'."
+  "Restore latest preset set by `fontaine-set-preset'.
+The value is stored in `fontaine-latest-state-file'."
   (when-let* ((file fontaine-latest-state-file)
   ((file-exists-p file)))
 (setq fontaine-recovered-preset

[elpa] externals/fontaine f4e59c0493 5/5: Prepare release of version 0.1.0

[ELPA Syncer]

branch: externals/fontaine
commit f4e59c0493e01c2a1b371828c4d93666dd8dcb09
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Prepare release of version 0.1.0

The package on GNU ELPA will be available shortly.
---
 CHANGELOG.org | 2 +-
 README.org| 4 ++--
 fontaine.el   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 12164fde27..742a23b0d8 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -9,7 +9,7 @@ project's main git repository: 
.
 The newest release is at the top.  For further details, please consult
 the manual: .
 
-* Version 0.1.0 on 2022-04-26
+* Version 0.1.0 on 2022-04-28
 
 Initial release of the package.  Please read the manual.
 
diff --git a/README.org b/README.org
index 9146c42610..df5c5f2438 100644
--- a/README.org
+++ b/README.org
@@ -6,7 +6,7 @@
 #+startup: content
 
 #+macro: stable-version 0.1.0
-#+macro: release-date 2022-04-26
+#+macro: release-date 2022-04-28
 #+macro: development-version 0.2.0-dev
 #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@
 #+macro: space @@texinfo:@: @@
@@ -146,7 +146,7 @@ Are Irrelevant in Non-graphical Emacs (because that is 
actually true).
 :END:
 #+cindex: Installation instructions
 
-** COMMENT GNU ELPA package
+** GNU ELPA package
 :PROPERTIES:
 :CUSTOM_ID: h:0f288b38-6da1-4628-8f78-4df56cbc8f2a
 :END:
diff --git a/fontaine.el b/fontaine.el
index 695a300823..6d2a26f203 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -533,6 +533,5 @@ The value is stored in `fontaine-latest-state-file'."
   (insert-file-contents file)
   (read (current-buffer)))
 
-
 (provide 'fontaine)
 ;;; fontaine.el ends here

[elpa] externals/consult 8c6c63b613 3/3: consult--jump: Always copy marker before push-mark to be safe (See #562)

[ELPA Syncer]

branch: externals/consult
commit 8c6c63b613e5cd22f95a4e1839a9ae01caa4499f
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult--jump: Always copy marker before push-mark to be safe (See #562)
---
 consult.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/consult.el b/consult.el
index fb1d961f90..f164bc0e74 100644
--- a/consult.el
+++ b/consult.el
@@ -1283,6 +1283,9 @@ See `isearch-open-necessary-overlays' and 
`isearch-open-overlay-temporary'."
 ;; When the marker is in the same buffer,
 ;; record previous location such that the user can jump back quickly.
 (unless (and (markerp pos) (not (eq (current-buffer) (marker-buffer pos
+  ;; push-mark mutates markers in the mark-ring and the mark-marker.
+  ;; Therefore we copy the marker to be safe. We all love side effects!
+  (setq pos (copy-marker pos))
   (push-mark (point) t))
 (consult--jump-1 pos)
 (consult--invisible-open-permanently)

[elpa] externals/fontaine 545243f8bd 3/5: Add Elisp for store/restore state

[ELPA Syncer]

branch: externals/fontaine
commit 545243f8bdfd8376c0e85c8f780390a3e95fbe13
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add Elisp for store/restore state
---
 fontaine.el | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/fontaine.el b/fontaine.el
index 95c4485673..172e8314e8 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -222,6 +222,13 @@ Use the desired preset with the command 
`fontaine-set-preset'."
   ((const :tag "Line spacing" :line-spacing) ,(get 
'line-spacing 'custom-type
   :key-type symbol))
 
+(defcustom fontaine-latest-state-file
+  (locate-user-emacs-file "fontaine-latest-state.eld")
+  "File to save the value of `fontaine-set-preset'.
+Saving is done by the `fontaine-store-latest-preset' function."
+  :type 'file
+  :group 'fontaine)
+
  General utilities
 
 (defun fontaine--set-face-attributes (face family &optional weight height)
@@ -340,6 +347,7 @@ outright, else prompt with completion."
 (fontaine--apply-bold-preset preset)
 (fontaine--apply-italic-preset preset)
 (setq fontaine--current-preset preset)
+(add-to-history 'fontaine--preset-history (format "%s" preset))
 (run-hooks 'fontaine-set-preset-hook)))
 
  Modify individual faces
@@ -475,6 +483,40 @@ inherits from those faces instead (e.g. the 
`modus-themes')."
 ('variable-pitch (fontaine--set-variable-pitch))
 (_ (call-interactively #'fontaine-set-preset
 
+ Store and restore preset
+
+(defvar fontaine--preset-history '()
+  "Minibuffer history of preset configurations.")
+
+;;;###autoload
+(defun fontaine-store-latest-preset ()
+  "Write latest cursor state to `fontaine-latest-state-file'.
+Can be assigned to `kill-emacs-hook'."
+  (when-let ((hist fontaine--preset-history))
+(with-temp-file fontaine-latest-state-file
+  (insert ";; Auto-generated file; don't edit -*- mode: "
+  (if (<= 28 emacs-major-version)
+  "lisp-data"
+"emacs-lisp")
+  " -*-\n")
+  (pp (intern (car hist)) (current-buffer)
+
+(defvar fontaine-recovered-preset nil
+  "Recovered value of latest store cursor preset.")
+
+;;;###autoload
+(defun fontaine-restore-latest-preset ()
+  "Restore latest preset set by `fontaine-set-preset'."
+  (when-let* ((file fontaine-latest-state-file)
+  ((file-exists-p file)))
+(setq fontaine-recovered-preset
+  (unless (zerop
+   (or (file-attribute-size (file-attributes file))
+   0))
+(with-temp-buffer
+  (insert-file-contents file)
+  (read (current-buffer)))
+
 
 (provide 'fontaine)
 ;;; fontaine.el ends here