[elpa] externals/eev updated (81c4615 -> 8ff3afb)

[ELPA Syncer]

elpasync pushed a change to branch externals/eev.

  from  81c4615   Rewrote (find-eev-exercises-intro).
   new  3306431   Several new sections in (find-eev-exercises-intro).
   new  8ff3afb   Bumped the version of eev.el.


Summary of changes:
 ChangeLog   |  14 ++
 VERSION |   4 +-
 eev-compose-hash.el |   2 +-
 eev-intro.el| 387 
 eev-tlinks.el   |  29 +++-
 eev-videolinks.el   | 149 +++-
 eev.el  |   2 +-
 7 files changed, 456 insertions(+), 131 deletions(-)

[elpa] externals/eev 3306431 1/2: Several new sections in (find-eev-exercises-intro).

[ELPA Syncer]

branch: externals/eev
commit 3306431c6ceff08d8db708a2f6614be7ab472b3a
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Several new sections in (find-eev-exercises-intro).
---
 ChangeLog   |  14 ++
 VERSION |   4 +-
 eev-compose-hash.el |   2 +-
 eev-intro.el| 387 
 eev-tlinks.el   |  29 +++-
 eev-videolinks.el   | 149 +++-
 6 files changed, 455 insertions(+), 130 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 63e6bee..5ca2804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
+2021-12-04  Eduardo Ochs  
+
+   * eev-videolinks.el (find-2021workshop4video)
+   (find-2021workshop5video, find-2021workshop6video): new functions.
+
+   * eev-intro.el (find-eev-exercises-intro): several new sections.
+
+2021-12-03  Eduardo Ochs  
+
+   * eev-videolinks.el (find-2021workshop2video)
+   (find-2021workshop3video): new functions.
+
 2021-12-01  Eduardo Ochs  
 
+   * eev-videolinks.el (find-2021workshop1video): new function.
+
* eev-intro.el (find-eev-exercises-intro): rewritten.
 
 2021-11-28  Eduardo Ochs  
diff --git a/VERSION b/VERSION
index fc366eb..ca2a1ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Wed Dec  1 06:27:08 GMT 2021
-Wed Dec  1 03:27:08 -03 2021
+Sat Dec  4 09:26:21 GMT 2021
+Sat Dec  4 06:26:21 -03 2021
diff --git a/eev-compose-hash.el b/eev-compose-hash.el
index 08f27df..567e5f4 100644
--- a/eev-compose-hash.el
+++ b/eev-compose-hash.el
@@ -438,7 +438,7 @@ instead of inserting."
   ⇐ <= \\Leftarrow
   ⇒ => \\funto
   ⇔ LR \\Leftrightarrow
-  ⇝ s> \\squigglyarrow
+  ⇝ s> \\rightsquigarrow
   ∀ fa \\forall
   ∂ Pa \\partial
   ∃ ex \\exists
diff --git a/eev-intro.el b/eev-intro.el
index 2f173c4..d7d3e54 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20211130
+;; Version:20211204
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -10463,8 +10463,9 @@ They contain links like these,
 that are \"short links to eev video tutorials\". These functions
 with names like `find-eev*video' are _sort of_ expanded to
 functions that specify explicitly which video on youtube to play,
-or where is the file with the local copy of that video. For the
-general idea of how this expansion is implemented, see:
+and where the local copy of the video can be found if we prefer
+to play the local copy. For the general idea of how this
+expansion is implemented, see:
 
   (find-eev-quick-intro \"9. Shorter hyperlinks\")
   (find-eev-quick-intro \"9.1. `code-c-d'\")
