[nongnu] elpa/proof-general 3bbe326bf2: emacs 25 compatibility: don't use caddr or cadddr

[ELPA Syncer]

branch: elpa/proof-general
commit 3bbe326bf2789bea90eed563dfb2895c54a6e7df
Author: Hendrik Tews 
Commit: hendriktews 

emacs 25 compatibility: don't use caddr or cadddr
---
 coq/coq-smie.el| 4 ++--
 coq/coq.el | 2 +-
 generic/proof-shell.el | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/coq/coq-smie.el b/coq/coq-smie.el
index 6bd367e26b..d944e94958 100644
--- a/coq/coq-smie.el
+++ b/coq/coq-smie.el
@@ -1285,7 +1285,7 @@ If nil, default to `proof-indent' if it exists or to 
`smie-indent-basic'."
   (let* ((beg (if (listp (car parent)) (caar parent) (car parent)))
  (end (cadr parent))
  (regi (list (list beg end)))
- (tok (caddr parent))
+ (tok (car (cddr parent)))
  (face (cond
 ((equal num 1) 'hlt-regexp-level-1)
 ((equal num 2) 'hlt-regexp-level-2)
@@ -1306,7 +1306,7 @@ If nil, default to `proof-indent' if it exists or to 
`smie-indent-basic'."
(let* ((beg (if (listp (car parent)) (caar parent) (car parent)))
   (end (cadr parent))
   (regi (list (list beg end)))
-  ;; (tok (caddr parent))
+  ;; (tok (car (cddr parent)))
   (face (cond
  ((equal num 2) 'hlt-regexp-level-2)
  (t 'hlt-regexp-level-1
diff --git a/coq/coq.el b/coq/coq.el
index 34ea72c0b9..c8d92ca7e4 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -2761,7 +2761,7 @@ SPAN is the span of the whole theorem (statement + 
proof)."
 (when lproof-info
   (let* ((proof-pos (car lproof-info)) ;(proof-pos (match-beginning 0))
  (insert-point (cadr lproof-info)) ;(insert-point 
(match-beginning 1))
- (proof-end (caddr lproof-info))
+ (proof-end (cl-caddr lproof-info))
  (previous-string (buffer-substring insert-point proof-end))
  (previous-content (split-string previous-string))
  (suggested (span-property span 'dependencies))
diff --git a/generic/proof-shell.el b/generic/proof-shell.el
index 3e6d5ac03f..bdb7037f94 100644
--- a/generic/proof-shell.el
+++ b/generic/proof-shell.el
@@ -,8 +,8 @@ Argument QUEUEITEM must be an action item as documented 
for
 `proof-action-list'. Add flag 'priority-action to QUEUEITEM, such
 that priority items can be recognized and the order of added
 priority items can be preserved."
-  (let ((qi (list (car queueitem) (cadr queueitem) (caddr queueitem)
-  (cons 'priority-action (cadddr queueitem)
+  (let ((qi (list (car queueitem) (cadr queueitem) (cl-caddr queueitem)
+  (cons 'priority-action (cl-cadddr queueitem)
 (push qi proof-priority-action-list)
 (proof-start-prover-with-priority-items-maybe)))
 

[elpa] externals/vc-got 6fd5fa324a 1/2: fix vc-got--log with current got

[ELPA Syncer]

branch: externals/vc-got
commit 6fd5fa324a423b43b64c4a070230727d41c98b55
Author: Omar Polo 
Commit: Omar Polo 

fix vc-got--log with current got

'got log' changed the flag for doing searches from -s to -S (-s is now a
short format log).  Adapt vc-got--log to handle it using the newly
introduced vc-got--version<=.  While here rename vc-got--program-version
to vc-got--version.
---
 vc-got.el | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/vc-got.el b/vc-got.el
index 1c7735f345..436d1a0bf1 100755
--- a/vc-got.el
+++ b/vc-got.el
@@ -178,13 +178,22 @@ If nil, use the value of `vc-diff-switches'.  If t, use 
no switches."
   (when (version<= version emacs-version)
 `(progn ,@body)))
 
-(defun vc-got--program-version ()
+(defun vc-got--version ()
   "Return string representing the got version."
   (let (process-file-side-effects)
 (with-temp-buffer
   (vc-got--call "-V")
   (substring (buffer-string) 4 -1
 
+(defun vc-got--version<= (target)
+  "Compare the current version against TARGET.
+Takes care of handling the -current suffix."
+  (let* ((version-string (vc-got--version))
+ (current-version (string-replace "-current" "" version-string)))
+(when (version<= current-version target)
+  ;; let X.Y-current sort *after* X.Y
+  (string= version-string current-version
+
 (defun vc-got-root (file)
   "Return the work tree root for FILE, or nil."
   (vc-find-root file ".got"))
@@ -227,7 +236,13 @@ INCLUDE-DIFF: display the patch of modifications made in 
each commit.
 
 Return nil if the command failed or if PATH isn't included in any
 worktree."
-  (let ((process-file-side-effects nil))
+  (let* ((process-file-side-effects nil)
+ ;; got 0.71-current at some point switched to -S for search
+ ;; pattern and -s for the one-line format.
+ ;; XXX: remove in a few releases.
+ (search-flag (if (vc-got--version<= "0.71")
+  "-s"
+"-S")))
 (vc-got-with-worktree (or path default-directory)
   (when (zerop
  (save-excursion
@@ -235,7 +250,8 @@ worktree."
  (and limit (list "-l" (format "%s" limit)))
  (and start-commit (list "-c" start-commit))
  (and stop-commit (list "-x" stop-commit))
- (and search-pattern (list "-s" search-pattern))
+ (and search-pattern (list search-flag
+   search-pattern))
  (and reverse '("-R"))
  (and include-diff '("-p"))
  ;; "--"

[elpa] externals/vc-got 20cee209de 2/2: tag 1.1.2

[ELPA Syncer]

branch: externals/vc-got
commit 20cee209dece2d1a49daf68e043aa6e78b8a13e9
Author: Omar Polo 
Commit: Omar Polo 

tag 1.1.2

fix vc-log-search for got from latest -main branch and for future
versions.  `got log' changed the flag for search from -s to -S (-s is
now to select the short log format.)  Support for older got version will
be kept for the next few (got) releases.
---
 vc-got.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vc-got.el b/vc-got.el
index 436d1a0bf1..2221b68a98 100755
--- a/vc-got.el
+++ b/vc-got.el
@@ -6,7 +6,7 @@
 ;; Timo Myyrä 
 ;; URL: https://projects.omarpolo.com/vc-got.html
 ;; Keywords: vc tools
-;; Version: 1.1.1
+;; Version: 1.1.2
 ;; Package-Requires: ((emacs "25.1"))
 
 ;; This program is free software; you can redistribute it and/or modify

[elpa] externals/pyim cdff979715 2/3: Remove pyim-dcache-search-word-code

[ELPA Syncer]

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

Remove pyim-dcache-search-word-code
---
 pyim-cstring.el|  2 +-
 pyim-dcache.el |  4 
 pyim-dhashcache.el |  5 -
 pyim-dregcache.el  | 61 +-
 4 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/pyim-cstring.el b/pyim-cstring.el
index 7e9dbff6ba..5127f5993f 100644
--- a/pyim-cstring.el
+++ b/pyim-cstring.el
@@ -182,7 +182,7 @@ BUG: 当 STRING 中包含其它标点符号，并且设置 SEPERATER 时，结
 (mapcar (lambda (x)
   (when (string-prefix-p prefix x)
 (string-remove-prefix prefix x)))
-(sort (cl-copy-list (pyim-dcache-search-word-code string))
+(sort (cl-copy-list (pyim-dcache-get string '(word2code)))
   (lambda (a b)
 (> (length a) (length b))
(codes (remove nil dcache-codes)))
diff --git a/pyim-dcache.el b/pyim-dcache.el
index 063d8fd5c9..12946a0fa7 100644
--- a/pyim-dcache.el
+++ b/pyim-dcache.el
@@ -221,10 +221,6 @@ dcache.
 (cl-defmethod pyim-dcache-get :before (_code &optional _from)
   (pyim-dcache-load-backend))
 
-;; ** Dcache 代码反查功能接口
-(cl-defgeneric pyim-dcache-search-word-code (word)
-  "从 dcache 中搜索 WROD 对应的 code.")
-
 ;; ** Dcache 加词功能接口
 (cl-defgeneric pyim-dcache-insert-word (word code prepend)
   "将词条 WORD 插入到 dcache 中。
diff --git a/pyim-dhashcache.el b/pyim-dhashcache.el
index 68a6a86380..4ba5884225 100644
--- a/pyim-dhashcache.el
+++ b/pyim-dhashcache.el
@@ -130,11 +130,6 @@
 (setq result (append result value)
   result)))
 
-;; ** 从 dhashcache 搜索代码相关函数
-(cl-defmethod pyim-dcache-search-word-code
-  (string &context ((pyim-dcache-backend) (eql pyim-dhashcache)))
-  (gethash string pyim-dhashcache-word2code))
-
 ;; ** 给 dhashcache 添加词条相关函数
 (cl-defmethod pyim-dcache-insert-word
   (word code prepend
diff --git a/pyim-dregcache.el b/pyim-dregcache.el
index c4e492297c..06641c023e 100644
--- a/pyim-dregcache.el
+++ b/pyim-dregcache.el
@@ -68,23 +68,35 @@
 (cond ((or (memq 'icode2word from)
(memq 'ishortcode2word from))
(pyim-dregcache-get-icode2word-ishortcode2word key))
+  ((or (not from)
+   (memq 'code2word from)
+   (memq 'shortcode2word from))
+   (pyim-dregcache-get-code2word-shortcode2word key))
   ;; FIXME: pyim-dregcache 暂时不支持 iword2count-recent-10-words 和
   ;; iword2count-recent-50-words.
   ((or (memq 'iword2count-recent-10-words from)
(memq 'iword2count-recent-50-words from))
nil)
-  (t (let ((dict-files (pyim-dregcache-all-dict-files))
-   result)
-
-   (when pyim-debug (message "pyim-dregcache-get is called. 
key=%s" key))
-   (when dict-files
- (dolist (file dict-files)
-   (let* ((file-info (lax-plist-get pyim-dregcache-cache file))
-  (content (pyim-dregcache-get-content key file-info)))
- (setq result (append (pyim-dregcache-get-1 content key) 
result)
-   ;; `push' plus `nreverse' is more efficient than `add-to-list'
-   ;; Many examples exist in Emacs' own code
-   (nreverse result))
+  ;; pyim-dregcache 目前只能用于全拼输入法，而 pyim 中全拼输入法代码反查
+  ;; 功能是通过 pymap 相关函数实现的，不使用 word2code.
+  ((memq 'word2code from)
+   nil)
+  (t nil
+
+(defun pyim-dregcache-get-code2word-shortcode2word (code)
+  (when pyim-debug (message "pyim-dregcache-get-code2word-shortcode2word 
called => %s" code))
+  (let ((dict-files (pyim-dregcache-all-dict-files))
+result)
+
+(when pyim-debug (message "pyim-dregcache-get is called. code=%s" code))
+(when dict-files
+  (dolist (file dict-files)
+(let* ((file-info (lax-plist-get pyim-dregcache-cache file))
+   (content (pyim-dregcache-get-content code file-info)))
+  (setq result (append (pyim-dregcache-get-1 content code) result)
+;; `push' plus `nreverse' is more efficient than `add-to-list'
+;; Many examples exist in Emacs' own code
+(nreverse result)))
 
 (defun pyim-dregcache-get-icode2word-ishortcode2word (code)
   "以 CODE 搜索个人词和个人联想词.  正则表达式搜索词库,不需要为联想词开单独缓存."
@@ -191,31 +203,6 @@
 ;; fetch segment using the first character of pinyin code
 (nth idx rlt)))
 
-;; ** 从 dregcache 搜索代码相关函数
-(cl-defmethod pyim-dcache-search-word-code
-  (word &context ((pyim-dcache-backend) (eql pyim-dregcache)))
-  "从 `pyim-dregcache-cache' 和 `pyim-dregcache-icode2word' 搜索 word, 得到对应的code."
-  (when pyim-debug (message "pyim-dregcache-search-word-code word=%s" word))
-  (when pyim-dregcache-cache
-(catch 'result
-  (let ((dict-files (pyim-dregcache-all-dict-files))
-code)
-(when pyim-dregcache-icode2word

[elpa] externals/cape 913f68859d: cape-super-capf: Get rid of caching

[ELPA Syncer]

branch: externals/cape
commit 913f68859d0cf6a02a71ddde48bc8454564a2efd
Author: Daniel Mendler 
Commit: Daniel Mendler 

cape-super-capf: Get rid of caching

The caching should be unnecessary.
---
 cape.el | 48 ++--
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/cape.el b/cape.el
index c54e5def15..6d39c05674 100644
--- a/cape.el
+++ b/cape.el
@@ -521,13 +521,11 @@ If INTERACTIVE is nil the function acts like a Capf."
   (lambda ()
 (when-let (results (delq nil (mapcar #'funcall capfs)))
   (pcase-let* ((`((,beg ,end . ,_)) results)
-   (cache-candidates nil)
-   (cache-filter nil)
-   (cache-ht (make-hash-table :test #'equal))
+   (cand-ht (make-hash-table :test #'equal))
(extra-fun
 (lambda (prop)
   (lambda (cand &rest args)
-(when-let (fun (plist-get (gethash cand cache-ht) 
prop))
+(when-let (fun (plist-get (gethash cand cand-ht) prop))
   (apply fun cand args)
(tables nil)
(prefix-len nil))
@@ -552,28 +550,26 @@ If INTERACTIVE is nil the function acts like a Capf."
   (display-sort-function . identity)
   (cycle-sort-function . identity)))
   ('t
-   (let ((filter (list str (copy-sequence 
completion-regexp-list) completion-ignore-case)))
- (unless (equal filter cache-filter)
-   (let ((ht (make-hash-table :test #'equal))
- (candidates nil))
- (cl-loop for (table . plist) in tables do
-  (let* ((pr (plist-get plist :predicate))
- (md (completion-metadata "" table pr))
- (sort (or (completion-metadata-get md 
'display-sort-function)
-   #'identity))
- (cands (funcall sort (all-completions 
str table pr
-(cl-loop for cell on cands
- for cand = (car cell) do
- (if (eq (gethash cand ht t) t)
- (puthash cand plist ht)
-   (setcar cell nil)))
-(setq candidates (nconc candidates 
cands
- (setq cache-filter filter
-   cache-candidates (delq nil candidates)
-   cache-ht ht
-   (if pred
-   (cl-loop for x in cache-candidates if (funcall pred x) 
collect x)
- (copy-sequence cache-candidates)))
+   (let ((ht (make-hash-table :test #'equal))
+ (candidates nil))
+ (cl-loop for (table . plist) in tables do
+  (let* ((pr (if-let (pr (plist-get plist 
:predicate))
+ (if pred
+ (lambda (x) (and (funcall 
pred x) (funcall pr x)))
+   pr)
+   pred))
+ (md (completion-metadata "" table pr))
+ (sort (or (completion-metadata-get md 
'display-sort-function)
+   #'identity))
+ (cands (funcall sort (all-completions str 
table pr
+(cl-loop for cell on cands
+ for cand = (car cell) do
+ (if (eq (gethash cand ht t) t)
+ (puthash cand plist ht)
+   (setcar cell nil)))
+(setq candidates (nconc candidates cands
+ (setq cand-ht ht)
+ candidates))
   (_
(completion--some
 (pcase-lambda (`(,table . ,plist))

[elpa] externals/pyim 38efab117f 3/3: * pyim-dcache.el (pyim-dcache-get): Fix docstring.

[ELPA Syncer]

branch: externals/pyim
commit 38efab117f0dc47087d3e427923c4a87bd9b6489
Author: Feng Shu 
Commit: Feng Shu 

* pyim-dcache.el (pyim-dcache-get): Fix docstring.
---
 pyim-dcache.el | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyim-dcache.el b/pyim-dcache.el
index 12946a0fa7..bc0c9dee64 100644
--- a/pyim-dcache.el
+++ b/pyim-dcache.el
@@ -205,17 +205,17 @@ dcache.
 
 * 编码 -> 词条
 1. code2word 用编码搜索词条
-3. icode2word用编码搜索个人词条
-4. ishortcode2word   用简码搜索个人词条
-7. shortcode2word用简码搜索个人词条
+2. icode2word用编码搜索个人词条
+3. ishortcode2word   用简码搜索个人词条
+4. shortcode2word用简码搜索个人词条
 
 * 词条 -> 编码
-2. word2code 用词条搜索编码
+1. word2code 用词条搜索编码
 
 * 词条 -> 词频
-3. iword2count   用个人词条搜索编码
-4. iword2count-recent-10-words   搜索最近输入10个词的词频
-5. iword2count-recent-50-words   搜索最近输入50个词的词频"
+1. iword2count   用个人词条搜索编码
+2. iword2count-recent-10-words   搜索最近输入10个词的词频
+3. iword2count-recent-50-words   搜索最近输入50个词的词频"
   nil)
 
 (cl-defmethod pyim-dcache-get :before (_code &optional _from)

[elpa] externals/vertico afd1e1bb09: Use minibuffer-contents without properties

[ELPA Syncer]

branch: externals/vertico
commit afd1e1bb092d2225bb28fc32c03c41d187977fee
Author: Daniel Mendler 
Commit: Daniel Mendler 

Use minibuffer-contents without properties
---
 vertico.el | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vertico.el b/vertico.el
index db55785007..d8b304f72d 100644
--- a/vertico.el
+++ b/vertico.el
@@ -602,7 +602,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and 
PRED."
   "Exhibit completion UI."
   (let* ((buffer-undo-list t) ;; Overlays affect point position and undo list!
  (pt (max 0 (- (point) (minibuffer-prompt-end
- (content (minibuffer-contents)))
+ (content (minibuffer-contents-no-properties)))
 (unless (or (input-pending-p) (equal vertico--input (cons content pt)))
   (vertico--update-candidates pt content))
 (vertico--prompt-selection)
@@ -728,7 +728,7 @@ When the prefix argument is 0, the group order is reset."
 
 (defun vertico--candidate (&optional hl)
   "Return current candidate string with optional highlighting if HL is 
non-nil."
-  (let ((content (substring (or (car-safe vertico--input) 
(minibuffer-contents)
+  (let ((content (substring (or (car-safe vertico--input) 
(minibuffer-contents-no-properties)
 (cond
  ((>= vertico--index 0)
   (let ((cand (substring (nth vertico--index vertico--candidates
@@ -739,8 +739,7 @@ When the prefix argument is 0, the group order is reset."
 (concat vertico--base
 (if hl (car (funcall vertico--highlight-function (list cand))) 
cand
  ((and (equal content "") (or (car-safe minibuffer-default) 
minibuffer-default)))
- (t (vertico--remove-face 0 (length content) 'vertico-current content) ;; 
Remove prompt face
-content
+ (t content
 
 (defun vertico--setup ()
   "Setup completion UI."

[elpa] externals/vc-got updated (d009a36e09 -> 20cee209de)

[ELPA Syncer]

elpasync pushed a change to branch externals/vc-got.

  from  d009a36e09 ignore files created by elpa
   new  6fd5fa324a fix vc-got--log with current got
   new  20cee209de tag 1.1.2


Summary of changes:
 vc-got.el | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)

[elpa] externals/pyim updated (2b33a80561 -> 38efab117f)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  2b33a80561 * pyim-candidates.el 
(pyim-candidates-create-limit-time): Do not use cl-call-next-method.
   new  b22b27a131 Update pyim-dcache-get docstring
   new  cdff979715 Remove pyim-dcache-search-word-code
   new  38efab117f * pyim-dcache.el (pyim-dcache-get): Fix docstring.


Summary of changes:
 pyim-cstring.el|  2 +-
 pyim-dcache.el | 26 +--
 pyim-dhashcache.el | 21 +---
 pyim-dregcache.el  | 73 +++---
 4 files changed, 56 insertions(+), 66 deletions(-)

[elpa] externals/pyim b22b27a131 1/3: Update pyim-dcache-get docstring

[ELPA Syncer]

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

Update pyim-dcache-get docstring
---
 pyim-dcache.el | 22 ++
 pyim-dhashcache.el | 16 ++--
 pyim-dregcache.el  | 18 ++
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/pyim-dcache.el b/pyim-dcache.el
index 0d3a011f5b..063d8fd5c9 100644
--- a/pyim-dcache.el
+++ b/pyim-dcache.el
@@ -197,11 +197,25 @@ AUTO-BACKUP-THRESHOLD 倍, 那么原值将自动备份到 FILE 对应的备份
   (pyim-dcache-load-backend))
 
 ;; ** Dcache 检索词条功能接口
-(cl-defgeneric pyim-dcache-get (_code &optional _from)
-  "从 FROM 对应的 dcache 中搜索 CODE, 得到对应的词条.
+(cl-defgeneric pyim-dcache-get (_key &optional _from)
+  "从 FROM 中搜索 KEY, 得到对应的取值.
 
-当词库文件加载完成后，pyim 就可以用这个函数从词库缓存中搜索某个
-code 对应的中文词条了."
+FORM 是一个包含下面几个符号的 list, 每个符号代表一种类型的
+dcache.
+
+* 编码 -> 词条
+1. code2word 用编码搜索词条
+3. icode2word用编码搜索个人词条
+4. ishortcode2word   用简码搜索个人词条
+7. shortcode2word用简码搜索个人词条
+
+* 词条 -> 编码
+2. word2code 用词条搜索编码
+
+* 词条 -> 词频
+3. iword2count   用个人词条搜索编码
+4. iword2count-recent-10-words   搜索最近输入10个词的词频
+5. iword2count-recent-50-words   搜索最近输入50个词的词频"
   nil)
 
 (cl-defmethod pyim-dcache-get :before (_code &optional _from)
diff --git a/pyim-dhashcache.el b/pyim-dhashcache.el
index 1a4250ec56..68a6a86380 100644
--- a/pyim-dhashcache.el
+++ b/pyim-dhashcache.el
@@ -106,16 +106,12 @@
 
 ;; ** 从 dhashcache 搜索词条相关函数
 (cl-defmethod pyim-dcache-get
-  (code &context ((pyim-dcache-backend) (eql pyim-dhashcache))
-&optional from)
-  "从 FROM 对应的 dcaches 中搜索 CODE, 得到对应的词条.
+  (key &context ((pyim-dcache-backend) (eql pyim-dhashcache))
+   &optional from)
+  "从 FROM 中搜索 key, 得到对应的结果。
 
-当词库文件加载完成后，pyim 就可以用这个函数从词库缓存中搜索某个
-code 对应的中文词条了。
-
-如果 FROM 为 nil, 则默认搜索 `pyim-dhashcache-icode2word' 和
-`pyim-dhashcache-code2word' 两个 dcache."
-  (when code
+用于 pyim-dhashcache 类型的 dcache 后端。"
+  (when key
 (let* ((caches (mapcar (lambda (x)
  (intern (concat "pyim-dhashcache-" (symbol-name 
x
(or (and from
@@ -126,7 +122,7 @@ code 对应的中文词条了。
result)
   (dolist (cache caches)
 (let* ((cache (ignore-errors (symbol-value cache)))
-   (value (and cache (gethash code cache
+   (value (and cache (gethash key cache
   ;; 处理 iword2count.
   (unless (listp value)
 (setq value (list value)))
diff --git a/pyim-dregcache.el b/pyim-dregcache.el
index e5418a745f..c4e492297c 100644
--- a/pyim-dregcache.el
+++ b/pyim-dregcache.el
@@ -59,13 +59,15 @@
 
 ;; ** 从 dregcache 搜索词条相关函数
 (cl-defmethod pyim-dcache-get
-  (code &context ((pyim-dcache-backend) (eql pyim-dregcache))
-&optional from)
-  "从 `pyim-dregcache-cache' 搜索 CODE, 得到对应的词条."
-  (when code
+  (key &context ((pyim-dcache-backend) (eql pyim-dregcache))
+   &optional from)
+  "从 FROM 中搜索 KEY, 得到对应的结果。
+
+用于 pyim-dregcache 类型的 dcache 后端。"
+  (when key
 (cond ((or (memq 'icode2word from)
(memq 'ishortcode2word from))
-   (pyim-dregcache-get-icode2word-ishortcode2word code))
+   (pyim-dregcache-get-icode2word-ishortcode2word key))
   ;; FIXME: pyim-dregcache 暂时不支持 iword2count-recent-10-words 和
   ;; iword2count-recent-50-words.
   ((or (memq 'iword2count-recent-10-words from)
@@ -74,12 +76,12 @@
   (t (let ((dict-files (pyim-dregcache-all-dict-files))
result)
 
-   (when pyim-debug (message "pyim-dregcache-get is called. 
code=%s" code))
+   (when pyim-debug (message "pyim-dregcache-get is called. 
key=%s" key))
(when dict-files
  (dolist (file dict-files)
(let* ((file-info (lax-plist-get pyim-dregcache-cache file))
-  (content (pyim-dregcache-get-content code 
file-info)))
- (setq result (append (pyim-dregcache-get-1 content code) 
result)
+  (content (pyim-dregcache-get-content key file-info)))
+ (setq result (append (pyim-dregcache-get-1 content key) 
result)
;; `push' plus `nreverse' is more efficient than `add-to-list'
;; Many examples exist in Emacs' own code
(nreverse result))

[elpa] externals/lin a8dd37fa19: Add link to Christian Tietze's blog on Lin+Neotree

[ELPA Syncer]

branch: externals/lin
commit a8dd37fa19456f5fc283b80b7b21383ee3c7e450
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add link to Christian Tietze's blog on Lin+Neotree

Read thread on the mailing list:


---
 README.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.org b/README.org
index 2bcf647295..1286ca701e 100644
--- a/README.org
+++ b/README.org
@@ -206,6 +206,9 @@ Everything is in place to set up the package.
 (lin-global-mode 1)
 #+end_src
 
+Check out Christian Tietze's blog post on integrating Lin with Neotree:
+.
+
 * Acknowledgements
 :PROPERTIES:
 :CUSTOM_ID: h:0f80e78f-d6b3-42cd-8e49-7ac47fd2fa96

[elpa] externals/org 1425a86ae7: org.el: With an active region, act with latex-preview

[ELPA Syncer]

branch: externals/org
commit 1425a86ae74556c44f5cf14dd8bacc7f89012bea
Author: Sébastien Miquel 
Commit: Daniel Fleischer 

org.el: With an active region, act with latex-preview

* lisp/org.el (org-latex-preview): With an active region, display
images for all fragments in the region. With universal prefix
argument, remove all images in the region.
---
 lisp/org.el | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index ac94fb6142..080962cdb1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15316,7 +15316,8 @@ BEG and END are buffer positions."
 If the cursor is on a LaTeX fragment, create the image and
 overlay it over the source code, if there is none.  Remove it
 otherwise.  If there is no fragment at point, display images for
-all fragments in the current section.
+all fragments in the current section.  With an active region,
+display images for all fragments in the region.
 
 With a `\\[universal-argument]' prefix argument ARG, clear images \
 for all fragments
@@ -15344,10 +15345,18 @@ fragments in the buffer."
;; Clear current section.
((equal arg '(4))
 (org-clear-latex-preview
- (if (org-before-first-heading-p) (point-min)
-   (save-excursion
-(org-with-limited-levels (org-back-to-heading t) (point
- (org-with-limited-levels (org-entry-end-position
+ (if (use-region-p)
+ (region-beginning)
+   (if (org-before-first-heading-p) (point-min)
+ (save-excursion
+  (org-with-limited-levels (org-back-to-heading t) (point)
+ (if (use-region-p)
+ (region-end)
+   (org-with-limited-levels (org-entry-end-position)
+   ((use-region-p)
+(message "Creating LaTeX previews in region...")
+(org--latex-preview-region (region-beginning) (region-end))
+(message "Creating LaTeX previews in region... done."))
;; Toggle preview on LaTeX code at point.
((let ((datum (org-element-context)))
   (and (memq (org-element-type datum) '(latex-environment latex-fragment))

[elpa] externals/cape 86a1df6cba: cape-super-capf: Fix nil error (See #45)

[ELPA Syncer]

branch: externals/cape
commit 86a1df6cbacd0e05b801208f83be5ca6c1cc8cec
Author: Daniel Mendler 
Commit: Daniel Mendler 

cape-super-capf: Fix nil error (See #45)
---
 cape.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cape.el b/cape.el
index 6d39c05674..c6db8133f9 100644
--- a/cape.el
+++ b/cape.el
@@ -555,7 +555,7 @@ If INTERACTIVE is nil the function acts like a Capf."
  (cl-loop for (table . plist) in tables do
   (let* ((pr (if-let (pr (plist-get plist 
:predicate))
  (if pred
- (lambda (x) (and (funcall 
pred x) (funcall pr x)))
+ (lambda (x) (and (funcall pr 
x) (funcall pred x)))
pr)
pred))
  (md (completion-metadata "" table pr))
@@ -569,7 +569,7 @@ If INTERACTIVE is nil the function acts like a Capf."
(setcar cell nil)))
 (setq candidates (nconc candidates cands
  (setq cand-ht ht)
- candidates))
+ (delq nil candidates)))
   (_
(completion--some
 (pcase-lambda (`(,table . ,plist))
@@ -577,7 +577,7 @@ If INTERACTIVE is nil the function acts like a Capf."
action table str
(if-let (pr (plist-get plist :predicate))
(if pred
-   (lambda (x) (and (funcall pred x) (funcall pr 
x)))
+   (lambda (x) (and (funcall pr x) (funcall pred 
x)))
  pr)
  pred)))
 tables

[elpa] externals/org 3825ca6ccb: Fix make doc failure introduced by 93821b431

[ELPA Syncer]

branch: externals/org
commit 3825ca6ccb39a7926261c7a25191dc563de90761
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Fix make doc failure introduced by 93821b431

* lisp/org-element.el (org-element--cache-for-removal): Parse
secondary :title value required by exporter.

See 
https://list.orgmode.org/87mtek1t63.fsf...@gmail.com/T/#md63481c471181c96dfb6248c1551fba219b11f30
---
 lisp/org-element.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index f1a45a1af8..59a7fd461b 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -6916,7 +6916,7 @@ known element in cache (it may start after END)."
   (let ((current (org-with-point-at 
(org-element-property :begin up)
(org-element-with-disabled-cache
  (and (looking-at-p 
org-element-headline-re)
-  (org-element-headline-parser 
nil t))
+  
(org-element-headline-parser))
 (when (eq 'headline (org-element-type current))
   (org-element--cache-log-message
"Found non-robust headline that can be updated 
individually: %S"

[elpa] externals/sql-cassandra 3e997c6ad8: Fix prompt-regexp

[Filipp Gunbin]

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

Fix prompt-regexp
---
 sql-cassandra.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql-cassandra.el b/sql-cassandra.el
index e1aec871b3..c23a5a4c9f 100644
--- a/sql-cassandra.el
+++ b/sql-cassandra.el
@@ -5,7 +5,7 @@
 ;; Author: Filipp Gunbin 
 ;; Maintainer: Filipp Gunbin 
 ;; Package-Requires: ((emacs "29"))
-;; Version: 0.2.1
+;; Version: 0.2.2
 ;; Keywords: sql, cassandra, cql, cqlsh
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -167,7 +167,7 @@ Refer to 
https://cassandra.apache.org/doc/latest/cassandra/cql/appendices.html#a
  :sqli-comint-func #'sql-comint-cassandra
  :list-all "describe tables"
  :list-table "describe table %s"
- :prompt-regexp "^cqlsh:[[:alnum:]_]*> "
+ :prompt-regexp "^\\(?:[[:alnum:]_]+@\\)?cqlsh:[[:alnum:]_]*> "
  :prompt-cont-regexp "^ +\\.\\{3\\} "
  :syntax-alist '(;; map / set / udt literals
 (?{ . "(") (?} . ")")

[elpa] externals/fontaine e18cc2e2a6: Fix bug with incorrect bold height for FRAME arg

[ELPA Syncer]

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

Fix bug with incorrect bold height for FRAME arg

Thanks to Terry F. Torrey for reporting the issue on the mailing list:


---
 README.org  | 3 ++-
 fontaine.el | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index 8323ab5a23..a819a3b3f0 100644
--- a/README.org
+++ b/README.org
@@ -528,7 +528,8 @@ Fontaine is meant to be a collective effort.  Every bit of 
help matters.
 
 + Author/maintainer :: Protesilaos Stavrou.
 
-+ Contributions to the code or manual :: Christopher League, Eli Zaretskii.
++ Contributions to the code or manual :: Christopher League, Eli
+  Zaretskii, Terry F. Torrey.
 
 + Ideas and user feedback :: Ted Reed.
 
diff --git a/fontaine.el b/fontaine.el
index d88eff9496..510aa94fc8 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -5,7 +5,7 @@
 ;; Author: Protesilaos Stavrou 
 ;; URL: https://git.sr.ht/~protesilaos/fontaine
 ;; Mailing list: https://lists.sr.ht/~protesilaos/fontaine
-;; Version: 0.2.2
+;; Version: 0.2.3
 ;; Package-Requires: ((emacs "27.1"))
 
 ;; This file is NOT part of GNU Emacs.
@@ -414,6 +414,7 @@ ARGS are its routines."
'bold
(or (plist-get properties :bold-family) 'unspecified)
(or (plist-get properties :bold-weight) 'bold)
+   (or (plist-get properties :variable-pitch-height) 1.0)
frame))
 
 (fontaine--apply-preset

[nongnu] elpa/git-commit dbb2e9c8de: Update release notes

[ELPA Syncer]

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

Update release notes

When I am undecided whether to mention a certain commit, then
represent it with a line of the form "HASH SUMMARY" for now.
---
 docs/RelNotes/3.4.0.org | 179 ++--
 1 file changed, 175 insertions(+), 4 deletions(-)

diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org
index 88c335996f..9e9db19891 100644
--- a/docs/RelNotes/3.4.0.org
+++ b/docs/RelNotes/3.4.0.org
@@ -3,15 +3,48 @@
 ** Changes since v3.3.0
 
 - Added new function ~git-commit-turn-on-orglink~ intended for use in
-  ~git-commit-setup-hook~.
+  ~git-commit-setup-hook~.  d122f15edd
+
+- ~git-commit.el~ no longer depends on ~dash~.  bb7b7a4020
+
+7a94132384 Rename magit-keep-region-overlay to 
magit-section-keep-region-overlay
 
 - Some repository and submodule list columns got a bit fancier.
+  3f3980735f 451438dc90
 
 - Refreshing a repository or submodule list buffer now restores the
-  previous position.
+  previous position.  1feda0cb1c
+
+ceab3124fb magit-submodule-list-predicate: New variable
 
 - Added new face ~git-rebase-action~ to allow customization of the face
-  used for the action words in git-rebase-todo files.
+  used for the action words in git-rebase-todo files.  #4544
+
+6da7771b61 magit-faces: Add diff-refine-{added,removed}
+
+- When invoked with a prefix argument ~magit-fetch-modules~ now acts as a
+  transient prefix command.  fd5b9eadf3
+
+- Added new face ~magit-branch-warning~ and improved related faces.
+  bf3bcbe051 ff
+
+dfe3d03a14 git-commit-save-message: Report whether message was saved
+
+- Added new commands ~git-commit-search-message-backward~ and
+  ~git-commit-search-message-forward~.  #4537
+
+- Make use of ~with-connection-local-variables~, and for older Emacsen
+  use a stripped down implementation. #4568
+
+- Added new functions ~version>~ and ~version=~ using the names
+  ~magit-version>~ and ~magit-version=~.  My brain is too small to always
+  get yoda conditions right, while the Emacs maintainers have huge
+  brains and as a consequence have rejected the addition of these
+  functions on grounds of them being unnecessary.  I don't want to
+  make such mistakes anymore, so I am forced to define these functions
+  myself.  I guess this makes me a Sith.  c8c2efd014
+
+- Added new command ~magit-log-related~.  c33ed664e6
 
 - New transient ~magit-sparse-checkout~ provides an interface to the
   ~git sparse-checkout~ command, introduced in Git v2.25.  #4102
@@ -24,12 +57,104 @@
   default) to support partial cloning, a feature that is available as
   of Git v2.17.  #4102
 
+- Added new command ~magit-stash-push~, which allows specifying a list of
+  files to be stashed.  #4583
+
+- Added some forward compatibility for SHA-256.  #4585
+
+429d5c55e8 magit-tag-release: Use version from HEAD's message if appropriate
+
+- Added new face ~magit-section-child-count~.  #4599
+
+- Improved version display and sorting in repository list buffers.
+  53199f2dd5, 68be0584f4
+
+- Added support for marking repositories in repository list buffers
+  and acting on the marked repositories.  #4453
+
+- Improved internals of the version/feature check caches.  On the user
+  visible side, teach ~magit-zap-caches~ to zap everything, when invoked
+  with a prefix argument.  #4603
+
+- Rewrote Imenu support, which resulted in a few new features and much
+  less code.  4727dcbe22 ff
+
+- For performance reasons the "margin" style sadly had to be removed
+  from ~magit-blame-styles~.  608242086e
+
+- When blaming, neighboring chunks about the same commit are not
+  combined into just one chunk.  #4030
+
+- Added new command ~magit-git-mergetool~.  #4128
+
+- Taught ~magit-diff-dwim~ about commits of submodules shown in the status
+  buffer of the super-repository.  #4151
+
 - A cherry pick or revert can now be continued when there are unstaged
   changes as long as there are no unresolved conflicts, a behavior
   that more closely matches the command line behavior.  #4615
 
+- For the longest time (which is why I don't consider this a bug fix)
+  toggling a section caused point to move to the beginning of that
+  section.  Stop doing that unless absolutely necessary.  9d8d5e5603
+
+70b34f08ab Increase use of section type, keymap and binding inheritance
+
+- Sections can now be expanded and collapsed by double-clicking on the
+  section heading or by clicking on the left margin.  949b4a47a4
+
+- The menu-bar menu, which was severally neglected for many years,
+  finally got a makeover.  It no longer offers a completely random
+  subset of Magit's features.  Now it can be used to invoke most of
+  the commands that could also be invoked using ~magit-dispatch~; but
+  by means of a small furry animal.  5641d3749c
+
+- Added many context menus, which can be invoked using the mouse or
+  a key (~menu~ by default) and are a grea

[nongnu] elpa/magit updated (2dfeaa6839 -> dbb2e9c8de)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  2dfeaa6839 magit-commit-diff-1: Use different heuristics
  adds  dbb2e9c8de Update release notes

No new revisions were added by this update.

Summary of changes:
 docs/RelNotes/3.4.0.org | 179 ++--
 1 file changed, 175 insertions(+), 4 deletions(-)

[nongnu] elpa/magit-section updated (2dfeaa6839 -> dbb2e9c8de)

[ELPA Syncer]

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

  from  2dfeaa6839 magit-commit-diff-1: Use different heuristics
  adds  dbb2e9c8de Update release notes

No new revisions were added by this update.

Summary of changes:
 docs/RelNotes/3.4.0.org | 179 ++--
 1 file changed, 175 insertions(+), 4 deletions(-)

[elpa] externals/pyim 88f65f16cf: * pyim-dhashcache.el (pyim-dhashcache-upgrade-icode2word): Fixed.

[ELPA Syncer]

branch: externals/pyim
commit 88f65f16cf9c98425c63d9be84c54733442d4ca5
Author: Feng Shu 
Commit: Feng Shu 

* pyim-dhashcache.el (pyim-dhashcache-upgrade-icode2word): Fixed.
---
 pyim-dhashcache.el  | 53 ++---
 pyim-liberime.el|  1 -
 pyim-scheme.el  | 16 
 tests/pyim-tests.el | 17 +
 4 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/pyim-dhashcache.el b/pyim-dhashcache.el
index 4ba5884225..d4ff1093a1 100644
--- a/pyim-dhashcache.el
+++ b/pyim-dhashcache.el
@@ -642,37 +642,44 @@ pyim 使用的词库文件是简单的文本文件，编码 *强制* 为 \\='utf
 
 当前已有的功能：
 1. 基于 :code-prefix-history 信息，升级为新的 code-prefix。"
-  (pyim-dhashcache-upgrade-icode2word))
+  (pyim-dhashcache-upgrade-icode2word
+   (yes-or-no-p "Delete old key after upgrade? ")))
 
-(defun pyim-dhashcache-upgrade-icode2word ()
+(defun pyim-dhashcache-upgrade-icode2word (&optional delete-old-key)
   "升级 icode2word 缓存。"
-  (let ((delete-old-key-p (yes-or-no-p "Delete old key after upgrade? "))
-(ruler-list (delete-dups
- (remove nil
- (mapcar
-  (lambda (scheme)
-(let ((code-prefix (plist-get (cdr scheme) 
:code-prefix))
-  (code-prefix-history (plist-get (cdr 
scheme) :code-prefix-history)))
-  (when code-prefix-history
-(cons code-prefix-history code-prefix
-  pyim-schemes)
-(dolist (ruler ruler-list)
-  (let ((old-prefix-list (car ruler))
-(new-prefix (cdr ruler)))
-(dolist (old-prefix old-prefix-list)
-  (maphash
-   (lambda (key _value)
- (when (string-prefix-p old-prefix key)
+  (dolist (ruler (pyim-dhashcache-upgrade-icode2word-rulers))
+(let ((old-prefix-list (car ruler))
+  (new-prefix (cdr ruler)))
+  (dolist (old-prefix old-prefix-list)
+(maphash
+ (lambda (key _value)
+   (if (string-prefix-p old-prefix key)
(let* ((key-words (gethash key pyim-dhashcache-icode2word))
   (new-key (concat new-prefix (string-remove-prefix 
old-prefix key)))
   (new-key-words (gethash new-key 
pyim-dhashcache-icode2word))
   (merged-value (delete-dups `(,@new-key-words 
,@key-words
  (puthash new-key merged-value pyim-dhashcache-icode2word)
- (message "PYIM icode2word upgrade: %S %S -> %S %S" key 
key-words new-key merged-value)
- (when delete-old-key-p
+ (message "PYIM: %S %S -> %S %S in 
`pyim-dhashcache-icode2word'."
+  key key-words new-key merged-value)
+ (when delete-old-key
(remhash key pyim-dhashcache-icode2word)
-   (message "PYIM icode2word upgrade: %S has been deleted." 
key)
-   pyim-dhashcache-icode2word))
+   (message "PYIM: %S has been deleted in 
`pyim-dhashcache-icode2word'." key)))
+ (message "PYIM: No need to upgrade in 
`pyim-dhashcache-icode2word'.")))
+ pyim-dhashcache-icode2word)
+
+(defun pyim-dhashcache-upgrade-icode2word-rulers ()
+  "返回 icode2word 升级规则。
+
+类似： (((\".\") . \"wubi/\") ((\"@\") . \"cangjie/\"))."
+  (delete-dups
+   (remove nil
+   (mapcar
+(lambda (scheme)
+  (let ((code-prefix (pyim-scheme-code-prefix scheme))
+(code-prefix-history (pyim-scheme-code-prefix-history 
scheme)))
+(when code-prefix-history
+  (cons code-prefix-history code-prefix
+pyim-schemes
 
 ;; ** 保存 dhashcache 相关函数
 (cl-defmethod pyim-dcache-save-caches
diff --git a/pyim-liberime.el b/pyim-liberime.el
index 638442e327..bf8049c410 100644
--- a/pyim-liberime.el
+++ b/pyim-liberime.el
@@ -51,7 +51,6 @@
(:constructor pyim-scheme-rime-create)
(:copier nil))
   "Rime 输入法方案。"
-  code-prefix-history
   code-split-length
   code-maximum-length)
 
diff --git a/pyim-scheme.el b/pyim-scheme.el
index cfae9cdabd..dc8df74add 100644
--- a/pyim-scheme.el
+++ b/pyim-scheme.el
@@ -57,13 +57,14 @@
(:constructor pyim-scheme-create)
(:copier nil))
   "输入法通用方案类型."
-  (name nil :type symbol  :documentation "输入法名称。")
-  (document nil :type string  :documentation "输入法简要说明。")
-  (first-chars  nil :type string  :documentation "输入法启动后，可以处理的第一个字符。")
-  (rest-chars   nil :type string  :documentation "输入法处理一个字符后，可以继续处理的字符。")
-  (code-prefix  nil :type string  :documentation "pyim 词库用到的编码前缀，比如：wubi/ 等。")
-  (prefer-triggers   nil :type list:documentation 
"单字符快捷键设置，有些输入法不使用某个字母，这个字母就可以做为快捷键使用。")
-  (cregexp-support-p nil :type boolean :documentation 
"输入法是否支持从代码生成搜索中文的正则表达式。"))
+  (namenil :ty

[nongnu] elpa/rust-mode 1e2fe312f8 1/2: test(makefile): Update eask commands

[ELPA Syncer]

branch: elpa/rust-mode
commit 1e2fe312f8a839d01a4f42bed2330e2d56c861a4
Author: Jen-Chieh Shen 
Commit: GitHub 

test(makefile): Update eask commands
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7a0546df2f..e390694503 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,13 @@ compile:
$(EASK) compile
 
 test:
-   $(EASK) ert rust-mode-tests.el
+   $(EASK) test ert rust-mode-tests.el
 
 checkdoc:
-   $(EASK) checkdoc
+   $(EASK) lint checkdoc
 
 lint:
-   $(EASK) lint
+   $(EASK) lint package
 
 CLEAN = $(PKG)-autoloads.el
 

[nongnu] elpa/rust-mode 5f654a5867 2/2: Merge pull request #445 from jcs-PR/ci

[ELPA Syncer]

branch: elpa/rust-mode
commit 5f654a5867ef3847a844d944ff5425ec3acdecc8
Merge: 0df2f22479 1e2fe312f8
Author: brotzeit 
Commit: GitHub 

Merge pull request #445 from jcs-PR/ci

test(makefile): Update eask commands
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7a0546df2f..e390694503 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,13 @@ compile:
$(EASK) compile
 
 test:
-   $(EASK) ert rust-mode-tests.el
+   $(EASK) test ert rust-mode-tests.el
 
 checkdoc:
-   $(EASK) checkdoc
+   $(EASK) lint checkdoc
 
 lint:
-   $(EASK) lint
+   $(EASK) lint package
 
 CLEAN = $(PKG)-autoloads.el
 

[elpa] externals/pyim 231bd63b27: * tests/pyim-tests.el (pyim-tests-pyim-dhashcache-upgrade-icode2word): Update.

[ELPA Syncer]

branch: externals/pyim
commit 231bd63b2714eb799f1252150d2da71f98f75067
Author: Feng Shu 
Commit: Feng Shu 

* tests/pyim-tests.el (pyim-tests-pyim-dhashcache-upgrade-icode2word): 
Update.
---
 tests/pyim-tests.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index d1ee5fa7e0..3055d88c32 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -1240,6 +1240,8 @@ yin-xing 因行
  '(69
 
 (ert-deftest pyim-tests-pyim-dhashcache-upgrade-icode2word ()
+  (should (equal (pyim-dhashcache-upgrade-icode2word-rulers)
+ '(((".") . "wubi/") (("@") . "cangjie/"
   (let ((pyim-dhashcache-icode2word (make-hash-table :test #'equal)))
 (puthash "." '("工") pyim-dhashcache-icode2word)
 (puthash "wubi/" '("㠭" "工") pyim-dhashcache-icode2word)

[nongnu] elpa/git-commit b79df6dc77: relnotes: Fix typos

[ELPA Syncer]

branch: elpa/git-commit
commit b79df6dc77f0d3a27361abfb073e2cabe573bb61
Author: Kyle Meyer 
Commit: Kyle Meyer 

relnotes: Fix typos
---
 docs/RelNotes/3.4.0.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org
index 9e9db19891..783c26 100644
--- a/docs/RelNotes/3.4.0.org
+++ b/docs/RelNotes/3.4.0.org
@@ -82,7 +82,7 @@ dfe3d03a14 git-commit-save-message: Report whether message 
was saved
 - For performance reasons the "margin" style sadly had to be removed
   from ~magit-blame-styles~.  608242086e
 
-- When blaming, neighboring chunks about the same commit are not
+- When blaming, neighboring chunks about the same commit are now
   combined into just one chunk.  #4030
 
 - Added new command ~magit-git-mergetool~.  #4128
@@ -103,7 +103,7 @@ dfe3d03a14 git-commit-save-message: Report whether message 
was saved
 - Sections can now be expanded and collapsed by double-clicking on the
   section heading or by clicking on the left margin.  949b4a47a4
 
-- The menu-bar menu, which was severally neglected for many years,
+- The menu-bar menu, which was severely neglected for many years,
   finally got a makeover.  It no longer offers a completely random
   subset of Magit's features.  Now it can be used to invoke most of
   the commands that could also be invoked using ~magit-dispatch~; but

[nongnu] elpa/magit updated (dbb2e9c8de -> b79df6dc77)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  dbb2e9c8de Update release notes
  adds  b79df6dc77 relnotes: Fix typos

No new revisions were added by this update.

Summary of changes:
 docs/RelNotes/3.4.0.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[nongnu] elpa/magit-section updated (dbb2e9c8de -> b79df6dc77)

[ELPA Syncer]

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

  from  dbb2e9c8de Update release notes
  adds  b79df6dc77 relnotes: Fix typos

No new revisions were added by this update.

Summary of changes:
 docs/RelNotes/3.4.0.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[elpa] externals/pyim f2f3197a9f: * pyim-dcache.el (pyim-dcache-get): Update.

[ELPA Syncer]

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

* pyim-dcache.el (pyim-dcache-get): Update.
---
 pyim-dcache.el| 14 --
 pyim-dregcache.el | 44 +++-
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/pyim-dcache.el b/pyim-dcache.el
index bc0c9dee64..4e51d36e4a 100644
--- a/pyim-dcache.el
+++ b/pyim-dcache.el
@@ -205,17 +205,19 @@ dcache.
 
 * 编码 -> 词条
 1. code2word 用编码搜索词条
-2. icode2word用编码搜索个人词条
-3. ishortcode2word   用简码搜索个人词条
-4. shortcode2word用简码搜索个人词条
+2. shortcode2word用简码搜索词条
+3. icode2word用编码搜索个人词条
+4. ishortcode2word   用简码搜索个人词条
 
 * 词条 -> 编码
 1. word2code 用词条搜索编码
 
 * 词条 -> 词频
-1. iword2count   用个人词条搜索编码
-2. iword2count-recent-10-words   搜索最近输入10个词的词频
-3. iword2count-recent-50-words   搜索最近输入50个词的词频"
+1. iword2count   搜索个人词条的词频
+2. iword2count-recent-10-words   搜索最近输入10个词条的词频
+3. iword2count-recent-50-words   搜索最近输入50个词条的词频
+
+如果 FROM 是 nil, 那么 fallback 到 \\='(icode2word code2word)."
   nil)
 
 (cl-defmethod pyim-dcache-get :before (_code &optional _from)
diff --git a/pyim-dregcache.el b/pyim-dregcache.el
index 06641c023e..f55bedf73a 100644
--- a/pyim-dregcache.el
+++ b/pyim-dregcache.el
@@ -64,24 +64,34 @@
   "从 FROM 中搜索 KEY, 得到对应的结果。
 
 用于 pyim-dregcache 类型的 dcache 后端。"
+  (setq from (or from '(icode2word code2word)))
   (when key
-(cond ((or (memq 'icode2word from)
-   (memq 'ishortcode2word from))
-   (pyim-dregcache-get-icode2word-ishortcode2word key))
-  ((or (not from)
-   (memq 'code2word from)
-   (memq 'shortcode2word from))
-   (pyim-dregcache-get-code2word-shortcode2word key))
-  ;; FIXME: pyim-dregcache 暂时不支持 iword2count-recent-10-words 和
-  ;; iword2count-recent-50-words.
-  ((or (memq 'iword2count-recent-10-words from)
-   (memq 'iword2count-recent-50-words from))
-   nil)
-  ;; pyim-dregcache 目前只能用于全拼输入法，而 pyim 中全拼输入法代码反查
-  ;; 功能是通过 pymap 相关函数实现的，不使用 word2code.
-  ((memq 'word2code from)
-   nil)
-  (t nil
+(let (value result)
+  (dolist (x from)
+(setq value (pyim-dregcache-get-key-from-dcache-type key x))
+;; 处理 iword2count.
+(unless (listp value)
+  (setq value (list value)))
+(when value
+  (setq result (append result value
+  result)))
+
+(defun pyim-dregcache-get-key-from-dcache-type (key dcache-type)
+  (cond ((memq dcache-type '(icode2word ishortcode2word))
+ (pyim-dregcache-get-icode2word-ishortcode2word key))
+((memq dcache-type '(code2word shortcode2word))
+ (pyim-dregcache-get-code2word-shortcode2word key))
+((memq dcache-type '(iword2count))
+ (gethash key pyim-dregcache-iword2count))
+;; FIXME: pyim-dregcache 暂时不支持 iword2count-recent-10-words 和
+;; iword2count-recent-50-words.
+((memq dcache-type '(iword2count-recent-10-words 
iword2count-recent-50-words))
+ nil)
+;; pyim-dregcache 目前只能用于全拼输入法，而 pyim 中全拼输入法代码反查
+;; 功能是通过 pymap 相关函数实现的，不使用 word2code.
+((memq dcache-type '(word2code))
+ nil)
+(t nil)))
 
 (defun pyim-dregcache-get-code2word-shortcode2word (code)
   (when pyim-debug (message "pyim-dregcache-get-code2word-shortcode2word 
called => %s" code))

[elpa] externals/org a8b32247d9: doc/org-manual.org: Reference org-cyclic and org-block

[ELPA Syncer]

branch: externals/org
commit a8b32247d9a33f27c5c5ef9008f84b775c9b54c6
Author: Robert Pluim 
Commit: Ihor Radchenko 

doc/org-manual.org: Reference org-cyclic and org-block

* doc/org-manual.org (Footnotes): Add `org-cyclic' and `org-block' to
note about org diary functions.  Add function indices for `org-date',
`org-anniversary', `org-cyclic', and `org-block'.
---
 doc/org-manual.org | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 32a45f8845..d560562c58 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -22046,6 +22046,10 @@ format]].  The day name is optional when you type the 
date yourself.
 However, any date inserted or modified by Org adds that day name, for
 reading convenience.
 
+#+findex: org-date
+#+findex: org-anniversary
+#+findex: org-cyclic
+#+findex: org-block
 [fn:60] When working with the standard diary expression functions, you
 need to be very careful with the order of the arguments.  That order
 depends evilly on the variable ~calendar-date-style~.  For example, to
@@ -22053,10 +22057,11 @@ specify a date December 12, 2005, the call might look 
like
 =(diary-date 12 1 2005)= or =(diary-date 1 12 2005)= or =(diary-date
 2005 12 1)=, depending on the settings.  This has been the source of
 much confusion.  Org mode users can resort to special versions of
-these functions like ~org-date~ or ~org-anniversary~.  These work just
-like the corresponding ~diary-~ functions, but with stable ISO order
-of arguments (year, month, day) wherever applicable, independent of
-the value of ~calendar-date-style~.
+these functions, namely ~org-date~, ~org-anniversary~, ~org-cyclic, and
+~org-block~.  These work just like the corresponding ~diary-~
+functions, but with stable ISO order of arguments (year, month, day)
+wherever applicable, independent of the value of
+~calendar-date-style~.
 
 [fn:61] See the variable ~org-read-date-prefer-future~.  You may set
 that variable to the symbol ~time~ to even make a time before now

[nongnu] elpa/zenburn-theme fd10925a3a: Brighten org headline levels 7 and 8.

[ELPA Syncer]

branch: elpa/zenburn-theme
commit fd10925a3a8c39818a9e353b804ac8b1a847d73a
Author: Jesse Johnson <1024369+holocronwea...@users.noreply.github.com>
Commit: Bozhidar Batsov 

Brighten org headline levels 7 and 8.

The previous deepest org headline colors were so dark they were
difficult to see against the background, especially for those with
moderate colorblindness.

This change also mildly mixes up the org headline color palette for a
little more variety.
---
 CHANGELOG.md | 1 +
 zenburn-theme.el | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ba37568bc..7917fdb303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Add `helm-ff-file-extension` face
 * Add `rmail` support
 * Add `tab-bar-mode` support
+* [#367](https://github.com/bbatsov/zenburn-emacs/pull/367): Brighten org 
headline levels 7 and 8 to improve contrast and possibly help those with color 
blindness.
 
 ## 2.7 (2020-11-21)
 
diff --git a/zenburn-theme.el b/zenburn-theme.el
index adec9916d2..24cd416ab5 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -1241,8 +1241,8 @@ Also bind `class' to ((class color) (min-colors 89))."
(list :height zenburn-height-plus-1))
`(org-level-5 ((t (:inherit ,z-variable-pitch :foreground ,zenburn-cyan
`(org-level-6 ((t (:inherit ,z-variable-pitch :foreground 
,zenburn-green+2
-   `(org-level-7 ((t (:inherit ,z-variable-pitch :foreground ,zenburn-red-4
-   `(org-level-8 ((t (:inherit ,z-variable-pitch :foreground 
,zenburn-blue-4
+   `(org-level-7 ((t (:inherit ,z-variable-pitch :foreground ,zenburn-red+2
+   `(org-level-8 ((t (:inherit ,z-variable-pitch :foreground 
,zenburn-magenta
`(org-link ((t (:foreground ,zenburn-yellow-2 :underline t
`(org-quote ((t (:background ,zenburn-bg+05 :extend t
`(org-scheduled ((t (:foreground ,zenburn-green+4