[elpa] externals/org ed392bc: Merge branch 'bugfix'
branch: externals/org commit ed392bc1c993611d3718b6adafd7737a3789fb9d Merge: 4426d80 85aaa19 Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 2bd584e..721ef2c 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7209,7 +7209,7 @@ Any match of REMOVE-RE will be removed from TXT." (setq duration (- (org-duration-to-minutes s2) (org-duration-to-minutes s1 ;; Format S1 and S2 for display. - (when s1 (setq s1 (org-get-time-of-day s1 'overtime))) + (when s1 (setq s1 (format "%5s" (org-get-time-of-day s1 'overtime (when s2 (setq s2 (org-get-time-of-day s2 'overtime (when (string-match org-tag-group-re txt) ;; Tags are in the string
[elpa] externals-release/org 85aaa19: org-agenda: Make sure that time grid is aligned when hour <10
branch: externals-release/org commit 85aaa19908bbb203ffcaeadd08366c9c3a9fbe4a Author: Ihor Radchenko Commit: Ihor Radchenko org-agenda: Make sure that time grid is aligned when hour <10 * lisp/org-agenda.el (org-agenda-format-item): Make sure that hour part of begin time in time grid always occupy 5 chars Fixes https://list.orgmode.org/orgmode/3afe1bba.2f48.17c350d0a41.coremail.tuma...@163.com/ --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 354f408..59bdd5b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6765,7 +6765,7 @@ Any match of REMOVE-RE will be removed from TXT." (setq duration (- (org-duration-to-minutes s2) (org-duration-to-minutes s1 ;; Format S1 and S2 for display. - (when s1 (setq s1 (org-get-time-of-day s1 'overtime))) + (when s1 (setq s1 (format "%5s" (org-get-time-of-day s1 'overtime (when s2 (setq s2 (org-get-time-of-day s2 'overtime (when (string-match org-tag-group-re txt) ;; Tags are in the string
[elpa] externals/org updated (4426d80 -> ed392bc)
elpasync pushed a change to branch externals/org. from 4426d80 org-element-cache: Fix Phase 1 when new parent overlaps future edits new 85aaa19 org-agenda: Make sure that time grid is aligned when hour <10 new ed392bc Merge branch 'bugfix' Summary of changes: lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nongnu] elpa/clojure-mode updated (7d3c0c1 -> 3bcb4b9)
elpasync pushed a change to branch elpa/clojure-mode. from 7d3c0c1 Add refactoring command for converting #() shorthand to (fn ...) (#601) new 367d275 Document some caveats new 3bcb4b9 Tweak wording Summary of changes: README.md | 25 + 1 file changed, 25 insertions(+)
[nongnu] elpa/clojure-mode 3bcb4b9 2/2: Tweak wording
branch: elpa/clojure-mode commit 3bcb4b9ef247b289c68c859d4470670ffddfa37a Author: Bozhidar Batsov Commit: Bozhidar Batsov Tweak wording --- README.md | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ffa8f8a..85610f1 100644 --- a/README.md +++ b/README.md @@ -530,6 +530,10 @@ Keep in mind, however, that they might be out-of-date. ## Caveats +`clojure-mode` is a capable tool, but it's certainly not perfect. This section +lists a couple of general design problems/limitations that might affect your +experience negatively. + ### General Issues `clojure-mode` derives a lot of functionality directly from `lisp-mode` (an Emacs major mode for Common Lisp), which @@ -547,7 +551,7 @@ We should look into ways to optimize the performance of the backtracking indenta ### Font-locking Implementation -As mentioned [above](https://github.com/clojure-emacs/clojure-mode#font-locking), the font-locking is implemented in terms of regular expressions with makes it both slow and inaccurate. +As mentioned [above](https://github.com/clojure-emacs/clojure-mode#font-locking), the font-locking is implemented in terms of regular expressions which makes it both slow and inaccurate. ## Changelog
[nongnu] elpa/clojure-mode 367d275 1/2: Document some caveats
branch: elpa/clojure-mode commit 367d275d6ca2fd1c3d4783fc3ff9f84b8681a35b Author: Bozhidar Batsov Commit: Bozhidar Batsov Document some caveats --- README.md | 21 + 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index dd1c0a5..ffa8f8a 100644 --- a/README.md +++ b/README.md @@ -528,6 +528,27 @@ targeting Emacs beginners, are available at [Clojure for the Brave and the True](http://www.braveclojure.com/basic-emacs/). Keep in mind, however, that they might be out-of-date. +## Caveats + +### General Issues + +`clojure-mode` derives a lot of functionality directly from `lisp-mode` (an Emacs major mode for Common Lisp), which +simplified the initial implementation, but also made it harder to implement +certain functionality. Down the road it'd be nice to fully decouple `clojure-mode` +from `lisp-mode`. + +See [this ticket](https://github.com/clojure-emacs/clojure-mode/issues/270) for a bit more details. + +### Indentation Performance + +`clojure-mode`'s indentation engine is a bit slow. You can speed things up significantly by disabling `clojure-use-backtracking-indent`, but this will break the indentation of complex forms like `deftype`, `defprotocol`, `reify`, `letfn`, etc. + +We should look into ways to optimize the performance of the backtracking indentation logic. See [this ticket](https://github.com/clojure-emacs/clojure-mode/issues/606) for more details. + +### Font-locking Implementation + +As mentioned [above](https://github.com/clojure-emacs/clojure-mode#font-locking), the font-locking is implemented in terms of regular expressions with makes it both slow and inaccurate. + ## Changelog An extensive changelog is available [here](CHANGELOG.md).
[elpa] externals/org d45bd62: Merge branch 'bugfix'
branch: externals/org commit d45bd627ce8626fbd797a6f1845d7113df2db2e2 Merge: ed392bc 1778eb9 Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/org-habit.el | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index c558966..fd284fe 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -427,7 +427,8 @@ current time." (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) - (let ((habit (get-text-property (point) 'org-habit-p))) + (let ((habit (get-text-property (point) 'org-habit-p)) + (invisible-prop (get-text-property (point) 'invisible))) (when habit (move-to-column org-habit-graph-column t) (delete-char (min (+ 1 org-habit-preceding-days @@ -438,7 +439,12 @@ current time." habit (time-subtract moment (days-to-time org-habit-preceding-days)) moment - (time-add moment (days-to-time org-habit-following-days)) + (time-add moment (days-to-time org-habit-following-days +;; Inherit invisible state of hidden entries. +(when invisible-prop + (put-text-property + (- (point) org-habit-graph-column) (point) + 'invisible invisible-prop (forward-line) (defun org-habit-toggle-habits ()
[elpa] externals-release/org 1778eb9: org-habit: Preserve invisibility when inserting consistency graph
branch: externals-release/org commit 1778eb94c5b03533b14cd12a8cd80fc48f2b69be Author: Ihor Radchenko Commit: Ihor Radchenko org-habit: Preserve invisibility when inserting consistency graph * lisp/org-habit.el (org-habit-insert-consistency-graphs): Inherit 'invisible text property of the habit line when the habit is hidden in agenda. Fixes https://orgmode.org/list/paxpr06mb776069e9085c1cd606156493c6...@paxpr06mb7760.eurprd06.prod.outlook.com --- lisp/org-habit.el | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index a355d8e..3ce8068 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -428,7 +428,8 @@ current time." (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) - (let ((habit (get-text-property (point) 'org-habit-p))) + (let ((habit (get-text-property (point) 'org-habit-p)) + (invisible-prop (get-text-property (point) 'invisible))) (when habit (move-to-column org-habit-graph-column t) (delete-char (min (+ 1 org-habit-preceding-days @@ -439,7 +440,12 @@ current time." habit (time-subtract moment (days-to-time org-habit-preceding-days)) moment - (time-add moment (days-to-time org-habit-following-days)) + (time-add moment (days-to-time org-habit-following-days +;; Inherit invisible state of hidden entries. +(when invisible-prop + (put-text-property + (- (point) org-habit-graph-column) (point) + 'invisible invisible-prop (forward-line) (defun org-habit-toggle-habits ()
[elpa] externals/org updated (ed392bc -> d45bd62)
elpasync pushed a change to branch externals/org. from ed392bc Merge branch 'bugfix' new 1778eb9 org-habit: Preserve invisibility when inserting consistency graph new d45bd62 Merge branch 'bugfix' Summary of changes: lisp/org-habit.el | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-)
[elpa] externals-release/org aabcf9e: ob-tangle: Ignore narrowing when tangling a file
branch: externals-release/org commit aabcf9edf20013ff74e58d7e215530e02d98e8a8 Author: Nicolas Goaziou Commit: Nicolas Goaziou ob-tangle: Ignore narrowing when tangling a file * lisp/ob-tangle.el (org-babel-tangle-file): Ignore narrowing in a buffer visiting the file being tangled. --- lisp/ob-tangle.el | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 2dd1d03..8f57d73 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -179,15 +179,12 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited-p (find-buffer-visiting (expand-file-name file))) - to-be-removed) -(prog1 - (save-window-excursion - (find-file file) - (setq to-be-removed (current-buffer)) - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re))) - (unless visited-p - (kill-buffer to-be-removed) + (let ((visited (find-buffer-visiting file)) +(buffer (or visited (find-file-noselect file +(with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re +(unless visited (kill-buffer buffer (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR."
[elpa] externals/org updated (d45bd62 -> 2b7ea20)
elpasync pushed a change to branch externals/org. from d45bd62 Merge branch 'bugfix' new aabcf9e ob-tangle: Ignore narrowing when tangling a file new 2b7ea20 Merge branch 'bugfix' Summary of changes: lisp/ob-tangle.el | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-)
[elpa] externals/org 2b7ea20: Merge branch 'bugfix'
branch: externals/org commit 2b7ea20346329e00caffb999e5bc797014071432 Merge: d45bd62 aabcf9e Author: Nicolas Goaziou Commit: Nicolas Goaziou Merge branch 'bugfix' --- lisp/ob-tangle.el | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 0a35dc5..b42d256 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -187,15 +187,12 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited-p (find-buffer-visiting (expand-file-name file))) - to-be-removed) -(prog1 - (save-window-excursion - (find-file file) - (setq to-be-removed (current-buffer)) - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re))) - (unless visited-p - (kill-buffer to-be-removed) + (let ((visited (find-buffer-visiting file)) +(buffer (or visited (find-file-noselect file +(with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re +(unless visited (kill-buffer buffer (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR."
[nongnu] elpa/rust-mode b017f74: bump version to 1.0.3
branch: elpa/rust-mode commit b017f746503df27ccdca8ee6d2627529d64d76e1 Author: brotzeit Commit: brotzeit bump version to 1.0.3 --- rust-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-mode.el b/rust-mode.el index c252204..fca9e9f 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -1,6 +1,6 @@ ;;; rust-mode.el --- A major-mode for editing Rust source code -*-lexical-binding: t-*- -;; Version: 1.0.2 +;; Version: 1.0.3 ;; Author: Mozilla ;; Url: https://github.com/rust-lang/rust-mode ;; Keywords: languages
[elpa] externals-release/org f4e72ff 1/2: org-babel-tangle-file: Fix void variable error from last commit
branch: externals-release/org commit f4e72ffcd467db74fe1f17790e711a3f4c6f7213 Author: Kyle Meyer Commit: Kyle Meyer org-babel-tangle-file: Fix void variable error from last commit * lisp/ob-tangle.el (org-babel-tangle-file): Switch let to let* to fix void variable error. --- lisp/ob-tangle.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 8f57d73..c80b613 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -179,8 +179,8 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited (find-buffer-visiting file)) -(buffer (or visited (find-file-noselect file + (let* ((visited (find-buffer-visiting file)) + (buffer (or visited (find-file-noselect file (with-current-buffer buffer (org-with-wide-buffer (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re
[elpa] externals-release/org a18849b 2/2: org-babel-tangle-file: Revert recent change in return value
branch: externals-release/org commit a18849b786c1f0081f2942be9c288c62bc59fa42 Author: Kyle Meyer Commit: Kyle Meyer org-babel-tangle-file: Revert recent change in return value * lisp/ob-tangle.el (org-babel-tangle-file): Restore the recently removed prog1 so that the return value matches the documented one. --- lisp/ob-tangle.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index c80b613..8ed7002 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -181,10 +181,12 @@ Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") (let* ((visited (find-buffer-visiting file)) (buffer (or visited (find-file-noselect file -(with-current-buffer buffer - (org-with-wide-buffer - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re -(unless visited (kill-buffer buffer +(prog1 +(with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name + (org-babel-tangle nil target-file lang-re + (unless visited (kill-buffer buffer) (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR."
[elpa] externals/org updated (2b7ea20 -> e26b825)
elpasync pushed a change to branch externals/org. from 2b7ea20 Merge branch 'bugfix' new f4e72ff org-babel-tangle-file: Fix void variable error from last commit new a18849b org-babel-tangle-file: Revert recent change in return value new e26b825 Merge branch 'bugfix' Summary of changes: lisp/ob-tangle.el | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-)
[elpa] externals-release/org updated (aabcf9e -> a18849b)
elpasync pushed a change to branch externals-release/org. from aabcf9e ob-tangle: Ignore narrowing when tangling a file new f4e72ff org-babel-tangle-file: Fix void variable error from last commit new a18849b org-babel-tangle-file: Revert recent change in return value Summary of changes: lisp/ob-tangle.el | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-)
[elpa] externals/org e26b825: Merge branch 'bugfix'
branch: externals/org commit e26b825e6e9afc85471215e41cf778daad3aad77 Merge: 2b7ea20 a18849b Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'bugfix' --- lisp/ob-tangle.el | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index b42d256..822842a 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -187,12 +187,14 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited (find-buffer-visiting file)) -(buffer (or visited (find-file-noselect file -(with-current-buffer buffer - (org-with-wide-buffer - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re -(unless visited (kill-buffer buffer + (let* ((visited (find-buffer-visiting file)) + (buffer (or visited (find-file-noselect file +(prog1 +(with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name + (org-babel-tangle nil target-file lang-re + (unless visited (kill-buffer buffer) (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR."
[nongnu] elpa/with-editor 53a6b8a: with-editor-sleeping-editor-filter: Limit length of saved output
branch: elpa/with-editor commit 53a6b8ad8a6aabea3749366fb11f12a7dabcb11f Author: Yikai Zhao Commit: Jonas Bernoulli with-editor-sleeping-editor-filter: Limit length of saved output Improve performance by limitting the maximum length of the string saved in process filters. While using with `vterm', this `incomplete' string may get very large and it hurts performance. In my case, it can easily get to few megabytes after using the same terminal for a long time, which would then increase the latency of each keystroke significantly. We should only need to keep the last few bytes to make it work. --- lisp/with-editor.el | 7 +++ 1 file changed, 7 insertions(+) diff --git a/lisp/with-editor.el b/lisp/with-editor.el index c0bf1dd..fcb3854 100644 --- a/lisp/with-editor.el +++ b/lisp/with-editor.el @@ -644,12 +644,19 @@ may not insert the text into the PROCESS's buffer. Then it calls (defconst with-editor-sleeping-editor-regexp "^WITH-EDITOR: \\([0-9]+\\) OPEN \\([^ ]+?\\)\\(?: IN \\([^\r]+?\\)\\)?\r?$") +(defvar with-editor--max-incomplete-length 1000) + (defun with-editor-sleeping-editor-filter (process string) (when-let ((incomplete (and process (process-get process 'incomplete (setq string (concat incomplete string))) (save-match-data (cond ((and process (not (string-match-p "\n\\'" string))) + (let ((length (length string))) +(when (> length with-editor--max-incomplete-length) + (setq string +(substring string + (- length with-editor--max-incomplete-length) (process-put process 'incomplete string) nil) ((string-match with-editor-sleeping-editor-regexp string)
[nongnu] elpa/geiser 476897e: new geiser-repl-per-project-p to control per-project REPLs
branch: elpa/geiser commit 476897e4f8a101d808ee0a0a97cc98a46d079af6 Author: jao Commit: jao new geiser-repl-per-project-p to control per-project REPLs And we still need some fixes here when that's active, specifically for the case when you travel to a file outside the current project: it becomes repeless, which is a sad state. --- elisp/geiser-repl.el | 9 - news.org | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el index c16444a..eefbd81 100644 --- a/elisp/geiser-repl.el +++ b/elisp/geiser-repl.el @@ -45,6 +45,12 @@ symbol (e.g., `guile', `chicken', etc.)." :type '(choice (function-item geiser-repl-buffer-name) (function :tag "Other function"))) +(geiser-custom--defcustom geiser-repl-per-project-p nil + "Whether to spawn a separate REPL per project. +See also `geiser-repl-current-project-function' for the function +used to discover a buffer's project." + :type 'boolean) + (geiser-custom--defcustom geiser-repl-current-project-function (if (featurep 'project) #'project-current 'ignore) "Function used to determine the current project. @@ -269,7 +275,8 @@ module command as a string") (setq geiser-repl--project p)) (defsubst geiser-repl--current-project () - (or (funcall geiser-repl-current-project-function) + (or (when geiser-repl-per-project-p +(funcall geiser-repl-current-project-function)) 'no-project)) (defun geiser-repl--live-p () diff --git a/news.org b/news.org index 87c7041..f451390 100644 --- a/news.org +++ b/news.org @@ -2,7 +2,8 @@ - New option to add current project's root to load path or any of its subdirectories, ~geiser-repl-add-project-paths~. - Defaulting ~geiser-repl-current-project-function~ to ~project-current~ -in emacsen having it available. +in emacsen having it available, and using the new +~geiser-repl-per-project-p~ to decide whether to use it. * Version 0.19 (December, 2021) - Bug fixes * Version 0.18 (October, 2021)
[elpa] externals/hyperbole 7443160: Add target for elpa-devel install tests (#136)
branch: externals/hyperbole
commit 74431604b52d9b7d35ff459a39a53393dbb622ad
Author: Mats Lidell
Commit: GitHub
Add target for elpa-devel install tests (#136)
---
ChangeLog | 6 ++
Makefile | 4 ++--
install-test/elpa-devel/.emacs | 12
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce7469b..93f030b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-12-18 Mats Lidell
+
+* install-test/elpa-devel/.emacs: Init file for install tests.
+
+* Makefile: install-elpa-devel target.
+
2021-12-12 Bob Weiner
* hyperbole.el (hkey-initialize): Add missing C-c prefix binding for
hyperbole-mode-map.
diff --git a/Makefile b/Makefile
index 3aed9b0..141258d 100644
--- a/Makefile
+++ b/Makefile
@@ -423,9 +423,9 @@ endif
# Hyperbole install tests - Verify that hyperbole can be installed
# using different sources. See folder "install-test"
-.PHONY: install-elpa install-tarball install-straight install-all
+.PHONY: install-elpa install-elpa-devel install-tarball install-straight
install-all
install-all: install-elpa install-tarball install-straight
-install-elpa install-tarball install-straight:
+install-elpa install-elpa-devel install-tarball install-straight:
@echo "Install Hyperbole using $@"
(cd ./install-test/ && ./local-install-test.sh $(subst install-,,$@))
diff --git a/install-test/elpa-devel/.emacs b/install-test/elpa-devel/.emacs
new file mode 100644
index 000..8e71979
--- /dev/null
+++ b/install-test/elpa-devel/.emacs
@@ -0,0 +1,12 @@
+;; .emacs
+
+(require 'package)
+(when (< emacs-major-version 27)
+ (package-initialize))
+(add-to-list 'package-archives '("gnu-devel" . "https://elpa.gnu.org/devel/";))
+(unless (package-installed-p 'hyperbole)
+ (package-refresh-contents)
+ (package-install 'hyperbole))
+(hyperbole-mode 1)
+
+(message "%s" "Hyperbole successfully installed")
[elpa] externals/pyim updated (dacaff5 -> 45c3c76)
elpasync pushed a change to branch externals/pyim. from dacaff5 * pyim.el (pyim-select-word:xingma): 以词定字的时候，不调整词频。 new dfca022 * pyim-process.el (pyim-process-create-word): 保存前去除 text property。 new 45c3c76 * pyim.el (pyim-import-words-and-counts): 导入词条功能不限制在 'quanpin. Summary of changes: pyim-process.el | 5 - pyim.el | 34 +- 2 files changed, 21 insertions(+), 18 deletions(-)
[elpa] externals/pyim dfca022 1/2: * pyim-process.el (pyim-process-create-word): 保存前去除 text property。
branch: externals/pyim commit dfca0222e5b51a5c50462d732eaa4de996349f28 Author: Feng Shu Commit: Feng Shu * pyim-process.el (pyim-process-create-word): 保存前去除 text property。 --- pyim-process.el | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyim-process.el b/pyim-process.el index c205373..481c97f 100644 --- a/pyim-process.el +++ b/pyim-process.el @@ -567,6 +567,9 @@ BUG：拼音无法有效地处理多音字。" ;; 观的一个数字，也许应该添加一个配置选项？ (< (length word) 12) (not (pyim-string-match-p "\\CC" word))) +;; PYIM 有些功能（比如：以词定字功能）会用到 text property, 保存词条之前将 +;; text property 去除，防止不必要的数据进入 cache. +(setq word (substring-no-properties word)) ;; 记录最近创建的词条，用于快速删词功能。 (setq pyim-process-last-created-word word) (let* ((scheme-name (pyim-scheme-name)) @@ -587,7 +590,7 @@ BUG：拼音无法有效地处理多音字。" ;; 正确处理多音字，这里设置一下 :noexport 属性，在导出词条的时候 ;; 不导出这些带标记的词。 (propertize word :noexport t) - (substring-no-properties word)) + word) (concat (or code-prefix "") code) prepend))) ;; TODO, 排序个人词库? ;; 返回 codes 和 word, 用于 message 命令。
[elpa] externals/pyim 45c3c76 2/2: * pyim.el (pyim-import-words-and-counts): 导入词条功能不限制在 'quanpin.
branch: externals/pyim commit 45c3c761aa9e6cbca49f97981d5ed0996778f884 Author: Feng Shu Commit: Feng Shu * pyim.el (pyim-import-words-and-counts): 导入词条功能不限制在 'quanpin. --- pyim.el | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pyim.el b/pyim.el index 745c360..c76475e 100644 --- a/pyim.el +++ b/pyim.el @@ -390,7 +390,7 @@ SILENT 设置为 t 是，不显示提醒信息。" 导入的文件结构类似： ;;; -*- coding: utf-8-unix -*- - ;; 词条 计数 拼音(可选) + ;; 词条 计数 对应编码(可选) 你好 247 这是 312 @@ -401,12 +401,10 @@ MERGE-METHOD 是一个函数，这个函数需要两个数字参数，代表词 ;; 导入词条和词频之前需要加载 dcaches. (when (or silent (yes-or-no-p "PYIM 词条导入注意事项： - -如果文件没有提供拼音，导入词条时会自动添加，这时个人词库缓存中会 -添加一些不合理的词条信息，比如：ying-xing 银行，这些词条的文本属 -性 :noexport 会设置为 t, 等用户再次输入这个词条的时候，通过用户的 -输入进行多音字矫正，对应的 :noexport 就会删除。 - +1. 这个命令对多音字处理比较粗糙，可能会导入一些不合常理的词条记录， + (比如：ying-xing 银行），但不影响 PYIM 正常使用。 +2. 这个命令也可以用于形码输入法，比如：五笔，不过需要形码输入法有 + 编码反查功能。 => 确定继续导入吗？")) (pyim-process-init-dcaches) (with-temp-buffer @@ -415,19 +413,21 @@ MERGE-METHOD 是一个函数，这个函数需要两个数字参数，代表词 (goto-char (point-min)) (forward-line 1) (while (not (eobp)) -(let* ((pyim-default-scheme 'quanpin) - (content (pyim-dline-parse)) +(let* ((content (pyim-dline-parse)) (word (car content)) (count (string-to-number (or (car (cdr content)) "0"))) - (criteria (car (cdr (cdr content) - (pyim-process-create-word - word nil - (lambda (x) - (funcall (or merge-method #'max) - (or x 0) - count)) - criteria)) + (criteria (car (cdr (cdr content + output) + (setq output +(pyim-process-create-word + word nil + (lambda (x) + (funcall (or merge-method #'max) +(or x 0) +count)) + criteria)) + (message "* 导入 %S" output)) (forward-line 1))) ;; 保存一下用户选择过的词生成的缓存和词频缓存， ;; 因为使用 async 机制更新 dcache 时，需要从 dcache 文件
[elpa] externals/embark 0dfa489: Allow shell-command-on-region to actually prompt for a command!
branch: externals/embark commit 0dfa489d1220a592bff006feff075478da8529ee Author: Omar Antolín Commit: Omar Antolín Allow shell-command-on-region to actually prompt for a command! --- embark.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/embark.el b/embark.el index 753323f..b3acb94 100644 --- a/embark.el +++ b/embark.el @@ -372,6 +372,7 @@ with `find-file'." delete-directory kill-buffer shell-command +shell-command-on-region async-shell-command embark-kill-buffer-and-window pp-eval-expression) @@ -416,9 +417,10 @@ the key :always are executed always." "0.12")) (defcustom embark-pre-action-hooks - '(;; region commands which prompt for a filename + '(;; region commands which prompt for a filename or command (write-region embark--ignore-target embark--mark-target) (append-to-file embark--ignore-target embark--mark-target) +(shell-command-on-region embark--ignore-target embark--mark-target) ;; commands which evaluate code not given at a prompt (embark-pp-eval-defun embark--ignore-target) (eval-defun embark--ignore-target)
[elpa] externals/embark-consult updated (b17af02 -> 0dfa489)
elpasync pushed a change to branch externals/embark-consult. from b17af02 Introduce new multitarget actions (fix #433) adds 0dfa489 Allow shell-command-on-region to actually prompt for a command! No new revisions were added by this update. Summary of changes: embark.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[elpa] externals/embark 8c6bbad: New function: completion table with given category and no sorting
branch: externals/embark commit 8c6bbad170947ea993ba91864a854c97267e895c Author: Omar Antolín Commit: Omar Antolín New function: completion table with given category and no sorting This appeared twice in different spots. I still kept the embark--read-from-history function because it factors other common behavior: requiring a match and not recording history. --- embark.el | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/embark.el b/embark.el index b3acb94..1c1ccea 100644 --- a/embark.el +++ b/embark.el @@ -1221,6 +1221,16 @@ If NESTED is non-nil subkeymaps are not flattened." collect (cons formatted item (cons candidates def))) +(defun embark--with-category (category candidates) + "Return completion table for CANDIDATES of CATEGORY with sorting disabled." + (lambda (string predicate action) +(if (eq action 'metadata) +`(metadata (display-sort-function . identity) + (cycle-sort-function . identity) + (category . ,category)) + (complete-with-action + action candidates string predicate + (defun embark-completing-read-prompter (keymap update &optional no-default) "Prompt via completion for a command bound in KEYMAP. If NO-DEFAULT is t, no default value is passed to`completing-read'. @@ -1270,12 +1280,7 @@ UPDATE function is passed to it." (make-composed-keymap map (current-local-map) (completing-read "Command: " - (lambda (string predicate action) - (if (eq action 'metadata) - `(metadata (category . embark-keybinding) -(display-sort-function . identity) -(cycle-sort-function . identity)) - (complete-with-action action candidates string predicate))) + (embark--with-category 'embark-keybinding candidates) nil nil nil 'embark--prompter-history def) (pcase (assoc choice candidates) (`(,_formatted ,_name ,cmd ,key ,_desc) @@ -3336,12 +3341,7 @@ When called with a prefix argument OTHER-WINDOW, open dired in other window." "Read with completion from list of history CANDIDATES of CATEGORY. Sorting and history are disabled. PROMPT is the prompt message." (completing-read prompt - (lambda (string predicate action) - (if (eq action 'metadata) - `(metadata (display-sort-function . identity) -(cycle-sort-function . identity) -(category . ,category)) - (complete-with-action action candidates string predicate))) + (embark--with-category category candidates) nil t nil t)) (defun embark-kill-ring-remove (text)
[elpa] externals/embark-consult updated (0dfa489 -> 8c6bbad)
elpasync pushed a change to branch externals/embark-consult. from 0dfa489 Allow shell-command-on-region to actually prompt for a command! adds 8c6bbad New function: completion table with given category and no sorting No new revisions were added by this update. Summary of changes: embark.el | 24 1 file changed, 12 insertions(+), 12 deletions(-)
[elpa] externals/embark 2772ca0: Add commands to show bindings in a given keymap and at point
branch: externals/embark commit 2772ca0b35e8eb59724c31b5cb88ff802f21067a Author: Omar Antolín Commit: Omar Antolín Add commands to show bindings in a given keymap and at point This fixes #414. --- embark.el | 63 ++- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/embark.el b/embark.el index 1c1ccea..176466a 100644 --- a/embark.el +++ b/embark.el @@ -1572,8 +1572,49 @@ further user intervention." (funcall vindicator keymap targets prefix) ;;;###autoload +(defun embark-bindings-in-keymap (keymap) + "Explore command key bindings in KEYMAP with `completing-read'. +The selected command will be executed. Interactively, prompt the +user for a KEYMAP variable." + (interactive + (list +(symbol-value + (intern-soft + (completing-read + "Keymap: " + (embark--with-category +'variable +(cl-loop for x being the symbols + if (and (boundp x) (keymapp (symbol-value x))) + collect (symbol-name x))) + nil t nil 'variable-name-history + (let ((major-mode-map + (concat (symbol-name major-mode) "-map"))) + (when (intern-soft major-mode-map) major-mode-map))) + (when-let (command (embark-completing-read-prompter keymap nil 'no-default)) +(call-interactively command))) + +;;;###autoload +(defun embark-bindings () + "Explore all current command key bindings with `completing-read'. +The selected command will be executed." + (interactive) + (embark-bindings-in-keymap (make-composed-keymap (current-active-maps t + +;;;###autoload +(defun embark-bindings-at-point () + "Explore all current command key bindings with `completing-read'. +The selected command will be executed." + (interactive) + (let ((keymaps (delq nil (list (get-text-property (point) 'keymap) + (get-text-property (point) 'local-keymap) +(unless keymaps + (user-error "No key bindings found at point")) +(embark-bindings-in-keymap (make-composed-keymap keymaps + +;;;###autoload (defun embark-prefix-help-command () - "Prompt for and run a command bound in the prefix used to reach this command. + "Prompt for and run a command bound in the prefix used for this command. The prefix described consists of all but the last event of the key sequence that ran this command. This function is intended to be used as a value for `prefix-help-command'. @@ -1581,22 +1622,10 @@ be used as a value for `prefix-help-command'. In addition to using completion to select a command, you can also type @ and the key binding (without the prefix)." (interactive) - (let ((keys (this-command-keys-vector))) -(embark-bindings (seq-take keys (1- (length keys)) - -;;;###autoload -(defun embark-bindings (&optional prefix) - "Explore all current command key bindings with `completing-read'. -The selected command will be executed. The set of key bindings can -be restricted by passing a PREFIX key." - (interactive) - (let ((keymap (if prefix -(key-binding prefix 'accept-default) - (make-composed-keymap (current-active-maps t) -(unless (keymapp keymap) - (user-error "No key bindings found")) -(when-let (command (embark-completing-read-prompter keymap nil 'no-default)) - (call-interactively command + (when-let ((keys (this-command-keys-vector)) + (prefix (seq-take keys (1- (length keys + (keymap (key-binding prefix 'accept-default))) +(embark-bindings-in-keymap keymap))) (defun embark--prompt (indicators keymap targets) "Call the prompter with KEYMAP and INDICATORS.
[elpa] externals/embark-consult updated (8c6bbad -> 2772ca0)
elpasync pushed a change to branch externals/embark-consult. from 8c6bbad New function: completion table with given category and no sorting adds 2772ca0 Add commands to show bindings in a given keymap and at point No new revisions were added by this update. Summary of changes: embark.el | 63 ++- 1 file changed, 46 insertions(+), 17 deletions(-)
[nongnu] elpa/git-commit 1c2f6e9: magit-fetch-modules: Fix yoda condition
branch: elpa/git-commit commit 1c2f6e901d41feb64956763f6a5c0ac0735cb7b2 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-fetch-modules: Fix yoda condition I hate that they force me to write yoda conditions. I keep messing them up; maybe I am secretly a sith. --- lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-fetch.el b/lisp/magit-fetch.el index ec808f4..c1f9d46 100644 --- a/lisp/magit-fetch.el +++ b/lisp/magit-fetch.el @@ -191,7 +191,7 @@ with a prefix argument." (if transient (transient-setup 'magit-fetch-modules) (let ((git-version (magit-git-version))) - (when (version<= "2.8.0" git-version) + (when (version>= "2.8.0" git-version) (when-let ((value (transient-arg-value "--jobs=" args))) (message "Dropping --jobs; not supported by Git v%s" git-version) (setq args (remove (format "--jobs=%s" value) args)
[nongnu] elpa/magit updated (f766f68 -> 1c2f6e9)
elpasync pushed a change to branch elpa/magit. from f766f68 magit-pull: Add --ff-only adds 1c2f6e9 magit-fetch-modules: Fix yoda condition No new revisions were added by this update. Summary of changes: lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nongnu] elpa/magit-section updated (f766f68 -> 1c2f6e9)
elpasync pushed a change to branch elpa/magit-section. from f766f68 magit-pull: Add --ff-only adds 1c2f6e9 magit-fetch-modules: Fix yoda condition No new revisions were added by this update. Summary of changes: lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nongnu] elpa/git-commit 4c46903: magit-fetch-modules: Fix previous commit
branch: elpa/git-commit commit 4c469037756ace8b0cc42c05da0dd1864c5bc2a4 Author: Kyle Meyer Commit: Kyle Meyer magit-fetch-modules: Fix previous commit Emacs does not have a version>= function. Use version< instead, flipping the arguments (and eliminating the yoda condition the last commit mentioned). --- lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-fetch.el b/lisp/magit-fetch.el index c1f9d46..0443cdd 100644 --- a/lisp/magit-fetch.el +++ b/lisp/magit-fetch.el @@ -191,7 +191,7 @@ with a prefix argument." (if transient (transient-setup 'magit-fetch-modules) (let ((git-version (magit-git-version))) - (when (version>= "2.8.0" git-version) + (when (version< git-version "2.8.0") (when-let ((value (transient-arg-value "--jobs=" args))) (message "Dropping --jobs; not supported by Git v%s" git-version) (setq args (remove (format "--jobs=%s" value) args)
[nongnu] elpa/magit updated (1c2f6e9 -> 4c46903)
elpasync pushed a change to branch elpa/magit. from 1c2f6e9 magit-fetch-modules: Fix yoda condition adds 4c46903 magit-fetch-modules: Fix previous commit No new revisions were added by this update. Summary of changes: lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nongnu] elpa/magit-section updated (1c2f6e9 -> 4c46903)
elpasync pushed a change to branch elpa/magit-section. from 1c2f6e9 magit-fetch-modules: Fix yoda condition adds 4c46903 magit-fetch-modules: Fix previous commit No new revisions were added by this update. Summary of changes: lisp/magit-fetch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