@@ -13303,10 +13304,16 @@ this:
 \(Re)generate: (find-eev-exercises-intro)
 Source code:  (find-efunction 'find-eev-exercises-intro)
 More intros:  (find-eev-quick-intro)
+  (find-here-links-intro)
+  (find-refining-intro)
+  (find-escripts-intro)
   (find-eev-intro)
   (find-eepitch-intro)
 This buffer is _temporary_ and _editable_.
 It is meant as both a tutorial and a sandbox.
+The quickest way to open or recreate this is with `M-x ex',
+but you will need to run this:
+  (defun ex () (interactive) (find-eev-exercises-intro))
 
 
 
@@ -13400,18 +13407,28 @@ I will suppose:
  (find-refining-intro)
  (find-refining-intro \"1. Pos-spec-lists\")
 
-
-..and just that. The previous workshop that I gave required
-installing external programs, but this one will not be like that.
-For more info on that previous workshop, see:
+The prerequisites are just the ones above. The previous workshop
+that I gave required installing external programs, but this one
+will not be like that. For more info on that previous workshop,
+see:
 
   http://angg.twu.net/2021-workshop.html#november
 
 
 
 
+
 1. The base cases
 =
+Watch this video first:
+
+  [Video links:]
+(find-2021workshop1video \"0:22\" \"The base case 1 is described here\")
+(find-2021workshop1video \"0:52\"   \"The instructions are here\")
+(find-2021workshop1video \"1:24\" \"The base case 2\")
+(find-2021workshop1video \"1:39\"   \"What I need to do is slightly\")
+(find-2021workshop1video \"1:55\"   \"This is not yet the link that I 
want\")
+
 
 1.1. The base case 1
 
@@ -13459,6 +13476,11 @@ or:
 
   create / select / copy / go back
 
+[Video links:]
+  (find-2021workshop1video \"0:22\" \"The base case 1 is described here\")
+  (find-2021workshop1video \"0:52\" \"The instructions are here\")
+
+
 
 
 
@@ -13492,11 +13514,11 @@ The diagram will be this one,
 
___   _   ___

[elpa] externals/eev 8ff3afb 2/2: Bumped the version of eev.el.

[ELPA Syncer]

branch: externals/eev
commit 8ff3afb7fe3c1d0d2450009ea39d72da535ef81d
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Bumped the version of eev.el.
---
 VERSION | 4 ++--
 eev.el  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index ca2a1ee..b48b623 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sat Dec  4 09:26:21 GMT 2021
-Sat Dec  4 06:26:21 -03 2021
+Sat Dec  4 09:29:29 GMT 2021
+Sat Dec  4 06:29:29 -03 2021
diff --git a/eev.el b/eev.el
index 0c4f43c..7ff9b52 100644
--- a/eev.el
+++ b/eev.el
@@ -6,7 +6,7 @@
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: lisp e-scripts
 ;; URL: http://angg.twu.net/#eev
-;; Version: 20211201
+;; Version: 20211204
 
 ;; 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

[elpa] externals/pyim updated (e9fd048 -> 41de729)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  e9fd048   * pyim-preview.el (pyim-preview-delete-string): if -> 
when.
   new  080e43c   * pyim-candidates.el (pyim-candidates-create:quanpin): 
删除输入 ni-hao, 搜索 n-h 的功能。
   new  41de729   添加 pyim-candidates-merge 简化 
pyim-candidates-create:quanpin.


Summary of changes:
 pyim-candidates.el | 116 +
 1 file changed, 45 insertions(+), 71 deletions(-)

[elpa] externals/pyim 080e43c 1/2: * pyim-candidates.el (pyim-candidates-create:quanpin): 删除输入 ni-hao, 搜索 n-h 的功能。

[ELPA Syncer]

branch: externals/pyim
commit 080e43caf2c8ed19f4fc40cc383abccf14d303fe
Author: Feng Shu 
Commit: Feng Shu 

* pyim-candidates.el (pyim-candidates-create:quanpin): 删除输入 ni-hao, 搜索 n-h 
的功能。
---
 pyim-candidates.el | 21 ++---
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index 8b54bc0..cb189f4 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -91,23 +91,8 @@ IMOBJS 获得候选词条。"
 (defun pyim-candidates-create:quanpin (imobjs scheme-name &optional async)
   "`pyim-candidates-create' 处理全拼输入法的函数."
   (unless async
-(let* (;; 如果输入 "ni-hao" ，搜索 code 为 "n-h" 的词条做为联想词。
-   ;; 搜索首字母得到的联想词太多，这里限制联想词要大于两个汉字并且只搜索
-   ;; 个人文件。
-   (jianpin-words
-(when (and (> (length (car imobjs)) 1) pyim-enable-shortcode)
-  (pyim-dcache-get
-   (mapconcat #'identity
-  (pyim-codes-create (car imobjs) scheme-name 1)
-  "-")
-   '(ishortcode2word
-   znabc-words
-   pinyin-chars
-   personal-words
-   common-words)
-
-  ;; 智能ABC模式，得到尽可能的拼音组合，查询这些组合，得到的词条做
-  ;; 为联想词。
+(let (znabc-words pinyin-chars personal-words common-words)
+  ;; 智能ABC模式，得到尽可能的拼音组合，查询这些组合，得到的词条做为联想词。
   (let* ((codes (pyim-codes-create (car imobjs) scheme-name))
  (n (- (length codes) 1))
  output)
@@ -179,7 +164,6 @@ IMOBJS 获得候选词条。"
 (princ (list :imobjs imobjs
  :personal-words personal-words
  :common-words common-words
- :jianpin-words jianpin-words
  :znabc-words znabc-words
  :pinyin-chars pinyin-chars)))
 
@@ -187,7 +171,6 @@ IMOBJS 获得候选词条。"
(delq nil
  `(,@personal-words
,@common-words
-   ,@jianpin-words
,@znabc-words
,@pinyin-chars))
 

[elpa] externals/pyim 41de729 2/2: 添加 pyim-candidates-merge 简化 pyim-candidates-create:quanpin.

[ELPA Syncer]

branch: externals/pyim
commit 41de7297766f1d397d478ec5268aa57a45cb243b
Author: Feng Shu 
Commit: Feng Shu 

添加 pyim-candidates-merge 简化 pyim-candidates-create:quanpin.

* pyim-candidates.el (pyim-candidates-merge): New function.
(pyim-candidates-create:quanpin): Use pyim-candidates-merge.
---
 pyim-candidates.el | 95 --
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index cb189f4..a57c1f5 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -103,57 +103,37 @@ IMOBJS 获得候选词条。"
   (setq znabc-words (append znabc-words (pyim-dcache-get code)
 
   (dolist (imobj imobjs)
-(setq personal-words
-  (append personal-words
-  (pyim-dcache-get
-   (mapconcat #'identity
-  (pyim-codes-create imobj scheme-name)
-  "-")
-   (if pyim-enable-shortcode
-   '(icode2word ishortcode2word)
- '(icode2word)
-
-(setq common-words (delete-dups common-words))
-(setq common-words
-  (let* ((cands (pyim-dcache-get
- (mapconcat #'identity
-(pyim-codes-create imobj scheme-name)
-"-")
- (if pyim-enable-shortcode
- '(code2word shortcode2word)
-   '(code2word)
-(cond
- ((and (> (length cands) 0)
-   (> (length common-words) 0)
-   (or (eq 1 (length imobj))
-   (eq 2 (length imobj
-  ;; 两个单字或者两字词序列合并,确保常用字词在前面
-  (let* ((size (min (length cands) (length common-words)))
- new-common-words
- (i 0))
-;; 两个序列轮流取出一个元素输入新序列
-(while (< i size)
-  (push (nth i common-words) new-common-words)
-  (push (nth i cands) new-common-words)
-  (setq i (1+ i)))
-;; 较长序列的剩余元素加入新序列
-(append (nreverse new-common-words)
-(nthcdr size (cond
-  ((< size (length cands))
-   cands)
-  ((< size (length common-words))
-   common-words))
- (t
-  (append common-words cands)
-
-(setq pinyin-chars
-  (append pinyin-chars
-  (pyim-dcache-get
-   (car (pyim-codes-create imobj scheme-name))
-
-  ;; 使用词频信息，对个人词库得到的候选词排序，
-  ;; 第一个词的位置比较特殊，不参与排序，
-  ;; 具体原因请参考 `pyim-page-select-word' 中的 comment.
+(let ((w (pyim-dcache-get
+  (mapconcat #'identity
+ (pyim-codes-create imobj scheme-name)
+ "-")
+  (if pyim-enable-shortcode
+  '(icode2word ishortcode2word)
+'(icode2word)
+  (setq personal-words (append personal-words w)))
+
+(let ((w1 (delete-dups common-words))
+  (w2 (pyim-dcache-get
+   (mapconcat #'identity
+  (pyim-codes-create imobj scheme-name)
+  "-")
+   (if pyim-enable-shortcode
+   '(code2word shortcode2word)
+ '(code2word)
+  (if (and (> (length w1) 0)
+   (> (length w2) 0)
+   (or (eq 1 (length imobj))
+   (eq 2 (length imobj
+  ;; 两个单字或者两字词序列合并, 确保常用字词在前面。
+  (setq common-words (pyim-candidates-merge w1 w2))
+(setq common-words (append w1 w2
+
+(let ((w (pyim-dcache-get
+  (car (pyim-codes-create imobj scheme-name)
+  (setq pinyin-chars (append pinyin-chars w
+
+  ;; 使用词频信息对个人词库得到的候选词排序，第一个词条的位置比较特殊，不参
+  ;; 与排序，具体原因请参考 `pyim-page-select-word' 中的 comment.
   (setq personal-words
 `(,(car personal-words)
   ,@(pyim-dcache-call-api
@@ -161,7 +141,7 @@ IMOBJS 获得候选词条。"
 
   ;; Debug
   (when pyim-debug
-(princ (list :imobjs imobjs
+(print (list :imobjs imobjs
  :personal-words personal-words
  :common-words common-words
  :znabc-words znabc-words
@@ -174,6 +154,17 @@ IMOBJS 获得候选词条。"
,@znabc-words
,@pinyin-chars))
 
+(defun pyim-candidates-merge (list1 list2)
+  "将 LIST1 和 LIST2 合并。
+
+如果 list1 = (a b

[elpa] externals/org-transclusion updated (f89363c -> 799ea67)

[ELPA Syncer]

elpasync pushed a change to branch externals/org-transclusion.

  from  f89363c   doc:readme: update Non-Org files for src-lines ext
   new  2a7a2c8   intrnl: copyright assignment to FSF
   new  cc578d8   docs: edit program header; prep for ELPA
   new  617c4d8   renaming the test el file
   new  744e151   intrnl: flymake
   new  b231114   intrnl: defcustom
   new  799ea67   intrnl: defvar `org-indent-mode`


Summary of changes:
 ...{test-text-clone.el => test-text-clone.el.test} |  0
 org-transclusion-font-lock.el  | 19 +++
 org-transclusion-indent-mode.el| 20 +++
 org-transclusion-src-lines.el  | 19 +++
 org-transclusion.el| 39 ++
 text-clone.el  | 22 ++--
 6 files changed, 87 insertions(+), 32 deletions(-)
 rename docs/test-clone/{test-text-clone.el => test-text-clone.el.test} (100%)

[elpa] externals/org-transclusion cc578d8 2/6: docs: edit program header; prep for ELPA

[ELPA Syncer]

branch: externals/org-transclusion
commit cc578d85b6ca30fefaacaf16f92c99ce43a3b932
Author: Noboru Ota 
Commit: Noboru Ota 

docs: edit program header; prep for ELPA
---
 org-transclusion-font-lock.el   |  3 ++-
 org-transclusion-indent-mode.el |  4 +++-
 org-transclusion-src-lines.el   |  3 ++-
 org-transclusion.el | 14 +++---
 text-clone.el   | 12 ++--
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/org-transclusion-font-lock.el b/org-transclusion-font-lock.el
index 3f82fb4..2e9d65d 100644
--- a/org-transclusion-font-lock.el
+++ b/org-transclusion-font-lock.el
@@ -16,7 +16,8 @@
 ;; with this program.  If not, see .
 
 ;; Author: Noboru Ota 
-;; Created: 2021
+;; Created: 22 August 2021
+;; Last modified: 4 December 2021
 
 ;;; Commentary:
 ;;  This file is part of Org-transclusion
diff --git a/org-transclusion-indent-mode.el b/org-transclusion-indent-mode.el
index 8481710..eebca7b 100644
--- a/org-transclusion-indent-mode.el
+++ b/org-transclusion-indent-mode.el
@@ -16,10 +16,12 @@
 ;; with this program.  If not, see .
 
 ;; Author: Noboru Ota 
-;; Created: 2021
+;; Created: 22 August 2021
+;; Last modified: 4 December 2021
 
 ;;; Commentary:
 ;;  This file is part of Org-transclusion
+;;  URL: https://github.com/nobiot/org-transclusion
 
 ;;; Code:
 
diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index da4869f..f6a50c3 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -16,7 +16,8 @@
 ;; with this program.  If not, see .
 
 ;; Author: Noboru Ota 
-;; Created: 2021
+;; Created: 24 May 2021
+;; Last modified: 4 December 2021
 
 ;;; Commentary:
 ;;  This is an extension to `org-transclusion'.  When active, it adds features
diff --git a/org-transclusion.el b/org-transclusion.el
index 76805e4..1ba7e6b 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -16,12 +16,13 @@
 ;; with this program.  If not, see .
 
 ;; Author: Noboru Ota 
-;; Created: 2021
+;; Created: 10 Oct 2020
+;; Last modified: 4 December 2021
 
 ;; URL: https://github.com/nobiot/org-transclusion
 ;; Keywords: org-mode, transclusion, writing
 
-;; Version: 0.2.2
+;; Version: 1.0.0
 ;; Package-Requires: ((emacs "27.1") (org "9.4"))
 
 ;; This file is not part of GNU Emacs.
@@ -32,15 +33,6 @@
 ;; Transclusion is the ability to include content from one file into
 ;; another by reference.
 
-;; It is still VERY experimental.  As it modifies your files (notes), use
-;; it with care.  The author and contributors cannot be held responsible
-;; for loss of important work.
-
-;; Org-transclusion is a buffer-local minor mode.  It is suggested to set a
-;; keybinding like this to make it easy to toggle it:
-;; (define-key global-map (kbd "") #'org-transclusion-add)
-;; (define-key global-map (kbd "C-c n t") #'org-transclusion-mode)
-
 ;;; Code:
 
  Requirements
diff --git a/text-clone.el b/text-clone.el
index bd051f2..0bbaa5d 100644
--- a/text-clone.el
+++ b/text-clone.el
@@ -16,17 +16,17 @@
 ;; with this program.  If not, see .
 
 ;; Author: Noboru Ota 
-;; Created: 2021
+;; Created: 22 May 2021
+;; Last modified: 4 December 2021
 
-;; URL: https://github.com/nobiot/org-transclusion
-;; Keywords: text-clone, transclusion
+;; Keywords: text-clone, transclusion, org-transclusion
 
-;; Version: 0.0.1
+;; Version: 1.0.0
 ;; Package-Requires: ((emacs "27.1"))
 
-;; This file is not part of GNU Emacs.
-
 ;;; Commentary:
+;;  This file is part of Org-transclusion
+;;  URL: https://github.com/nobiot/org-transclusion
 
  Credits
 

[elpa] externals/org-transclusion b231114 5/6: intrnl: defcustom

[ELPA Syncer]

branch: externals/org-transclusion
commit b231114b8f26adcf4f031564db5a8a798267278d
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: defcustom
---
 org-transclusion.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-transclusion.el b/org-transclusion.el
index b9c44e9..7c09b64 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -69,7 +69,7 @@ Intended for :set property for `customize'."
   '(set :greedy t
 (const :tag "src-lines: Add :src and :lines for non-Org files" 
org-transclusion-src-lines)
 
-(const :tag "indent-mode: Support 
org-indent-mode"org-transclusion-indent-mode)
+(const :tag "indent-mode: Support org-indent-mode" 
org-transclusion-indent-mode)
 (repeat :tag "Other packages" :inline t (symbol :tag "Package"
 
 (defcustom org-transclusion-add-all-on-activate t

[elpa] externals/org-transclusion 617c4d8 3/6: renaming the test el file

[ELPA Syncer]

branch: externals/org-transclusion
commit 617c4d80b1357b90ece8e0583ce67582a59a92d3
Author: Noboru Ota 
Commit: Noboru Ota 

renaming the test el file

Not to be included in ELPA
---
 docs/test-clone/{test-text-clone.el => test-text-clone.el.test} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/test-clone/test-text-clone.el 
b/docs/test-clone/test-text-clone.el.test
similarity index 100%
rename from docs/test-clone/test-text-clone.el
rename to docs/test-clone/test-text-clone.el.test

[elpa] externals/org-transclusion 799ea67 6/6: intrnl: defvar `org-indent-mode`

[ELPA Syncer]

branch: externals/org-transclusion
commit 799ea67f9116d0c10c10556611a4f2002a7821cd
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: defvar `org-indent-mode`

To get rid of reference to free variable warning for byte-compilation.
---
 org-transclusion.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org-transclusion.el b/org-transclusion.el
index 7c09b64..6ad7328 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -45,6 +45,7 @@
 (require 'seq)
 (declare-function org-translusion-indent-add-properties
   org-transclusion-indent-mode)
+(defvar org-indent-mode)
 
  Customization
 

[elpa] externals/org-transclusion 744e151 4/6: intrnl: flymake

[ELPA Syncer]

branch: externals/org-transclusion
commit 744e1513f2d0aef6b2aaa18c6c3f7aeae8f9ff4a
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: flymake
---
 org-transclusion.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org-transclusion.el b/org-transclusion.el
index 1ba7e6b..b9c44e9 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -1355,9 +1355,9 @@ It is intended to be used for 
`org-transclusion-open-source' and
 
 This function relies on `org-transclusion-find-source-marker' to
 locate the position in the source buffer; thus, the same
-limitation applies. It depends on which org elements whether or
+limitation applies.  It depends on which org elements whether or
 not this function can identify the beginnning of the element at
-point. If it cannot, it will return the beginning of the
+point.  If it cannot, it will return the beginning of the
 transclusion, which can be far away from the element at point, if
 the transcluded region is large."
   (let* ((tc-elem (org-element-context))

[elpa] externals/org-transclusion 2a7a2c8 1/6: intrnl: copyright assignment to FSF

[ELPA Syncer]

branch: externals/org-transclusion
commit 2a7a2c874df8e775328b9b2972d57929187d2681
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: copyright assignment to FSF

Prepartion for ELPA.
---
 org-transclusion-font-lock.el   | 18 ++
 org-transclusion-indent-mode.el | 18 ++
 org-transclusion-src-lines.el   | 18 ++
 org-transclusion.el | 22 --
 text-clone.el   | 22 --
 5 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/org-transclusion-font-lock.el b/org-transclusion-font-lock.el
index 2ae4947..3f82fb4 100644
--- a/org-transclusion-font-lock.el
+++ b/org-transclusion-font-lock.el
@@ -1,5 +1,23 @@
 ;;; org-transclusion-font-lock.el --- font-lock for Org-transclusion -*- 
lexical-binding: t; -*-
 
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; 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 .
+
+;; Author: Noboru Ota 
+;; Created: 2021
+
 ;;; Commentary:
 ;;  This file is part of Org-transclusion
 ;;  URL: https://github.com/nobiot/org-transclusion
diff --git a/org-transclusion-indent-mode.el b/org-transclusion-indent-mode.el
index f99b6c2..8481710 100644
--- a/org-transclusion-indent-mode.el
+++ b/org-transclusion-indent-mode.el
@@ -1,5 +1,23 @@
 ;;; org-transclusion-indent-mode.el --- support org-indent-mode -*- 
lexical-binding: t; -*-
 
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; 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 .
+
+;; Author: Noboru Ota 
+;; Created: 2021
+
 ;;; Commentary:
 ;;  This file is part of Org-transclusion
 
diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index fe1920c..da4869f 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -1,5 +1,23 @@
 ;;; org-transclusion-src-lines.el --- Extension -*- lexical-binding: t; -*-
 
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; 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 .
+
+;; Author: Noboru Ota 
+;; Created: 2021
+
 ;;; Commentary:
 ;;  This is an extension to `org-transclusion'.  When active, it adds features
 ;;  for non-Org files such as program source and text files
diff --git a/org-transclusion.el b/org-transclusion.el
index c45d25a..76805e4 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -1,15 +1,6 @@
 ;;; org-transclusion.el --- transclude text contents of linked target -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2020-21 Noboru Ota
-
-;; Author: Noboru Ota 
-;; URL: https://github.com/nobiot/org-transclusion
-;; Keywords: org-mode, transclusion, writing
-
-;; Version: 0.2.2
-;; Package-Requires: ((emacs "27.1") (org "9.4"))
-
-;; This file is not part of GNU Emacs.
+;; Copyright (C) 2021  Free Software Foundation, Inc.
 
 ;; 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
@@ -24,6 +15,17 @@
 ;; You should have received a copy of the GNU General Public License along
 ;; with this program.  If not, see .
 
+;; Author: Noboru Ota 
+;; Created: 2021
+
+;; URL: https://github.com/nobiot/org

[elpa] externals/org-transclusion updated (799ea67 -> 1743958)

[ELPA Syncer]

elpasync pushed a change to branch externals/org-transclusion.

  from  799ea67   intrnl: defvar `org-indent-mode`
   new  1831972   intrnl: add Makefile for compile testing
   new  3da91e2   intrnl: declare org-transclusion-org-file-p
   new  1743958   intrnl: Makefile add missing el


Summary of changes:
 Makefile  | 16 
 org-transclusion-src-lines.el |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 Makefile

[elpa] externals/org-transclusion 1831972 1/3: intrnl: add Makefile for compile testing

[ELPA Syncer]

branch: externals/org-transclusion
commit 1831972f28561dc2d25b824f17b155e4fbfa0661
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: add Makefile for compile testing
---
 Makefile | 13 +
 1 file changed, 13 insertions(+)

diff --git a/Makefile b/Makefile
new file mode 100644
index 000..7bf5ea0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+clean:
+   find . -name "*.elc" -delete
+
+
+test-compile:
+   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
+(byte-compile-file 
\"org-transclusion.el\"))"
+   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
+(byte-compile-file 
\"text-clone.el\"))"
+   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
+(byte-compile-file 
\"org-transclusion-indent-mode.el\"))"
+   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
+(byte-compile-file 
\"org-transclusion-src-lines.el\"))"

[elpa] externals/org-transclusion 1743958 3/3: intrnl: Makefile add missing el

[ELPA Syncer]

branch: externals/org-transclusion
commit 174395876f9eefbc71cb0741154eaa635c8426a0
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: Makefile add missing el
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 7bf5ea0..90b4aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+
 clean:
find . -name "*.elc" -delete
 
@@ -11,3 +12,5 @@ test-compile:
 (byte-compile-file 
\"org-transclusion-indent-mode.el\"))"
emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
 (byte-compile-file 
\"org-transclusion-src-lines.el\"))"
+   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
+(byte-compile-file 
\"org-transclusion-font-lock.el\"))"

[elpa] externals/org-transclusion 3da91e2 2/3: intrnl: declare org-transclusion-org-file-p

[ELPA Syncer]

branch: externals/org-transclusion
commit 3da91e25a16d0c39a4314484b90951ccf3033b57
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: declare org-transclusion-org-file-p
---
 org-transclusion-src-lines.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index f6a50c3..e2d60ad 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -29,6 +29,8 @@
 (declare-function text-clone-make-overlay 'text-clone)
 (declare-function org-transclusion-live-sync-buffers-others-default
   'org-transclusion)
+(declare-function org-transclusion-org-file-p
+  'org-transclusion)
 
  Setting up the extension
 

[elpa] externals/org 191552d: oc: Fix slowdown on tests

[ELPA Syncer]

branch: externals/org
commit 191552df352084fb01dd6ad2b394f085595e
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

oc: Fix slowdown on tests

* lisp/oc.el (org-cite--try-load-processor): New function.
(org-cite-store-export-processor):
(org-cite-follow):
(org-cite-insert): Use new function.
(org-cite-get-processor): Do not try to load unknown processor.
Loading now happens at another level.
---
 lisp/oc.el | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index 867553b..e8baa58 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -421,9 +421,6 @@ Return a non-nil value on a successful operation."
 (defun org-cite-get-processor (name)
   "Return citation processor named after symbol NAME.
 Return nil if no such processor is found."
-  ;; Opportunistically try to load the library providing the
-  ;; processor.
-  (require (intern (concat "oc-" (symbol-name name))) nil t)
   (seq-find (lambda (p) (eq name (org-cite-processor-name p)))
org-cite--processors))
 
@@ -454,6 +451,13 @@ PROCESSOR is the name of a cite processor, as a symbol.  
CAPABILITY is
 
 
 ;;; Internal functions
+(defun org-cite--try-load-processor (name)
+  "Try loading citation processor NAME if unavailable.
+NAME is a symbol.  When the NAME processor is unregistered, try
+loading \"oc-NAME\" library beforehand, then cross fingers."
+  (unless (org-cite-get-processor name)
+(require (format "oc-%s" name) nil t)))
+
 (defun org-cite--set-post-blank (datum blanks)
   "Set `:post-blank' property from element or object before DATUM to BLANKS.
 DATUM is an element or object.  BLANKS is an integer.  DATUM is modified
@@ -1279,6 +1283,7 @@ side-effect."
 (pcase processor
   ('nil nil)
   (`(,name . ,_)
+   (org-cite--try-load-processor name)
(cond
 ((not (org-cite-get-processor name))
  (user-error "Unknown processor %S" name))
@@ -1428,10 +1433,11 @@ channel, as a property list."
   "Follow citation or citation-reference DATUM.
 Following is done according to the processor set in 
`org-cite-follow-processor'.
 ARG is the prefix argument received when calling `org-open-at-point', or nil."
+  (unless org-cite-follow-processor
+(user-error "No processor set to follow citations"))
+  (org-cite--try-load-processor org-cite-follow-processor)
   (let ((name org-cite-follow-processor))
 (cond
- ((null name)
-  (user-error "No processor set to follow citations"))
  ((not (org-cite-get-processor name))
   (user-error "Unknown processor %S" name))
  ((not (org-cite-processor-has-capability-p name 'follow))
@@ -1649,10 +1655,11 @@ More specifically,
 Insertion is done according to the processor set in 
`org-cite-insert-processor'.
 ARG is the prefix argument received when calling interactively the function."
   (interactive "P")
+  (unless org-cite-insert-processor
+(user-error "No processor set to insert citations"))
+  (org-cite--try-load-processor org-cite-insert-processor)
   (let ((name org-cite-insert-processor))
 (cond
- ((null name)
-  (user-error "No processor set to insert citations"))
  ((not (org-cite-get-processor name))
   (user-error "Unknown processor %S" name))
  ((not (org-cite-processor-has-capability-p name 'insert))

[nongnu] elpa/geiser 9c46022: Fix: better handling of recurring debugging entrances

[ELPA Syncer]

branch: elpa/geiser
commit 9c460224c5159a5dd9c3ada3ad5df265536292cd
Author: jao 
Commit: jao 

Fix: better handling of recurring debugging entrances
---
 elisp/geiser-connection.el | 3 ++-
 elisp/geiser-repl.el   | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 1068330..d9ffc15 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -200,7 +200,8 @@
 
 (defun geiser-con--req-form (req answer)
   (let ((con (geiser-con--request-connection req)))
-(if (geiser-con--has-entered-debugger con answer)
+(if (or (geiser-con--connection-is-debugging con)
+(geiser-con--has-entered-debugger con answer))
 `((error (key . geiser-debugger))
   (output . ,answer))
   (condition-case err
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 814c501..bb827a5 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -762,9 +762,8 @@ If SAVE-HISTORY is non-nil, save CMD in the REPL history."
  (intxt (and pmark (buffer-substring pmark (point
  (eob (point-max)))
 (when intxt
-  (and geiser-repl-forget-old-errors-p
-   (not (geiser-repl--is-debugging))
-   (compilation-forget-errors))
+  (when geiser-repl-forget-old-errors-p
+(compilation-forget-errors))
   (geiser-repl--prepare-send)
   (comint-send-input)
   (when (string-match "^\\s-*$" intxt)

[nongnu] elpa/geiser-chez ab2dde7: Tell geiser we've entered the debugger: newest version will listen

[ELPA Syncer]

branch: elpa/geiser-chez
commit ab2dde7a345c1c135ec0ed8fcd49eff1114951bd
Author: jao 
Commit: jao 

Tell geiser we've entered the debugger: newest version will listen

Otherwise we also jump to the debug buffer, which i don't think it's useful.
---
 geiser-chez.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/geiser-chez.el b/geiser-chez.el
index a3af75c..8c1c178 100644
--- a/geiser-chez.el
+++ b/geiser-chez.el
@@ -4,7 +4,7 @@
 ;; Maintainer: Jose A Ortega Ruiz 
 ;; Keywords: languages, chez, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/chez
-;; Package-Requires: ((emacs "26.1") (geiser "0.16"))
+;; Package-Requires: ((emacs "26.1") (geiser "0.18"))
 ;; SPDX-License-Identifier: BSD-3-Clause
 ;; Version: 0.16
 
@@ -165,7 +165,8 @@ This function uses `geiser-chez-init-file' if it exists."
   (goto-char (point-max))
   (geiser-repl--prepare-send)
   (comint-send-string repl-buffer bt-cmd)
-  (ignore-errors (next-error)
+  (ignore-errors (next-error)))
+t))
 
 (defun geiser-chez--display-error (_module key msg)
   "Display an error found during evaluation with the given KEY and message 
MSG."

[nongnu] elpa/geiser-gambit faff8ba: We don't need to declare scm extension

[ELPA Syncer]

branch: elpa/geiser-gambit
commit faff8bac11621228640a3107622fe23df4bb6e2c
Author: jao 
Commit: jao 

We don't need to declare scm extension
---
 geiser-gambit.el | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/geiser-gambit.el b/geiser-gambit.el
index 0eeba2d..f8a80be 100644
--- a/geiser-gambit.el
+++ b/geiser-gambit.el
@@ -4,9 +4,9 @@
 ;; Maintainer: Daniel Leslie, Jose A Ortega Ruiz 
 ;; Keywords: languages, gambit, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/gambit
-;; Package-Requires: ((emacs "26.1") (geiser "0.16"))
+;; Package-Requires: ((emacs "26.1") (geiser "0.18"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.16
+;; Version: 0.17
 
 ;; Copyright (C) 2014, 2015, 2019, 2020, 2021 Daniel Leslie
 ;; Based on geiser-guile.el by Jose Antonio Ortega Ruiz
@@ -351,8 +351,6 @@ If t, Geiser will use `next-error' to jump to the error's 
location."
   (keywords geiser-gambit--keywords)
   (case-sensitive geiser-gambit-case-sensitive-p))
 
-(geiser-implementation-extension 'gambit "scm")
-
 ;;;###autoload
 (geiser-activate-implementation 'gambit)
 

[elpa] externals/org-transclusion updated (1743958 -> 93a9a81)

[ELPA Syncer]

elpasync pushed a change to branch externals/org-transclusion.

  from  1743958   intrnl: Makefile add missing el
   new  3850a80   fix: declare-function
   new  93a9a81   fix: declare-function


Summary of changes:
 org-transclusion-indent-mode.el | 2 +-
 org-transclusion-src-lines.el   | 4 ++--
 org-transclusion.el | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

[elpa] externals/org-transclusion 3850a80 1/2: fix: declare-function

[ELPA Syncer]

branch: externals/org-transclusion
commit 3850a80f3b773e0f272b3f56d143643b396dd5b0
Author: Noboru Ota 
Commit: Noboru Ota 

fix: declare-function

Second arg is supposed to be a string (file name)
---
 org-transclusion-indent-mode.el | 2 +-
 org-transclusion-src-lines.el   | 4 ++--
 org-transclusion.el | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org-transclusion-indent-mode.el b/org-transclusion-indent-mode.el
index eebca7b..1fbfc4c 100644
--- a/org-transclusion-indent-mode.el
+++ b/org-transclusion-indent-mode.el
@@ -27,7 +27,7 @@
 
 (require 'org-indent)
 (declare-function org-transclusion-within-transclusion-p
-  'org-transclusion)
+  "org-transclusion.el")
 
 (defun org-translusion-indent-add-properties (beg end)
   "BEG END."
diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index e2d60ad..7126768 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -28,9 +28,9 @@
 (require 'org-element)
 (declare-function text-clone-make-overlay 'text-clone)
 (declare-function org-transclusion-live-sync-buffers-others-default
-  'org-transclusion)
+  "org-transclusion.el")
 (declare-function org-transclusion-org-file-p
-  'org-transclusion)
+  "org-transclusion.el")
 
  Setting up the extension
 
diff --git a/org-transclusion.el b/org-transclusion.el
index 6ad7328..9ae6634 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -44,7 +44,7 @@
 (require 'text-property-search)
 (require 'seq)
 (declare-function org-translusion-indent-add-properties
-  org-transclusion-indent-mode)
+  "org-transclusion-indent-mode.el")
 (defvar org-indent-mode)
 
  Customization

[elpa] externals/org-transclusion 93a9a81 2/2: fix: declare-function

[ELPA Syncer]

branch: externals/org-transclusion
commit 93a9a81d752d1d21114284d59b5e3e0bd34ea043
Author: Noboru Ota 
Commit: Noboru Ota 

fix: declare-function

".el" can be omitted
---
 org-transclusion-indent-mode.el | 2 +-
 org-transclusion-src-lines.el   | 4 ++--
 org-transclusion.el | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org-transclusion-indent-mode.el b/org-transclusion-indent-mode.el
index 1fbfc4c..9b7c1ca 100644
--- a/org-transclusion-indent-mode.el
+++ b/org-transclusion-indent-mode.el
@@ -27,7 +27,7 @@
 
 (require 'org-indent)
 (declare-function org-transclusion-within-transclusion-p
-  "org-transclusion.el")
+  "org-transclusion")
 
 (defun org-translusion-indent-add-properties (beg end)
   "BEG END."
diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index 7126768..e06ef9d 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -28,9 +28,9 @@
 (require 'org-element)
 (declare-function text-clone-make-overlay 'text-clone)
 (declare-function org-transclusion-live-sync-buffers-others-default
-  "org-transclusion.el")
+  "org-transclusion")
 (declare-function org-transclusion-org-file-p
-  "org-transclusion.el")
+  "org-transclusion")
 
  Setting up the extension
 
diff --git a/org-transclusion.el b/org-transclusion.el
index 9ae6634..f3ef39d 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -44,7 +44,7 @@
 (require 'text-property-search)
 (require 'seq)
 (declare-function org-translusion-indent-add-properties
-  "org-transclusion-indent-mode.el")
+  "org-transclusion-indent-mode")
 (defvar org-indent-mode)
 
  Customization

[nongnu] elpa/geiser-chibi 5a6a5a5: We don't need to declare scm extension

[ELPA Syncer]

branch: elpa/geiser-chibi
commit 5a6a5a580ea45cd4974df21629a8d50cbe3d6e99
Author: jao 
Commit: jao 

We don't need to declare scm extension
---
 geiser-chibi.el | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/geiser-chibi.el b/geiser-chibi.el
index 23b3cce..3b10fb8 100644
--- a/geiser-chibi.el
+++ b/geiser-chibi.el
@@ -4,9 +4,9 @@
 ;; Maintainer: Jose A Ortega Ruiz 
 ;; Keywords: languages, chibi, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/chibi
-;; Package-Requires: ((emacs "24.4") (geiser "0.16"))
+;; Package-Requires: ((emacs "24.4") (geiser "0.18"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.16
+;; Version: 0.17
 
 ;;; Commentary:
 
@@ -162,8 +162,6 @@ This function uses `geiser-chibi-init-file' if it exists."
   ;; (case-sensitive geiser-chibi-case-sensitive-p)
   )
 
-(geiser-implementation-extension 'chibi "scm")
-
 ;;;###autoload
 (geiser-implementation-extension 'chibi "sld")
 

[nongnu] elpa/geiser-mit 4e90e9a: We don't need to declare scm extension

[ELPA Syncer]

branch: elpa/geiser-mit
commit 4e90e9ae815e89f3540fb9644e6016c663ef5765
Author: jao 
Commit: jao 

We don't need to declare scm extension
---
 .gitignore| 6 ++
 geiser-mit.el | 6 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..6e34c3a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.bci
+*.bin
+*.com
+*.crf
+*.pkd
+*.fre
diff --git a/geiser-mit.el b/geiser-mit.el
index a67d60e..53edf0e 100644
--- a/geiser-mit.el
+++ b/geiser-mit.el
@@ -4,9 +4,9 @@
 ;; Maintainer: Jose A Ortega Ruiz 
 ;; Keywords: languages, mit, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/mit
-;; Package-Requires: ((emacs "24.4") (geiser "0.12"))
+;; Package-Requires: ((emacs "24.4") (geiser "0.18"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.13
+;; Version: 0.15
 
 ;;; Commentary:
 
@@ -195,8 +195,6 @@ This function uses `geiser-mit-init-file' if it exists."
   ;; (case-sensitive geiser-mit-case-sensitive-p)
   )
 
-(geiser-impl--add-to-alist 'regexp "\\.scm$" 'mit t)
-
 ;;;###autoload
 (geiser-impl--add-to-alist 'regexp "\\.pkg$" 'mit t)
 

[nongnu] elpa/geiser 5be7153: Version bump (0.19)

[ELPA Syncer]

branch: elpa/geiser
commit 5be7153e650a9817d30cb480439e3f56ce7422e7
Author: jao 
Commit: jao 

Version bump (0.19)
---
 elisp/geiser.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index a559c68..c061a9a 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "24.4"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.18
+;; Version: 0.19
 
 ;;; Commentary:
 

[nongnu] elpa/geiser-guile updated (4f47fe3 -> adf31d3)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser-guile.

  from  4f47fe3   Better prompt and error links detection
   new  fe33464   We don't need to declare scm extension
   new  adf31d3   Version bump (0.19)


Summary of changes:
 geiser-guile.el | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

[nongnu] elpa/geiser-chicken updated (ceab39c -> 79a9ac7)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser-chicken.

  from  ceab39c   Use new implementation extension declarator
   new  1d6ca30   We don't need to declare scm extension
   new  79a9ac7   Version bump (0.17)


Summary of changes:
 geiser-chicken.el | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

[nongnu] elpa/geiser-chicken 1d6ca30 1/2: We don't need to declare scm extension

[ELPA Syncer]

branch: elpa/geiser-chicken
commit 1d6ca30d33a084ce2bed44e84abb0624f427ca55
Author: jao 
Commit: jao 

We don't need to declare scm extension
---
 geiser-chicken.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/geiser-chicken.el b/geiser-chicken.el
index c960613..090bec6 100644
--- a/geiser-chicken.el
+++ b/geiser-chicken.el
@@ -377,8 +377,6 @@ This function uses `geiser-chicken-init-file' if it exists."
 ;;;###autoload
 (geiser-activate-implementation 'chicken)
 
-(geiser-implementation-extension 'chicken "scm")
-
 ;;;###autoload
 (geiser-implementation-extension 'chicken "release-info")
 ;;;###autoload

[nongnu] elpa/geiser-guile adf31d3 2/2: Version bump (0.19)

[ELPA Syncer]

branch: elpa/geiser-guile
commit adf31d3a36bf9be4b92d5c8854b4a055b1ef6f1f
Author: jao 
Commit: jao 

Version bump (0.19)
---
 geiser-guile.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-guile.el b/geiser-guile.el
index 02aa246..dcf872e 100644
--- a/geiser-guile.el
+++ b/geiser-guile.el
@@ -7,9 +7,9 @@
 ;; Maintainer: Jose Antonio Ortega Ruiz (j...@gnu.org)
 ;; Keywords: languages, guile, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/guile
-;; Package-Requires: ((emacs "24.4") (geiser "0.18"))
+;; Package-Requires: ((emacs "24.4") (geiser "0.19"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.18
+;; Version: 0.19
 
 ;; This file is NOT part of GNU Emacs.
 

[nongnu] elpa/geiser-guile fe33464 1/2: We don't need to declare scm extension

[ELPA Syncer]

branch: elpa/geiser-guile
commit fe33464c912577fae29a229a5c9ab805eab12ef3
Author: jao 
Commit: jao 

We don't need to declare scm extension
---
 geiser-guile.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/geiser-guile.el b/geiser-guile.el
index b151ac4..02aa246 100644
--- a/geiser-guile.el
+++ b/geiser-guile.el
@@ -476,8 +476,6 @@ See `geiser-guile-use-declarative-modules-p'."
   (keywords geiser-guile--keywords)
   (case-sensitive geiser-guile-case-sensitive-p))
 
-(geiser-implementation-extension 'guile "scm")
-
 ;;;###autoload
 (geiser-activate-implementation 'guile)
 

[nongnu] elpa/geiser-chicken 79a9ac7 2/2: Version bump (0.17)

[ELPA Syncer]

branch: elpa/geiser-chicken
commit 79a9ac78f4df7c9ec1f918313c543c116dbb8b70
Author: jao 
Commit: jao 

Version bump (0.17)
---
 geiser-chicken.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-chicken.el b/geiser-chicken.el
index 090bec6..ce22067 100644
--- a/geiser-chicken.el
+++ b/geiser-chicken.el
@@ -8,9 +8,9 @@
 ;; Maintainer: Daniel Leslie
 ;; Keywords: languages, chicken, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/chicken
-;; Package-Requires: ((emacs "24.4") (geiser "0.16"))
+;; Package-Requires: ((emacs "24.4") (geiser "0.19"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.16
+;; Version: 0.17
 
 ;; This file is NOT part of GNU Emacs.
 

[nongnu] elpa/git-commit 463a355: git-commit-search-message-{backward, forward}: Don't use format-prompt

[ELPA Syncer]

branch: elpa/git-commit
commit 463a3550e27ab1cb0dc53afb0199f2e50660f24c
Author: Kyle Meyer 
Commit: Kyle Meyer 

git-commit-search-message-{backward,forward}: Don't use format-prompt

format-prompt isn't available until (what will be) Emacs 28.1.  Use a
plain format call instead.

The new behavior is different in that 1) it doesn't respect
minibuffer-default-prompt-format and 2) it shows "(default )" for an
empty string default rather than hiding the default entirely.  The
first seems an acceptable trade for compatibility while avoiding a
wrapper/kludge.  And the second seems fine in general given that the
empty string is in fact the default, so it's worth telling the user
about the useless default value.
---
 lisp/git-commit.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index f098496..420d0bf 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -730,8 +730,9 @@ With a numeric prefix ARG, go forward ARG comments."
   "Search backward through message history for a match for STRING.
 Save current message first."
   (interactive
-   (list (read-string (format-prompt "Comment substring"
- log-edit-last-comment-match)
+   ;; Avoid `format-prompt' because it isn't available until Emacs 28.
+   (list (read-string (format "Comment substring (default %s): "
+  log-edit-last-comment-match)
   nil nil log-edit-last-comment-match)))
   (cl-letf (((symbol-function #'log-edit-previous-comment)
  (symbol-function #'git-commit-prev-message)))
@@ -741,8 +742,9 @@ Save current message first."
   "Search forward through message history for a match for STRING.
 Save current message first."
   (interactive
-   (list (read-string (format-prompt "Comment substring"
- log-edit-last-comment-match)
+   ;; Avoid `format-prompt' because it isn't available until Emacs 28.
+   (list (read-string (format "Comment substring (default %s): "
+  log-edit-last-comment-match)
   nil nil log-edit-last-comment-match)))
   (cl-letf (((symbol-function #'log-edit-previous-comment)
  (symbol-function #'git-commit-prev-message)))

[nongnu] elpa/magit updated (b6a103b -> 463a355)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  b6a103b   Fix previous commit
  adds  463a355   git-commit-search-message-{backward,forward}: Don't use 
format-prompt

No new revisions were added by this update.

Summary of changes:
 lisp/git-commit.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

[nongnu] elpa/magit-section updated (b6a103b -> 463a355)

[ELPA Syncer]

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

  from  b6a103b   Fix previous commit
  adds  463a355   git-commit-search-message-{backward,forward}: Don't use 
format-prompt

No new revisions were added by this update.

Summary of changes:
 lisp/git-commit.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

[elpa] externals/pyim 137b2d3 2/2: 简化 pyim-candidates-create:quanpin

[ELPA Syncer]

branch: externals/pyim
commit 137b2d316132925010d66c1d8daf03799c8f1a1b
Author: Feng Shu 
Commit: Feng Shu 

简化 pyim-candidates-create:quanpin

* pyim-candidates.el (pyim-candidates-create:quanpin): 简化。
(pyim-candidates-merge): 合并之前先去重。
---
 pyim-candidates.el | 77 +-
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index 3fc12d8..3bb2b02 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -93,6 +93,9 @@ IMOBJS 获得候选词条。"
   (unless async
 (let (znabc-words pinyin-chars personal-words common-words)
   ;; 智能ABC模式，得到尽可能的拼音组合，查询这些组合，得到的词条做为联想词。
+  ;;
+  ;; NOTE: 智能ABC模式 *目前* 不处理模糊音，因为这个模式会进行大量的搜索，如
+  ;; 果再处理模糊音的话，有可能导致性能下降。
   (let* ((codes (pyim-codes-create (car imobjs) scheme-name))
  (n (- (length codes) 1))
  output)
@@ -102,50 +105,48 @@ IMOBJS 获得候选词条。"
 (dolist (code (reverse output))
   (setq znabc-words (append znabc-words (pyim-dcache-get code)
 
+  ;; 获取个人词条，词库词条和第一汉字列表。
   (dolist (imobj imobjs)
-(let ((w (pyim-dcache-get
-  (mapconcat #'identity
- (pyim-codes-create imobj scheme-name)
- "-")
-  (if pyim-enable-shortcode
-  '(icode2word ishortcode2word)
-'(icode2word)
-  (setq personal-words (append personal-words w)))
-
-(let ((w1 (delete-dups common-words))
-  (w2 (pyim-dcache-get
-   (mapconcat #'identity
-  (pyim-codes-create imobj scheme-name)
-  "-")
-   (if pyim-enable-shortcode
-   '(code2word shortcode2word)
- '(code2word)
-  (if (and (> (length w1) 0)
-   (> (length w2) 0)
-   (or (eq 1 (length imobj))
-   (eq 2 (length imobj
-  ;; 两个单字或者两字词序列合并, 确保常用字词在前面。
-  (setq common-words (pyim-candidates-merge w1 w2))
-(setq common-words (append w1 w2
-
-(let ((w (pyim-dcache-get
-  (car (pyim-codes-create imobj scheme-name)
-  (setq pinyin-chars (append pinyin-chars w
-
-  ;; 使用词频信息对个人词库得到的候选词排序，第一个词条的位置比较特殊，不参
-  ;; 与排序，具体原因请参考 `pyim-page-select-word' 中的 comment.
+(let* (;; 个人词条
+   (w1 (pyim-dcache-get
+(mapconcat #'identity
+   (pyim-codes-create imobj scheme-name)
+   "-")
+(if pyim-enable-shortcode
+'(icode2word ishortcode2word)
+  '(icode2word
+   ;; 词库词条
+   (w2 (pyim-dcache-get
+(mapconcat #'identity
+   (pyim-codes-create imobj scheme-name)
+   "-")
+(if pyim-enable-shortcode
+'(code2word shortcode2word)
+  '(code2word
+   ;; 第一个汉字
+   (w3 (pyim-dcache-get
+(car (pyim-codes-create imobj scheme-name)
+  (setq personal-words (pyim-candidates-merge personal-words w1))
+  (setq common-words (pyim-candidates-merge common-words w2))
+  (setq pinyin-chars (pyim-candidates-merge pinyin-chars w3
+
+  ;; 个人词条排序：使用词频信息对个人词库得到的候选词排序，第一个词条的位置
+  ;; 比较特殊，不参与排序，具体原因请参考 `pyim-page-select-word' 中的
+  ;; comment.
   (setq personal-words
 `(,(car personal-words)
   ,@(pyim-dcache-call-api
  'sort-words (cdr personal-words
 
-  ;; Debug
+  ;; 调试输出
   (when pyim-debug
 (print (list :imobjs imobjs
  :personal-words personal-words
  :common-words common-words
  :znabc-words znabc-words
- :pinyin-chars pinyin-chars)))
+ :pinyin-chars
+ (cl-subseq pinyin-chars
+0 (min (length pinyin-chars) 5)
 
   (delete-dups
(delq nil
@@ -159,12 +160,16 @@ IMOBJS 获得候选词条。"
 
 如果 list1 = (a b), list2 = (c d e),
 那么结果为: (a c b d e)."
-  (let (result)
+  (let ((list1 (delete-dups list1))
+(list2 (delete-dups list2))
+result)
 (while (and list1 list2)
   (push (pop list1) result)
   (push (pop list2) result))
-(remove nil `(,@(nreverse result)
-  ,@(or list1 list2)
+(if (or list1 list2)
+`(,@(nreverse result)
+  ,@(or list1 list2))
+  (nreverse result
 
 (defun pyim-candidates-create:shuangpin (imobjs _scheme-name &optional async)
   "`pyim-candidates-create' 处理双拼输入法的函数."

[elpa] externals/pyim 030cb3a 1/2: * pyim-candidates.el (pyim-candidates-merge): 稍微优化一点性能。

[ELPA Syncer]

branch: externals/pyim
commit 030cb3acde367779a2adee4b2a3767f06c6132a2
Author: Feng Shu 
Commit: Feng Shu 

* pyim-candidates.el (pyim-candidates-merge): 稍微优化一点性能。
---
 pyim-candidates.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index a57c1f5..3fc12d8 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -160,10 +160,11 @@ IMOBJS 获得候选词条。"
 如果 list1 = (a b), list2 = (c d e),
 那么结果为: (a c b d e)."
   (let (result)
-(while (or list1 list2)
+(while (and list1 list2)
   (push (pop list1) result)
   (push (pop list2) result))
-(remove nil (nreverse result
+(remove nil `(,@(nreverse result)
+  ,@(or list1 list2)
 
 (defun pyim-candidates-create:shuangpin (imobjs _scheme-name &optional async)
   "`pyim-candidates-create' 处理双拼输入法的函数."

[elpa] externals/pyim updated (41de729 -> 137b2d3)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  41de729   添加 pyim-candidates-merge 简化 
pyim-candidates-create:quanpin.
   new  030cb3a   * pyim-candidates.el (pyim-candidates-merge): 稍微优化一点性能。
   new  137b2d3   简化 pyim-candidates-create:quanpin


Summary of changes:
 pyim-candidates.el | 78 +-
 1 file changed, 42 insertions(+), 36 deletions(-)

[nongnu] elpa/geiser fb11e72 5/5: Documentation nits

[ELPA Syncer]

branch: elpa/geiser
commit fb11e7281c3b8acb43ac39d8a2769c29bb36f2a4
Author: jao 
Commit: jao 

Documentation nits
---
 doc/macros.texi | 4 ++--
 doc/parens.texi | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/macros.texi b/doc/macros.texi
index 222ff7c..b909613 100644
--- a/doc/macros.texi
+++ b/doc/macros.texi
@@ -1,6 +1,6 @@
-@set VERSION 0.13
+@set VERSION 0.20
 @set VERSION_NICK
-@set RELEASE_DATE April 2021
+@set RELEASE_DATE December 2021
 @set EMACS_VERSION 24.4
 @set GITLAB https://gitlab.com/emacs-geiser/
 
diff --git a/doc/parens.texi b/doc/parens.texi
index 89b73ce..47db78e 100644
--- a/doc/parens.texi
+++ b/doc/parens.texi
@@ -229,7 +229,7 @@ always know where to find your project's modules or 
dependencies.
 Geiser automatically handles the common case of the project root
 belonging to the load path: unless you tell it otherwise (using the
 customisable flag @code{geiser-repl-add-project-path-p}, which defaults
-to @code{t}), will add the result of calling
+to @code{t}), it will add the result of calling
 @code{geiser-repl-current-project-function} to the REPLs load path on
 startup.
 

[nongnu] elpa/geiser updated (5be7153 -> fb11e72)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser.

  from  5be7153   Version bump (0.19)
   new  b262178   Initialise geiser-repl-current-project-function according 
to availability
   new  3378f18   Redundant custom groups removed (geiser-repl)
   new  8985e79   news.org entry
   new  1e6ede9   New option geiser-repl-add-project-path-p
   new  fb11e72   Documentation nits


Summary of changes:
 doc/macros.texi  |  4 +--
 doc/parens.texi  |  7 +
 doc/repl.texi| 13 
 elisp/geiser-repl.el | 84 +---
 news.org |  8 -
 5 files changed, 57 insertions(+), 59 deletions(-)

[nongnu] elpa/geiser b262178 1/5: Initialise geiser-repl-current-project-function according to availability

[ELPA Syncer]

branch: elpa/geiser
commit b2621789d3dace5590ca5f19d036634ef3dd84b9
Author: jao 
Commit: jao 

Initialise geiser-repl-current-project-function according to availability
---
 elisp/geiser-repl.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index bb827a5..9f51efa 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -46,7 +46,7 @@ symbol (e.g., `guile', `chicken', etc.)."
   :group 'geiser-repl)
 
 (geiser-custom--defcustom geiser-repl-current-project-function
-'ignore
+(if (featurep 'project) #'project-current 'ignore)
   "Function used to determine the current project.
 The function is called from both source and REPL buffers, and
 should return a value which uniquely identifies the project."

[nongnu] elpa/geiser 3378f18 2/5: Redundant custom groups removed (geiser-repl)

[ELPA Syncer]

branch: elpa/geiser
commit 3378f1850489f8890beec4542a3f87ce38947e08
Author: jao 
Commit: jao 

Redundant custom groups removed (geiser-repl)
---
 elisp/geiser-repl.el | 73 +---
 1 file changed, 24 insertions(+), 49 deletions(-)

diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 9f51efa..c2a490e 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -42,8 +42,7 @@
 The function is called with a single argument - an implementation
 symbol (e.g., `guile', `chicken', etc.)."
   :type '(choice (function-item geiser-repl-buffer-name)
- (function :tag "Other function"))
-  :group 'geiser-repl)
+ (function :tag "Other function")))
 
 (geiser-custom--defcustom geiser-repl-current-project-function
 (if (featurep 'project) #'project-current 'ignore)
@@ -53,19 +52,16 @@ should return a value which uniquely identifies the 
project."
   :type '(choice (function-item :tag "Ignore projects" ignore)
  (function-item :tag "Use Project.el" project-current)
  (function-item :tag "Use Projectile" projectile-project-root)
- (function :tag "Other function"))
-  :group 'geiser-repl)
+ (function :tag "Other function")))
 
 (geiser-custom--defcustom geiser-repl-use-other-window t
   "Whether to Use a window other than the current buffer's when
 switching to the Geiser REPL buffer."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-window-allow-split t
   "Whether to allow window splitting when switching to the Geiser REPL buffer."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-history-filename
 (expand-file-name "~/.geiser_history")
@@ -73,18 +69,15 @@ switching to the Geiser REPL buffer."
 
 This is actually the base name: the concrete Scheme
 implementation name gets appended to it."
-  :type 'file
-  :group 'geiser-repl)
+  :type 'file)
 
 (geiser-custom--defcustom geiser-repl-history-size comint-input-ring-size
   "Maximum size of the saved REPL input history."
-  :type 'integer
-  :group 'geiser-repl)
+  :type 'integer)
 
 (geiser-custom--defcustom geiser-repl-history-no-dups-p t
   "Whether to skip duplicates when recording history."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-save-debugging-history-p nil
   "Whether to skip debugging input in REPL history.
@@ -92,38 +85,31 @@ implementation name gets appended to it."
 By default, REPL interactions while scheme is in the debugger are
 not added to the REPL command history.  Set this variable to t to
 change that."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-autodoc-p t
   "Whether to enable `geiser-autodoc-mode' in the REPL by default."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-company-p t
   "Whether to use company-mode for completion, if available."
-  :group 'geiser-mode
   :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-read-only-prompt-p t
   "Whether the REPL's prompt should be read-only."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-read-only-output-p t
   "Whether the REPL's output should be read-only."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-highlight-output-p nil
   "Whether to syntax highlight REPL output."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-auto-indent-p t
   "Whether newlines for incomplete sexps are autoindented."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-send-on-return-p t
   "Sends input to REPL when ENTER is pressed in a balanced S-expression,
@@ -138,8 +124,7 @@ arguments inside an existing expression.
 When on (the default), pressing ENTER inside a balanced S-expression
 will send the input to the inferior Scheme process regardless of the
 cursor placement."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-forget-old-errors-p t
   "Whether to forget old errors upon entering a new expression.
@@ -148,8 +133,7 @@ When on (the default), every time a new expression is 
entered in
 the REPL old error messages are flushed, and using \\[next-error]
 afterwards will jump only to error locations produced by the new
 expression, if any."
-  :type 'boolean
-  :group 'geiser-repl)
+  :type 'boolean)
 
 (geiser-custom--defcustom geiser-repl-skip-version-check-p nil
   "Whether to skip version checks for the Scheme executable.
@@ -157,53 +141,44 @@ expression, if any."
 When set, Geiser won't check the version of the Scheme
 interpreter when starting a REPL, saving a few tenths of a
 second."
-  :type 'boolean
-  :gr

[nongnu] elpa/geiser 8985e79 3/5: news.org entry

[ELPA Syncer]

branch: elpa/geiser
commit 8985e7995e87b2ac95306e3c5e962b8c7b50d83a
Author: jao 
Commit: jao 

news.org entry
---
 news.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/news.org b/news.org
index 5642019..3c7890b 100644
--- a/news.org
+++ b/news.org
@@ -1,7 +1,8 @@
+* Version 0.19 (December, 2021)
+  - Bug fixes
 * Version 0.18 (October, 2021)
 
   - Documentation fix
-
 * Version 0.17 (August, 2021)
 
   - Package available in NonGNU ELPA (doc update)

[nongnu] elpa/geiser 1e6ede9 4/5: New option geiser-repl-add-project-path-p

[ELPA Syncer]

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

New option geiser-repl-add-project-path-p

Together with project-current as a default for the project root
function when available, now that Emacs 28 is on the horizon.
---
 doc/parens.texi  |  7 +++
 doc/repl.texi| 13 +++--
 elisp/geiser-repl.el |  9 +
 news.org |  5 +
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/doc/parens.texi b/doc/parens.texi
index ee4f0a8..89b73ce 100644
--- a/doc/parens.texi
+++ b/doc/parens.texi
@@ -222,9 +222,16 @@ project-management library of choice (eg. 
@code{project.el} or
 associate themselves with the current project, and all Geiser commands
 will ignore REPLs that are not associated with the project.
 
+@cindex geiser-repl-add-project-path-p
 This can be very convenient when used with a @file{.dir-locals.el} in
 the project root to set include paths, ensuring that Geiser REPLs will
 always know where to find your project's modules or dependencies.
+Geiser automatically handles the common case of the project root
+belonging to the load path: unless you tell it otherwise (using the
+customisable flag @code{geiser-repl-add-project-path-p}, which defaults
+to @code{t}), will add the result of calling
+@code{geiser-repl-current-project-function} to the REPLs load path on
+startup.
 
 @subsubheading Switching between source files and the REPL
 @cindex switching to REPL
diff --git a/doc/repl.texi b/doc/repl.texi
index 9cb4ae4..2209ad0 100644
--- a/doc/repl.texi
+++ b/doc/repl.texi
@@ -453,15 +453,16 @@ good candidates for an entry in a project's 
@file{.dir-locals.el} file,
 so that they are automatically set to a sensible value whenever you
 start a REPL in the project's directory.
 
-@subsubheading Racket startup time
+@subsubheading Startup waiting time
 
 @cindex startup timeout
 @cindex timeout
-When starting Racket in little computers, Geiser might have to wait a
-bit more than it expects (which is ten seconds, or ten thousand
-milliseconds, by default).  If you find that Geiser is giving up too
-quickly and complaining that no prompt was found, try to increase the
-value of @code{geiser-repl-startup-time} to, say, twenty seconds:
+When starting a scheme implementation in old or very busy computers,
+Geiser might have to wait a bit more than it expects (which is ten
+seconds, or ten thousand milliseconds, by default).  If you find that
+Geiser is giving up too quickly and complaining that no prompt was
+found, try to increase the value of @code{geiser-repl-startup-time} to,
+say, twenty seconds:
 
 @example
 (setq geiser-repl-startup-time 2)
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index c2a490e..e74a187 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -180,6 +180,12 @@ images popping up in the REPL.
 See also `geiser-debug-auto-display-images-p'."
   :type 'boolean)
 
+(geiser-custom--defcustom geiser-repl-add-project-path-p t
+  "Whether to automatically add current project's root to load path on startup.
+For this option to take effect,
+`geiser-repl-current-project-function' must be set appropriately."
+  :type 'boolean)
+
 (geiser-custom--defface repl-input
   'comint-highlight-input geiser-repl "evaluated input highlighting")
 
@@ -511,6 +517,9 @@ module command as a string")
 (geiser-repl--startup impl address)
 (geiser-repl--autodoc-mode 1)
 (geiser-company--setup geiser-repl-company-p)
+(when geiser-repl-add-project-path-p
+  (when-let (root (funcall geiser-repl-current-project-function))
+(geiser-add-to-load-path (cdr root
 (add-hook 'comint-output-filter-functions
   'geiser-repl--output-filter
   nil
diff --git a/news.org b/news.org
index 3c7890b..959e411 100644
--- a/news.org
+++ b/news.org
@@ -1,3 +1,8 @@
+* Version 0.20 (unreleased)
+  - New option to add current project's root to load path,
+~geiser-repl-add-project-path-p~.
+  - Defaulting ~geiser-repl-current-project-function~ to ~project-current~
+in emacsen having it available.
 * Version 0.19 (December, 2021)
   - Bug fixes
 * Version 0.18 (October, 2021)

[elpa] externals/org updated (191552d -> ad53c54)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  191552d   oc: Fix slowdown on tests
   new  db4805c   Backport commit 50b40e1d4 from Emacs
   new  ad53c54   Merge branch 'bugfix'


Summary of changes:
 lisp/ob-julia.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[elpa] externals/pyim 8672b90 1/2: Add pyim-zip.

[ELPA Syncer]

branch: externals/pyim
commit 8672b904f4b1002703024a4a72c262c416737094
Author: Feng Shu 
Commit: Feng Shu 

Add pyim-zip.

* pyim-common.el (pyim-zip): Added.
* pyim-candidates.el (pyim-candidates-create:quanpin): Use pyim-zip.
(pyim-candidates-merge): Removed
---
 pyim-candidates.el | 26 +++---
 pyim-common.el | 12 
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index 3bb2b02..a05e483 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -126,9 +126,13 @@ IMOBJS 获得候选词条。"
;; 第一个汉字
(w3 (pyim-dcache-get
 (car (pyim-codes-create imobj scheme-name)
-  (setq personal-words (pyim-candidates-merge personal-words w1))
-  (setq common-words (pyim-candidates-merge common-words w2))
-  (setq pinyin-chars (pyim-candidates-merge pinyin-chars w3
+  (push w1 personal-words)
+  (push w2 common-words)
+  (push w3 pinyin-chars)))
+
+  (setq personal-words (pyim-zip (nreverse personal-words)))
+  (setq common-words (pyim-zip (nreverse common-words)))
+  (setq pinyin-chars (pyim-zip (nreverse pinyin-chars)))
 
   ;; 个人词条排序：使用词频信息对个人词库得到的候选词排序，第一个词条的位置
   ;; 比较特殊，不参与排序，具体原因请参考 `pyim-page-select-word' 中的
@@ -155,22 +159,6 @@ IMOBJS 获得候选词条。"
,@znabc-words
,@pinyin-chars))
 
-(defun pyim-candidates-merge (list1 list2)
-  "将 LIST1 和 LIST2 合并。
-
-如果 list1 = (a b), list2 = (c d e),
-那么结果为: (a c b d e)."
-  (let ((list1 (delete-dups list1))
-(list2 (delete-dups list2))
-result)
-(while (and list1 list2)
-  (push (pop list1) result)
-  (push (pop list2) result))
-(if (or list1 list2)
-`(,@(nreverse result)
-  ,@(or list1 list2))
-  (nreverse result
-
 (defun pyim-candidates-create:shuangpin (imobjs _scheme-name &optional async)
   "`pyim-candidates-create' 处理双拼输入法的函数."
   (pyim-candidates-create:quanpin imobjs 'quanpin async))
diff --git a/pyim-common.el b/pyim-common.el
index 0452596..f794291 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -85,6 +85,18 @@
   append (mapcar (lambda (l) (cons element l))
  (pyim-permutate-list list-tail)))
 
+(defun pyim-zip (lists)
+  "Zip LISTS: ((a b c) (d e)) => (a d b e c)."
+  (let* ((n (apply #'max (mapcar #'length lists)))
+ (lists (mapcar
+ (lambda (x)
+   (append x (make-list (- n (length x)) nil)))
+ lists)))
+(flatten-tree
+ (apply #'cl-mapcar
+(lambda (&rest x) x)
+lists
+
 (defun pyim-char-before-to-string (num)
   "得到光标前第 `num' 个字符，并将其转换为字符串。"
   (let* ((point (point))

[elpa] externals/pyim f88d0d0 2/2: 优化智能ABC模式

[ELPA Syncer]

branch: externals/pyim
commit f88d0d09fc5f8cbe8bdc66bd6eada71dd76f0a6b
Author: Feng Shu 
Commit: Feng Shu 

优化智能ABC模式

* pyim-candidates.el (pyim-candidates-create:quanpin): 优化智能ABC模式。

* pyim-common.el (pyim-subconcat): New function.
(pyim-zip): the result delete dups.
---
 pyim-candidates.el | 19 ---
 pyim-common.el | 30 --
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index a05e483..8c81237 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -93,17 +93,14 @@ IMOBJS 获得候选词条。"
   (unless async
 (let (znabc-words pinyin-chars personal-words common-words)
   ;; 智能ABC模式，得到尽可能的拼音组合，查询这些组合，得到的词条做为联想词。
-  ;;
-  ;; NOTE: 智能ABC模式 *目前* 不处理模糊音，因为这个模式会进行大量的搜索，如
-  ;; 果再处理模糊音的话，有可能导致性能下降。
-  (let* ((codes (pyim-codes-create (car imobjs) scheme-name))
- (n (- (length codes) 1))
- output)
-(dotimes (i (- n 1))
-  (let ((lst (cl-subseq codes 0 (- n i
-(push (mapconcat #'identity lst "-") output)))
-(dolist (code (reverse output))
-  (setq znabc-words (append znabc-words (pyim-dcache-get code)
+  (let ((codes (mapcar (lambda (x)
+ (pyim-subconcat x "-"))
+   (mapcar (lambda (imobj)
+ (pyim-codes-create imobj scheme-name))
+   imobjs
+(setq znabc-words
+  (pyim-zip (mapcar #'pyim-dcache-get
+(pyim-zip codes)
 
   ;; 获取个人词条，词库词条和第一汉字列表。
   (dolist (imobj imobjs)
diff --git a/pyim-common.el b/pyim-common.el
index f794291..7b84473 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -86,16 +86,26 @@
  (pyim-permutate-list list-tail)))
 
 (defun pyim-zip (lists)
-  "Zip LISTS: ((a b c) (d e)) => (a d b e c)."
-  (let* ((n (apply #'max (mapcar #'length lists)))
- (lists (mapcar
- (lambda (x)
-   (append x (make-list (- n (length x)) nil)))
- lists)))
-(flatten-tree
- (apply #'cl-mapcar
-(lambda (&rest x) x)
-lists
+  "Zip LISTS and delete dups: ((a b c) (d e)) => (a d b e c)."
+  (when lists
+(let* ((n (apply #'max (mapcar #'length lists)))
+   (lists (mapcar
+   (lambda (x)
+ (append x (make-list (- n (length x)) nil)))
+   lists)))
+  (delete-dups
+   (flatten-tree
+(apply #'cl-mapcar
+   #'list lists))
+
+(defun pyim-subconcat (list &optional sep)
+  "Concat sublist of LIST with SEP: (a b c d) => (a-b-c a-b)."
+  (let ((n (- (length list) 1))
+output)
+(dotimes (i (- n 1))
+  (let ((list (cl-subseq list 0 (- n i
+(push (mapconcat #'identity list (or sep "-")) output)))
+(nreverse output)))
 
 (defun pyim-char-before-to-string (num)
   "得到光标前第 `num' 个字符，并将其转换为字符串。"

[elpa] externals-release/org db4805c: Backport commit 50b40e1d4 from Emacs

[ELPA Syncer]

branch: externals-release/org
commit db4805c2d79f4880fd162b34f5bea81d4a3a55b6
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 50b40e1d4 from Emacs

; * lisp/org/ob-julia.el: Fix Author header for authors.el.
50b40e1d4f0063ac78a53673736a2eaa3ba3287b
Stefan Kangas
Wed Dec 1 17:03:52 2021 +0100
---
 lisp/ob-julia.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index 4fae0d1..3176baf 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -1,7 +1,7 @@
 ;;; ob-julia.el --- org-babel functions for julia code evaluation  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
-;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison
+;; Authors: G. Jay Kerns
 ;; Maintainer: Pedro Bruel 
 ;; Keywords: literate programming, reproducible research, scientific computing
 ;; Homepage: https://github.com/phrb/ob-julia
@@ -24,6 +24,8 @@
 ;;; Commentary:
 
 ;; Org-Babel support for evaluating julia code
+;;
+;; Based on ob-R.el by Eric Schulte and Dan Davison.
 
 ;;; Code:
 (require 'cl-lib)

[elpa] externals/org ad53c54: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit ad53c5464564c15dcb5c0432105c322852585a98
Merge: 191552d db4805c
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'bugfix'
---
 lisp/ob-julia.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index 4fae0d1..3176baf 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -1,7 +1,7 @@
 ;;; ob-julia.el --- org-babel functions for julia code evaluation  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
-;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison
+;; Authors: G. Jay Kerns
 ;; Maintainer: Pedro Bruel 
 ;; Keywords: literate programming, reproducible research, scientific computing
 ;; Homepage: https://github.com/phrb/ob-julia
@@ -24,6 +24,8 @@
 ;;; Commentary:
 
 ;; Org-Babel support for evaluating julia code
+;;
+;; Based on ob-R.el by Eric Schulte and Dan Davison.
 
 ;;; Code:
 (require 'cl-lib)

[elpa] externals/pyim updated (137b2d3 -> f88d0d0)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  137b2d3   简化 pyim-candidates-create:quanpin
   new  8672b90   Add pyim-zip.
   new  f88d0d0   优化智能ABC模式


Summary of changes:
 pyim-candidates.el | 45 +++--
 pyim-common.el | 22 ++
 2 files changed, 37 insertions(+), 30 deletions(-)

[elpa] externals/pyim updated (f88d0d0 -> cc3ccde)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  f88d0d0   优化智能ABC模式
   new  24fe5f8   * pyim-common.el (pyim-zip): 优化速度。
   new  cc3ccde   * pyim-common.el (pyim-zip): 优化性能。


Summary of changes:
 pyim-common.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[elpa] externals/pyim cc3ccde 2/2: * pyim-common.el (pyim-zip): 优化性能。

[ELPA Syncer]

branch: externals/pyim
commit cc3ccde93f0a2e19e7941757d0083be914a2a283
Author: Feng Shu 
Commit: Feng Shu 

* pyim-common.el (pyim-zip): 优化性能。
---
 pyim-common.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyim-common.el b/pyim-common.el
index c6d327b..dd29d30 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -87,6 +87,7 @@
 
 (defun pyim-zip (lists)
   "Zip LISTS and delete dups: ((a b c) (d e)) => (a d b e c)."
+  (setq lists (remove nil lists))
   (if (< (length lists) 2)
   (car lists)
 (let* ((n (apply #'max (mapcar #'length lists)))

[elpa] externals/pyim 24fe5f8 1/2: * pyim-common.el (pyim-zip): 优化速度。

[ELPA Syncer]

branch: externals/pyim
commit 24fe5f88c7c857068d217939ce174fc7b6839278
Author: Feng Shu 
Commit: Feng Shu 

* pyim-common.el (pyim-zip): 优化速度。
---
 pyim-common.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyim-common.el b/pyim-common.el
index 7b84473..c6d327b 100644
--- a/pyim-common.el
+++ b/pyim-common.el
@@ -87,7 +87,8 @@
 
 (defun pyim-zip (lists)
   "Zip LISTS and delete dups: ((a b c) (d e)) => (a d b e c)."
-  (when lists
+  (if (< (length lists) 2)
+  (car lists)
 (let* ((n (apply #'max (mapcar #'length lists)))
(lists (mapcar
(lambda (x)