[nongnu] elpa/projectile 405ccc90aa 2/2: Add changelog entry for [#1765] fix
branch: elpa/projectile commit 405ccc90aa9986e73728c8d258aa161095955bc0 Author: lWarne Commit: Bozhidar Batsov Add changelog entry for [#1765] fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75bf268fa1..54fd55fd24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ * [#1714](https://github.com/bbatsov/projectile/issues/1714): Fix `projectile-discover-projects-in-directory` not interactive. * [#1734](https://github.com/bbatsov/projectile/pull/1734): Make `projectile--find-matching-test` use `src-dir/test-dir` properties. * [#1750](https://github.com/bbatsov/projectile/issues/1750): Fix source and test directories for Maven projects. +* [#1765](https://github.com/bbatsov/projectile/issues/1765): Fix `src-dir`/`test-dir` not defaulting to `"src/"` and `"test/"` with `projectile-toggle-between-implementation-and-test` ### Changes
[nongnu] elpa/projectile 4fe6b464db: Change Grails app project filename to application.yml (#1770)
branch: elpa/projectile
commit 4fe6b464db5409c6e11c7ce708d72519a69d9084
Author: Lawrence Liu <22554+xq...@users.noreply.github.com>
Commit: GitHub
Change Grails app project filename to application.yml (#1770)
As per grails new version (version 4 and 5), the configuration file name
has been change to application.yml from application.properties.
---
projectile.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projectile.el b/projectile.el
index a70a8021f3..4330fbf73a 100644
--- a/projectile.el
+++ b/projectile.el
@@ -3204,8 +3204,8 @@ a manual COMMAND-TYPE command is created with
:compile "./gradlew build"
:test "./gradlew test"
:test-suffix "Spec")
-(projectile-register-project-type 'grails '("application.properties"
"grails-app")
- :project-file "application.properties"
+(projectile-register-project-type 'grails '("application.yml" "grails-app")
+ :project-file "application.yml"
:compile "grails package"
:test "grails test-app"
:test-suffix "Spec")
[elpa] externals/pyim 2d0f4d7001 2/3: pyim-page prefer functions in pyim-process.
branch: externals/pyim commit 2d0f4d7001dcbbf3b925f0fcb788d98647d1f874 Author: Feng Shu Commit: Feng Shu pyim-page prefer functions in pyim-process. * pyim-process.el (pyim-process-get-candidate-position) (pyim-process-candidates-length) (pyim-process-get-outcome-subword-info): New functions. * pyim-page.el (pyim-page-current-page, pyim-page-total-page) (pyim-page-start, pyim-page-end, pyim-page-refresh) (pyim-page-next-page, pyim-page-next-word) (pyim-page-preview-create:quanpin) (pyim-page-preview-create:quanpin) (pyim-page-preview-create:shuangpin, pyim-page-menu-create): Prefer functions in pyim-process. --- pyim-page.el| 131 pyim-process.el | 9 2 files changed, 66 insertions(+), 74 deletions(-) diff --git a/pyim-page.el b/pyim-page.el index 9a979f440d..1af288c3f2 100644 --- a/pyim-page.el +++ b/pyim-page.el @@ -131,44 +131,40 @@ Only useful when use posframe.") "计算当前选择的词条在第几页面. 细节信息请参考 `pyim-page-refresh' 的 docstring." - (1+ (/ (1- pyim-candidate-position) pyim-page-length))) + (1+ (/ (1- (pyim-process-get-candidate-position)) pyim-page-length))) (defun pyim-page-total-page () "计算 page 总共有多少页. 细节信息请参考 `pyim-page-refresh' 的 docstring." - (1+ (/ (1- (length pyim-candidates)) pyim-page-length))) + (1+ (/ (1- (pyim-process-candidates-length)) pyim-page-length))) (defun pyim-page-start () "计算当前所在页的第一个词条的位置. 细节信息请参考 `pyim-page-refresh' 的 docstring." - (let ((pos (min (length pyim-candidates) pyim-candidate-position))) + (let ((pos (min (pyim-process-candidates-length) + (pyim-process-get-candidate-position (1+ (* (/ (1- pos) pyim-page-length) pyim-page-length -(defun pyim-page-end (&optional finish) +(defun pyim-page-end () "计算当前所在页的最后一个词条的位置， -如果 pyim-candidates 用完，则检查是否有补全。如果 FINISH 为 -non-nil，说明，补全已经用完了. - 细节信息请参考 `pyim-page-refresh' 的 docstring." - (let* ((whole (length pyim-candidates)) + (let* ((whole (pyim-process-candidates-length)) (len pyim-page-length) - (pos pyim-candidate-position) + (pos (pyim-process-get-candidate-position)) (last (* (/ (+ (1- pos) len) len) len))) (if (< last whole) last - (if finish - whole -(pyim-page-end t) + whole))) (defun pyim-page-refresh (&optional hightlight-current) "刷新 page 页面的函数. -这个函数主要用来处理选词框选词后，刷新显示问题，pyim 使用 -`pyim-candidates' 来保存 *待选词列表* ，\"nihao\" 对应的 -`pyim-candidates' 的值类似： +这个函数主要用来处理选词框选词后，刷新显示问题， + +\"nihao\" 对应的 *待选词列表* 类似： (\"你好\" \"倪皓\" \"泥\" \"你\" ... \"慝\") @@ -183,8 +179,9 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 第4页 柅猊郳 輗 坭 惄 堄 儗 伲 第5页 祢慝 -`pyim-candidate-position' 的取值以及 `pyim-page-length' 的设定值 -（默认设置为9），共同决定了 pyim 需要显示哪一页，比如： +`pyim-process-get-candidate-position' 的返回值以及 +`pyim-page-length' 的设定值（默认设置为9），共同决定了 pyim 需要 +显示哪一页，比如： 第1页 你好 倪皓 泥你 呢 拟 逆 腻 妮 第2页 怩溺 尼禰 齯 麑 鲵 蜺 衵 @@ -192,25 +189,25 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 第4页 柅猊 郳輗 坭 惄 堄 儗 伲 第5页 祢慝 -假设当前选择的词条为 \"睨\", 那么 `pyim-candidate-position' 的取 -值为 A 所在的位置。那么： +假设当前选择的词条为 \"睨\", 那么 `pyim-process-get-candidate-position' +的返回值为 A 所在的位置。那么： 1. 函数 `pyim-page-current-page' 返回值为3， 说明当前 page 为第3页。 2. 函数 `pyim-page-total-page' 返回值为5，说明 page 共有5页。 3. 函数 `pyim-page-start' 返回 B 所在的位置。 4. 函数 `pyim-page-end' 返回 E 所在的位置。 -5. 函数 `pyim-page-refresh' 会从 `pyim-candidates' 中提取一个 sublist: +5. 函数 `pyim-page-refresh' 会从待选词条列表中提取一个 sublist: (\"薿\" \"旎\" \"睨\" \"铌\" \"昵\" \"匿\" \"倪\" \"霓\" \"暱\") - 这个 sublist 的起点为 `pyim-page-start' 的返回值，终点为 - `pyim-page-end' 的返回值。并保存到一个 hashtable 的 - :candidates 关键字对应的位置，这个 hastable 最终会做为参数传递 - 给 `pyim-page-style' 相关的函数，用于生成用于在选词框中显示的 - 字符串。" +这个 sublist 的起点为 `pyim-page-start' 的返回值，终点为 +`pyim-page-end' 的返回值。并保存到一个 hashtable 的 :candidates +关键字对应的位置，这个 hastable 最终会做为参数传递给 +`pyim-page-style' 相关的函数，用于生成用于在选词框中显示的字符串。 +" (let* ((start (1- (pyim-page-start))) (end (pyim-page-end)) - (candidates pyim-candidates) + (candidates (pyim-process-get-candidates)) (candidate-showed (mapcar (lambda (x) (let ((comment (get-text-property 0 :comment x))) @@ -218,7 +215,9 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 (concat x comment) x))) (cl-subseq candidates start end))) - (pos (- (min pyim-candidate-position (length candidates)) start)) + (pos (- (min (pyim-process-get-candidate-position) + (length candidates)) + start)) (page-info (make-hash-table)) (tooltip (pyim-page-get-valid-tooltip))) (puthash :current-page (pyim-page-current-page) page-info) @@ -237,29 +236,23 @@ page 的概念，比如，上面的 “niha
[nongnu] elpa/projectile 6b3a73fddc 1/2: [Fix #1765] Re-add defaults for src-dir and test-dir
branch: elpa/projectile commit 6b3a73fddc04031ea36f677c26cc85af4c25e8fe Author: lWarne Commit: Bozhidar Batsov [Fix #1765] Re-add defaults for src-dir and test-dir Use "src/" and "test/" as defaults for the src-dir and test-dir attributes of a project type when toggling between implementation and test files. Improve error messages for implementation and test file toggling --- projectile.el | 189 test/projectile-test.el | 80 +--- 2 files changed, 197 insertions(+), 72 deletions(-) diff --git a/projectile.el b/projectile.el index 7db137f93a..a70a8021f3 100644 --- a/projectile.el +++ b/projectile.el @@ -530,6 +530,22 @@ See also `projectile-update-mode-line'." :type 'function :package-version '(projectile . "2.0.0")) +(defcustom projectile-default-src-directory "src/" + "The default value of a project's src-dir property. + +It's used as a fallback in the case the property is not set for a project +type when `projectile-toggle-between-implementation-and-test' is used." + :group 'projectile + :type 'string) + +(defcustom projectile-default-test-directory "test/" + "The default value of a project's test-dir property. + +It's used as a fallback in the case the property is not set for a project +type when `projectile-toggle-between-implementation-and-test' is used." + :group 'projectile + :type 'string) + ;;; Idle Timer (defvar projectile-idle-timer nil @@ -3426,7 +3442,7 @@ IMPL-FILE-PATH may be a absolute path, relative path or a file name." (cond (test-prefix (concat test-prefix impl-file-name "." impl-file-ext)) (test-suffix (concat impl-file-name test-suffix "." impl-file-ext)) - (t (error "Project type `%s' not supported!" project-type) + (t (error "Cannot determine a test file name, one of \"test-suffix\" or \"test-prefix\" must be set for project type `%s'" project-type) (defun projectile--impl-name-for-test-name (test-file-path) "Determine the name of the implementation file for TEST-FILE-PATH. @@ -3442,7 +3458,7 @@ TEST-FILE-PATH may be a absolute path, relative path or a file name." (concat (string-remove-prefix test-prefix test-file-name) "." test-file-ext)) (test-suffix (concat (string-remove-suffix test-suffix test-file-name) "." test-file-ext)) - (t (error "Project type `%s' not supported!" project-type) + (t (error "Cannot determine an implementation file name, one of \"test-suffix\" or \"test-prefix\" must be set for project type `%s'" project-type) (defun projectile--test-to-impl-dir (test-dir-path) "Return the directory path of an impl file with test file in TEST-DIR-PATH. @@ -3452,12 +3468,50 @@ string) are replaced with the current project type's src-dir property (which should be a string) to obtain the new directory. Nil is returned if either the src-dir or test-dir properties are not strings." - (let ((test-dir (projectile-project-type-attribute - (projectile-project-type) 'test-dir)) -(impl-dir (projectile-project-type-attribute - (projectile-project-type) 'src-dir))) + (let* ((project-type (projectile-project-type)) + (test-dir (projectile-project-type-attribute project-type 'test-dir)) + (impl-dir (projectile-project-type-attribute project-type 'src-dir))) (when (and (stringp test-dir) (stringp impl-dir)) - (projectile-complementary-dir test-dir-path test-dir impl-dir + (if (not (string-match-p test-dir (file-name-directory test-dir-path))) + (error "Attempted to find a implementation file by switching this project type's (%s) test-dir property \"%s\" with this project type's src-dir property \"%s\", but %s does not contain \"%s\"" + project-type test-dir impl-dir test-dir-path test-dir) +(projectile-complementary-dir test-dir-path test-dir impl-dir) + +(defun projectile--impl-to-test-dir-fallback (impl-dir-path) + "Return the test file for IMPL-DIR-PATH by guessing a test directory. + +Occurrences of the `projectile-default-src-directory' in the directory of +IMPL-DIR-PATH are replaced with `projectile-default-test-directory'. Nil is +returned if `projectile-default-src-directory' is not a substring of +IMPL-DIR-PATH." + (when-let ((file (projectile--complementary-file +impl-dir-path +(lambda (f) + (when (string-match-p projectile-default-src-directory f) +(projectile-complementary-dir + impl-dir-path + projectile-default-src-directory + projectile-default-test-directory))) +#'projectile--test-name-for-impl-name))) +(file-relative-name file (projectile-project-root + +(defun projectile--test-to-impl-dir-fallback (test-dir-path) + "Return the impl file for TEST-DI
[elpa] externals/pyim 6ed46ceef6 3/3: Update Development.org
branch: externals/pyim commit 6ed46ceef67f3472089f986ebbd7b7d5dff3c9a7 Author: Feng Shu Commit: Feng Shu Update Development.org --- Development.org | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Development.org b/Development.org index aa09ad825c..3819afcf4c 100644 --- a/Development.org +++ b/Development.org @@ -23,22 +23,20 @@ | | | | --- | | | | | | | | Entered, Imobjs, Codes, | | | | | | | | Candidates, Outcome, | | | | -| | | | Punctuations, Cregexp,| | | | -| | | | Cstring, Probe, | | | | -| | | | Autoselector, Pinyin, | | | | -| | | | Scheme, Assistant-scheme, | | | | -| | | |---+ | | | -| | | | Dcache| | | | -| | | | Common| | | | -| | | | Pymap | | | | +| | | | Punctuations, Pinyin, | | | | +| | | | Cstring, Cregexp, | | | | +| | | | Scheme, Assistant-scheme | | | | +| | | +---+ | | | +| | | | Common, Dcache, Pymap | | | | +| | | | | | | | | | | +---+ | | | | | | | | | -| | | | | | +| | | 自动上屏器： Autoselector | | | | | +-+ | | | | | | -| | PYIM 持久化层: | | -| | -- | | -| | Dregcache | | +| | PYIM 持久化层: 探针： | | +| | -- | | +| | Dregcache Probe | | | | Dhashcache | | | | Dict | | | +-+ |
[nongnu] elpa/projectile updated (defce6e6bb -> 405ccc90aa)
elpasync pushed a change to branch elpa/projectile. from defce6e6bb Fix support for preset-based installs in CMake projects. new 6b3a73fddc [Fix #1765] Re-add defaults for src-dir and test-dir new 405ccc90aa Add changelog entry for [#1765] fix Summary of changes: CHANGELOG.md| 1 + projectile.el | 189 test/projectile-test.el | 80 +--- 3 files changed, 198 insertions(+), 72 deletions(-)
[elpa] externals/pyim updated (7af7eb0a95 -> 6ed46ceef6)
elpasync pushed a change to branch externals/pyim. from 7af7eb0a95 pyim-dcache do not depend pyim-dict new 695edfe9cd pyim-page do not require pyim-entered. new 2d0f4d7001 pyim-page prefer functions in pyim-process. new 6ed46ceef6 Update Development.org Summary of changes: Development.org | 22 - pyim-page.el| 142 pyim-process.el | 9 3 files changed, 79 insertions(+), 94 deletions(-)
[elpa] externals/pyim 695edfe9cd 1/3: pyim-page do not require pyim-entered.
branch: externals/pyim commit 695edfe9cd01ddef293c0d76e5a0690804cc9b60 Author: Feng Shu Commit: Feng Shu pyim-page do not require pyim-entered. * pyim-page.el (require): Do not require pyim-entered. (pyim-page-next-page) (pyim-page-next-word): Use pyim-process-get-entered instead. (pyim-entered-with-entered-buffer): Do not declare. (pyim-page-preview-create:quanpin) (pyim-page-preview-create:xingma): Use pyim-process-with-entered-buffer instead. --- pyim-page.el | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pyim-page.el b/pyim-page.el index 31c97ecd4b..9a979f440d 100644 --- a/pyim-page.el +++ b/pyim-page.el @@ -36,9 +36,6 @@ (require 'pyim-preview) (require 'pyim-process) -(eval-when-compile - (require 'pyim-entered)) - (defgroup pyim-page nil "Page tools for pyim." :group 'pyim) @@ -251,7 +248,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 词条的位置。 3. 最后调用 `pyim-page-refresh' 来重新刷新页面。" (interactive "p") - (if (= (length (pyim-entered-get 'point-before)) 0) + (if (= (length (pyim-process-get-entered 'point-before)) 0) (progn (pyim-process-outcome-handle 'last-char) (pyim-process-terminate)) @@ -272,7 +269,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 (defun pyim-page-next-word (arg) (interactive "p") - (if (= (length (pyim-entered-get 'point-before)) 0) + (if (= (length (pyim-process-get-entered 'point-before)) 0) (progn (pyim-process-outcome-handle 'last-char) (pyim-process-terminate)) @@ -300,8 +297,6 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 (when class (funcall (intern (format "pyim-page-preview-create:%S" class)) separator -(declare-function 'pyim-entered-with-entered-buffer "pyim-entered") - (defun pyim-page-preview-create:quanpin (&optional separator) (let* ((separator (or separator " ")) (translated (string-join (mapcar (lambda (w) @@ -310,7 +305,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 separator))) (concat ;; | 显示光标位置的字符 - (pyim-entered-with-entered-buffer + (pyim-process-with-entered-buffer (if (equal 1 (point)) (concat "|" translated) (concat (replace-regexp-in-string (concat separator "'") "'" translated) @@ -360,7 +355,7 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 (split-string x "'") "'"))) ;; | 显示光标位置的字符 - (pyim-entered-with-entered-buffer + (pyim-process-with-entered-buffer (if (equal (point) (point-max)) (fmt (buffer-substring-no-properties (point-min) (point-max))) (concat (fmt (buffer-substring-no-properties (point-min) (point)))
[elpa] externals-release/org 8aff825682 1/2: Revert "org-faces.el: Use fixed-pitch"
branch: externals-release/org commit 8aff825682f75c2e889ba02a8bd5e2fbf7778009 Author: Bastien Commit: Bastien Revert "org-faces.el: Use fixed-pitch" This reverts commit 667cb6f1aeac330272d55cd2b8849ef75bf7e685. --- etc/ORG-NEWS | 3 +++ lisp/org-faces.el | 20 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index e4bb706e08..eba6072c52 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -437,6 +437,9 @@ This is the CSS class name to use for the top level content wrapper. *** New option ~org-babel-plantuml-svg-text-to-path~ +** New features +*** =ob-python= improvements to =:return= header argument + This option, nil by default, allows to add a SVG-specific post-export step that runs inkscape text-to-path replacement over the output file. diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 1db36bc72b..d96898372f 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -38,8 +38,7 @@ :group 'org-faces) (defface org-hide - '((default :inherit fixed-pitch) -(((background light)) (:foreground "white")) + 'background light)) (:foreground "white")) (((background dark)) (:foreground "black"))) "Face used to hide leading stars in headlines. The foreground color of this face should be equal to the background @@ -202,8 +201,7 @@ set the properties in the `org-column' face. For example, set :group 'org-faces) (defface org-date - '((default :inherit fixed-pitch) -(((class color) (background light)) (:foreground "Purple" :underline t)) + 'class color) (background light)) (:foreground "Purple" :underline t)) (((class color) (background dark)) (:foreground "Cyan" :underline t)) (t (:underline t))) "Face for date/time stamps." @@ -379,8 +377,7 @@ changes." (sexp :tag "Face") (defface org-table;Copied from `font-lock-function-name-face' - '((default :inherit fixed-pitch) -(((class color) (min-colors 88) (background light)) (:foreground "Blue1")) + 'class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) @@ -396,8 +393,7 @@ changes." :group 'org-faces) (defface org-formula - '((default :inherit fixed-pitch) -(((class color) (min-colors 88) (background light)) (:foreground "Firebrick")) + 'class color) (min-colors 88) (background light)) (:foreground "Firebrick")) (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1")) (((class color) (min-colors 8) (background light)) (:foreground "red")) (((class color) (min-colors 8) (background dark)) (:foreground "red")) @@ -405,12 +401,12 @@ changes." "Face for formulas." :group 'org-faces) -(defface org-code '((t :inherit (fixed-pitch shadow))) +(defface org-code '((t :inherit shadow)) "Face for fixed-width text like code snippets." :group 'org-faces :version "22.1") -(defface org-meta-line '((t :inherit (fixed-pitch font-lock-comment-face))) +(defface org-meta-line '((t :inherit font-lock-comment-face)) "Face for meta lines starting with \"#+\"." :group 'org-faces :version "22.1") @@ -437,7 +433,7 @@ This face applies to the #+TITLE:, #+SUBTITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords." :group 'org-faces) -(defface org-block `((t :inherit (fixed-pitch shadow) +(defface org-block `((t :inherit shadow ,@(and (>= emacs-major-version 27) '(:extend t "Face used for text inside various blocks. @@ -459,7 +455,7 @@ verse and quote blocks are fontified using the `org-verse' and "Face used for the line delimiting the end of source blocks." :group 'org-faces) -(defface org-verbatim '((t (:inherit (fixed-pitch shadow +(defface org-verbatim '((t (:inherit shadow))) "Face for fixed-with text like code snippets." :group 'org-faces :version "22.1")
[elpa] externals/org updated (bebf0bd42d -> bee31004bc)
elpasync pushed a change to branch externals/org. from bebf0bd42d Merge branch 'bugfix' new 8aff825682 Revert "org-faces.el: Use fixed-pitch" new 69c588947d lisp/org.el: Bump version to 9.5.3 new bee31004bc Merge branch 'bugfix' Summary of changes: etc/ORG-NEWS | 3 +++ lisp/org-faces.el | 20 2 files changed, 11 insertions(+), 12 deletions(-)
[elpa] externals/hyperbole 613c51b0ca: Verify add-cell does not set no-fill attribute (#188)
branch: externals/hyperbole commit 613c51b0cadd32a0e43aba6ec3452111c750d33d Author: Mats Lidell Commit: GitHub Verify add-cell does not set no-fill attribute (#188) --- ChangeLog | 5 + test/kotl-mode-tests.el | 14 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 340c44c573..16cc2b5e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-04-18 Mats Lidell + +* test/kotl-mode-tests.el (kotl-mode--add-cell-set-fill-attribute): Verify +add-cell do not set no-fill flag. + 2022-04-18 Bob Weiner * kotl/kotl-mode.el (kotl-mode:fill-cell): Fix issue where 'end' was set diff --git a/test/kotl-mode-tests.el b/test/kotl-mode-tests.el index 8bb18bc515..68850ef089 100644 --- a/test/kotl-mode-tests.el +++ b/test/kotl-mode-tests.el @@ -3,7 +3,7 @@ ;; Author: Mats Lidell ;; ;; Orig-Date:18-May-21 at 22:14:10 -;; Last-Mod: 2-Apr-22 at 23:58:08 by Mats Lidell +;; Last-Mod: 18-Apr-22 at 22:40:33 by Mats Lidell ;; ;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -546,5 +546,17 @@ (should (looking-at "1"))) (delete-file kotl-file +(ert-deftest kotl-mode--add-cell-set-fill-attribute () + "Add cell shall set the fill attribute." + (let ((kotl-file (make-temp-file "hypb" nil ".kotl"))) +(unwind-protect +(progn + (find-file kotl-file) + (insert "1") + (should-not (kcell-view:get-attr 'no-fill)) + (kotl-mode:add-cell) + (should-not (kcell-view:get-attr 'no-fill))) + (delete-file kotl-file + (provide 'kotl-mode-tests) ;;; kotl-mode-tests.el ends here
[elpa] externals-release/org updated (1f617727f1 -> 69c588947d)
elpasync pushed a change to branch externals-release/org. from 1f617727f1 org-at-timestamp-p: Fix invalid regexp groups for 'agenda scope new 8aff825682 Revert "org-faces.el: Use fixed-pitch" new 69c588947d lisp/org.el: Bump version to 9.5.3 Summary of changes: etc/ORG-NEWS | 3 +++ lisp/org-faces.el | 20 lisp/org.el | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-)
[elpa] externals-release/org 69c588947d 2/2: lisp/org.el: Bump version to 9.5.3
branch: externals-release/org commit 69c588947d1be9bca1eb8c773f2a8ff117d264ba Author: Bastien Commit: Bastien lisp/org.el: Bump version to 9.5.3 --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 6048689d30..1fc4251a34 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9,7 +9,7 @@ ;; Homepage: https://orgmode.org ;; Package-Requires: ((emacs "25.1")) -;; Version: 9.5.2 +;; Version: 9.5.3 ;; This file is part of GNU Emacs. ;;
[elpa] externals/org bee31004bc: Merge branch 'bugfix'
branch: externals/org commit bee31004bcf49bbdf353b41d3ee4e6b0c02cc415 Merge: bebf0bd42d 69c588947d Author: Bastien Commit: Bastien Merge branch 'bugfix' --- etc/ORG-NEWS | 3 +++ lisp/org-faces.el | 20 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index fd29d39d75..4f1309ecc8 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -586,6 +586,9 @@ This is the CSS class name to use for the top level content wrapper. *** New option ~org-babel-plantuml-svg-text-to-path~ +** New features +*** =ob-python= improvements to =:return= header argument + This option, nil by default, allows to add a SVG-specific post-export step that runs inkscape text-to-path replacement over the output file. diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 2350c3b08a..f919a6b474 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -38,8 +38,7 @@ :group 'org-faces) (defface org-hide - '((default :inherit fixed-pitch) -(((background light)) (:foreground "white")) + 'background light)) (:foreground "white")) (((background dark)) (:foreground "black"))) "Face used to hide leading stars in headlines. The foreground color of this face should be equal to the background @@ -202,8 +201,7 @@ set the properties in the `org-column' face. For example, set :group 'org-faces) (defface org-date - '((default :inherit fixed-pitch) -(((class color) (background light)) (:foreground "Purple" :underline t)) + 'class color) (background light)) (:foreground "Purple" :underline t)) (((class color) (background dark)) (:foreground "Cyan" :underline t)) (t (:underline t))) "Face for date/time stamps." @@ -379,8 +377,7 @@ changes." (sexp :tag "Face") (defface org-table;Copied from `font-lock-function-name-face' - '((default :inherit fixed-pitch) -(((class color) (min-colors 88) (background light)) (:foreground "Blue1")) + 'class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) @@ -396,8 +393,7 @@ changes." :group 'org-faces) (defface org-formula - '((default :inherit fixed-pitch) -(((class color) (min-colors 88) (background light)) (:foreground "Firebrick")) + 'class color) (min-colors 88) (background light)) (:foreground "Firebrick")) (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1")) (((class color) (min-colors 8) (background light)) (:foreground "red")) (((class color) (min-colors 8) (background dark)) (:foreground "red")) @@ -405,12 +401,12 @@ changes." "Face for formulas." :group 'org-faces) -(defface org-code '((t :inherit (fixed-pitch shadow))) +(defface org-code '((t :inherit shadow)) "Face for fixed-width text like code snippets." :group 'org-faces :version "22.1") -(defface org-meta-line '((t :inherit (fixed-pitch font-lock-comment-face))) +(defface org-meta-line '((t :inherit font-lock-comment-face)) "Face for meta lines starting with \"#+\"." :group 'org-faces :version "22.1") @@ -437,7 +433,7 @@ This face applies to the #+TITLE:, #+SUBTITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords." :group 'org-faces) -(defface org-block `((t :inherit (fixed-pitch shadow) +(defface org-block `((t :inherit shadow ,@(and (>= emacs-major-version 27) '(:extend t "Face used for text inside various blocks. @@ -463,7 +459,7 @@ verse and quote blocks are fontified using the `org-verse' and "Face used for inline source blocks as a whole." :group 'org-faces) -(defface org-verbatim '((t (:inherit (fixed-pitch shadow +(defface org-verbatim '((t (:inherit shadow))) "Face for fixed-with text like code snippets." :group 'org-faces :version "22.1")
[elpa] externals/consult updated (35ae1fe7cf -> 663bfbcb96)
elpasync pushed a change to branch externals/consult. from 35ae1fe7cf consult--temporary-files: Adjust mode-name of previewed buffers new e5f4f5cde3 Improve file preview new 8cbf124d54 Change calling convention of consult--previewed-files new e2d97ad870 consult-project-buffer: Support creation of new buffers new 663bfbcb96 consult--multi: Improve backward compatibility Summary of changes: README.org | 3 +- consult-xref.el | 6 +-- consult.el | 156 3 files changed, 94 insertions(+), 71 deletions(-)
[elpa] externals/consult e5f4f5cde3 1/4: Improve file preview
branch: externals/consult commit e5f4f5cde390d7f5aaa6e4558d7cf7755aec0e54 Author: Daniel Mendler Commit: Daniel Mendler Improve file preview - Fix https://github.com/oantolin/embark/issues/490 - Sources can have a :new function now to create new elements (See #539) - consult--multi-lookup: Handle non-existing candidates by redirecting to the :new function - Renamed consult--temporary-files to consult--previewed-files - consult--previewed-files must be called with the nil argument, whenever the previewed source is changed, i.e, when the CAND argument is nil. - Rename previewed file buffers (Prefix the name with "Preview:") and dissassociate the buffers from the files, such that opening the previewed buffer via `M-x embark-act RET` becomes possible if embark-quit-after-action=nil. --- README.org | 3 +- consult-xref.el | 4 +- consult.el | 150 +--- 3 files changed, 93 insertions(+), 64 deletions(-) diff --git a/README.org b/README.org index 0d08443cbf..1491631aff 100644 --- a/README.org +++ b/README.org @@ -600,7 +600,8 @@ Optional source fields: - =:annotate= Annotation function called for each candidate, returns string. - =:history= Name of history variable to add selected candidate. - =:default= Must be t if the first item of the source is the default value. -- =:action= Action function called with the selected candidate. +- =:action= Function called with the selected candidate. +- =:new= Function called with new candidate name, only if =:require-match= is nil. - =:state= State constructor for the source, must return the state function. - Other source fields can be added specifically to the use case. diff --git a/consult-xref.el b/consult-xref.el index 283781d201..5a80fd17df 100644 --- a/consult-xref.el +++ b/consult-xref.el @@ -51,10 +51,10 @@ (defun consult-xref--preview (display) "Xref preview with DISPLAY function." - (let ((open (consult--temporary-files)) + (let ((open (consult--previewed-files)) (preview (consult--jump-preview))) (lambda (action cand) - (when (eq action 'exit) + (unless cand (funcall open)) (let ((consult--buffer-display display)) (funcall preview action diff --git a/consult.el b/consult.el index b8551e8cdc..44055ee280 100644 --- a/consult.el +++ b/consult.el @@ -200,12 +200,12 @@ character, the *Completions* buffer and a few log buffers." :type '(repeat regexp)) (defcustom consult-buffer-sources - '(consult--source-hidden-buffer -consult--source-buffer + '(consult--source-buffer consult--source-recent-file consult--source-bookmark consult--source-project-buffer -consult--source-project-recent-file) +consult--source-project-recent-file +consult--source-hidden-buffer) "Sources used by `consult-buffer'. See also `consult-project-buffer-sources'. See `consult--multi' for a description of the source data structure." @@ -1127,9 +1127,8 @@ ORIG is the original function, HOOKS the arguments." (apply orig hooks)) (apply orig hooks))) -(defun consult--find-file-temporarily (name) +(defun consult--find-file-for-preview (name) "Open file NAME temporarily for preview." - (setq name (abbreviate-file-name (expand-file-name name))) ;; file-attributes may throw permission denied error (when-let* ((attrs (ignore-errors (file-attributes name))) (size (file-attribute-size attrs))) @@ -1162,10 +1161,10 @@ ORIG is the original function, HOOKS the arguments." name (file-size-human-readable size)) nil))) -(defun consult--temporary-files () +(defun consult--previewed-files () "Return a function to open files temporarily for preview." (let ((dir default-directory) -(hook (make-symbol "consult--temporary-files")) +(hook (make-symbol "consult--previewed-files")) (orig-buffers (buffer-list)) temporary-buffers) (fset hook @@ -1173,44 +1172,60 @@ ORIG is the original function, HOOKS the arguments." ;; Fully initialize previewed files and keep them alive. (unless (consult--completion-window-p) (let (live-files) -(dolist (buf temporary-buffers) - (when-let ((file (buffer-file-name buf)) - (wins (and (buffer-live-p buf) -(get-buffer-window-list buf +(pcase-dolist (`(,file . ,buf) temporary-buffers) + (when-let (wins (and (buffer-live-p buf) + (get-buffer-window-list buf))) (push (cons file (mapcar (lambda (win) -(list (window-state-get win t) win)) +(cons win (window-state-get win t)))
[elpa] externals/consult e2d97ad870 3/4: consult-project-buffer: Support creation of new buffers
branch: externals/consult commit e2d97ad870ec740d1685074889b2070ddeed7c39 Author: Daniel Mendler Commit: Daniel Mendler consult-project-buffer: Support creation of new buffers --- consult.el | 1 + 1 file changed, 1 insertion(+) diff --git a/consult.el b/consult.el index bf07c49ddc..d88ce696ba 100644 --- a/consult.el +++ b/consult.el @@ -4205,6 +4205,7 @@ If NORECORD is non-nil, do not record the buffer switch in the buffer list." :face consult-buffer :history buffer-name-history :state,#'consult--buffer-state +:new ,#'consult--buffer-action :enabled ,(lambda () consult-project-function) :items ,(lambda ()
[elpa] externals/consult 8cbf124d54 2/4: Change calling convention of consult--previewed-files
branch: externals/consult commit 8cbf124d5469c74f111ec4a6c1e0aba2192e9a28 Author: Daniel Mendler Commit: Daniel Mendler Change calling convention of consult--previewed-files Always expect an explicit argument now. --- consult-xref.el | 2 +- consult.el | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/consult-xref.el b/consult-xref.el index 5a80fd17df..29d50ca49e 100644 --- a/consult-xref.el +++ b/consult-xref.el @@ -55,7 +55,7 @@ (preview (consult--jump-preview))) (lambda (action cand) (unless cand -(funcall open)) +(funcall open nil)) (let ((consult--buffer-display display)) (funcall preview action (when-let (loc (and cand (eq action 'preview) diff --git a/consult.el b/consult.el index 44055ee280..bf07c49ddc 100644 --- a/consult.el +++ b/consult.el @@ -1189,7 +1189,7 @@ ORIG is the original function, HOOKS the arguments." (pcase-dolist (`(,win . ,state) wins) (setf (car (alist-get 'buffer state)) buf) (window-state-put state win -(lambda (&optional name) +(lambda (name) (if name (let ((default-directory dir)) (setq name (abbreviate-file-name (expand-file-name name))) @@ -3416,7 +3416,7 @@ narrowing and the settings `consult-goto-line-numbers' and (preview (consult--buffer-preview))) (lambda (action cand) (unless cand -(funcall open)) +(funcall open nil)) (funcall preview action (and cand (eq action 'preview) @@ -3664,7 +3664,7 @@ There exists no equivalent of this command in Emacs 28." (open (consult--previewed-files))) (lambda (action cand) (unless cand -(funcall open)) +(funcall open nil)) (funcall preview action (when-let (bm (and cand (eq action 'preview) (assoc cand bookmark-alist))) @@ -4486,7 +4486,7 @@ FIND-FILE is the file open function, defaulting to `find-file'." (jump (consult--jump-state))) (lambda (action cand) (unless cand -(funcall open)) +(funcall open nil)) (funcall jump action (consult--grep-position cand (and (not (eq action 'exit)) open))
[elpa] externals/consult 663bfbcb96 4/4: consult--multi: Improve backward compatibility
branch: externals/consult commit 663bfbcb968a3b3918be2d8cd4c41b31d237b08c Author: Daniel Mendler Commit: Daniel Mendler consult--multi: Improve backward compatibility Remove consult--multi-new-fallback --- consult.el | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/consult.el b/consult.el index d88ce696ba..cf3d157f24 100644 --- a/consult.el +++ b/consult.el @@ -2306,15 +2306,7 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." (consult--multi-source sources cand) (aref sources 0 (cons (if tofu (substring cand 0 -1) cand) - `(:action -,(or (plist-get source :new) - (apply-partially #'consult--multi-new-fallback - (plist-get source :category))) -,@source)) - -(defun consult--multi-new-fallback (cat cand) - "Fallback for new CAND of CAT for sources which do not specify a :new function." - (message "Cannot create new %s `%s'" cat cand)) + `(:new t :action ,(plist-get source :new) ,@source)) (defun consult--multi-candidates (sources) "Return `consult--multi' candidates from SOURCES." @@ -2395,9 +2387,10 @@ options are supported: :require-match, :history, :keymap, :initial, be overwritten only in special scenarios. The function returns the selected candidate in the form (cons candidate -source-value). The sources of the source list can either be symbols of source -variables or source values. Source values must be plists with the following -fields: +source-plist). For non-existing candidates the plist contains the entry +`:new t'. The sources of the source list can either be symbols of source +variables or source values. Source values must be plists with the +following fields: Required source fields: * :category - Completion category.
[nongnu] elpa/projectile updated (4fe6b464db -> 28076814ea)
elpasync pushed a change to branch elpa/projectile. from 4fe6b464db Change Grails app project filename to application.yml (#1770) new e8b0e2c10d Add a changelog entry new 28076814ea Tweak some changelog entries Summary of changes: CHANGELOG.md | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
[nongnu] elpa/projectile e8b0e2c10d 1/2: Add a changelog entry
branch: elpa/projectile commit e8b0e2c10d4b4662b477f0db78d43d6c8bb5e3e4 Author: Bozhidar Batsov Commit: Bozhidar Batsov Add a changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54fd55fd24..f450a7f2c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ * [#1447](https://github.com/bbatsov/projectile/issues/1447): Restructure the menu. * [#1692](https://github.com/bbatsov/projectile/issues/1692): Enable minibuffer completions when reading shell-commands. +* Change the Grails project marker to `application.yml`. ## 2.5.0 (2021-08-10)
[nongnu] elpa/projectile 28076814ea 2/2: Tweak some changelog entries
branch: elpa/projectile commit 28076814eae53e1d574902a605024d02c068cd9c Author: Bozhidar Batsov Commit: Bozhidar Batsov Tweak some changelog entries --- CHANGELOG.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f450a7f2c4..4601edd8f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,16 @@ ### New features -* [#1757](https://github.com/bbatsov/projectile/pull/1757) Add support for the Pijul VCS -* [#1745](https://github.com/bbatsov/projectile/pull/1745) Allow `projectile-update-project-type` to change project type precendence and remove project options. -* [#1699](https://github.com/bbatsov/projectile/pull/1699): `projectile-ripgrep` now supports [`rg.el`](https://github.com/dajva/rg.el). +* [#1757](https://github.com/bbatsov/projectile/pull/1757): Add support for the Pijul VCS. +* [#1745](https://github.com/bbatsov/projectile/pull/1745): Allow `projectile-update-project-type` to change project type precendence and remove project options. +* [#1699](https://github.com/bbatsov/projectile/pull/1699): `projectile-ripgrep` now supports [rg.el](https://github.com/dajva/rg.el). * [#1712](https://github.com/bbatsov/projectile/issues/1712): Make it possible to hide Projectile's menu. See `projectile-show-menu`. * [#1718](https://github.com/bbatsov/projectile/issues/1718): Add a project type definition for `GNUMakefile`. * [#1747](https://github.com/bbatsov/projectile/pull/1747): Add support for preset-based install-commands for CMake projects. ### Bugs fixed -* [#1762](https://github.com/bbatsov/projectile/pull/1762): Fix `projectile-globally-ignored-directories` unescaped regex +* [#1762](https://github.com/bbatsov/projectile/pull/1762): Fix `projectile-globally-ignored-directories` unescaped regex. * [#1713](https://github.com/bbatsov/projectile/issues/1731): Fix `projectile-discover-projects-in-directory` reordering known projects. * [#1514](https://github.com/bbatsov/projectile/issues/1514): Fix `projectile-ag` global ignores not in effect. * [#1714](https://github.com/bbatsov/projectile/issues/1714): Fix `projectile-discover-projects-in-directory` not interactive.
[elpa] externals/consult updated (663bfbcb96 -> 4a610493c7)
elpasync pushed a change to branch externals/consult. from 663bfbcb96 consult--multi: Improve backward compatibility new 16e49a8b1f Update changelog new 4a610493c7 Rename back some functions for compatibility Summary of changes: CHANGELOG.org | 9 + consult-xref.el | 4 ++-- consult.el | 22 +++--- 3 files changed, 18 insertions(+), 17 deletions(-)
[elpa] externals/consult 4a610493c7 2/2: Rename back some functions for compatibility
branch: externals/consult commit 4a610493c71782117003d7c0aeb0d0a7fbecb928 Author: Daniel Mendler Commit: Daniel Mendler Rename back some functions for compatibility --- CHANGELOG.org | 1 - consult-xref.el | 4 ++-- consult.el | 22 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index ac149077c1..7771f80d60 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -24,7 +24,6 @@ - Remove unused =consult-preview-map=. - Remove unnecessary =consult-recent-file-filter=. Use =recentf-exclude= instead. - =consult--multi= sources can have a =:new= function now to create candidates. -- Rename =consult--temporary-files= to =consult--previewed-files=. * Version 0.16 (2022-03-08) diff --git a/consult-xref.el b/consult-xref.el index 29d50ca49e..223e8283c5 100644 --- a/consult-xref.el +++ b/consult-xref.el @@ -51,11 +51,11 @@ (defun consult-xref--preview (display) "Xref preview with DISPLAY function." - (let ((open (consult--previewed-files)) + (let ((open (consult--temporary-files)) (preview (consult--jump-preview))) (lambda (action cand) (unless cand -(funcall open nil)) +(funcall open)) (let ((consult--buffer-display display)) (funcall preview action (when-let (loc (and cand (eq action 'preview) diff --git a/consult.el b/consult.el index cf3d157f24..9ae2285bf2 100644 --- a/consult.el +++ b/consult.el @@ -1127,7 +1127,7 @@ ORIG is the original function, HOOKS the arguments." (apply orig hooks)) (apply orig hooks))) -(defun consult--find-file-for-preview (name) +(defun consult--find-file-temporarily (name) "Open file NAME temporarily for preview." ;; file-attributes may throw permission denied error (when-let* ((attrs (ignore-errors (file-attributes name))) @@ -1161,10 +1161,10 @@ ORIG is the original function, HOOKS the arguments." name (file-size-human-readable size)) nil))) -(defun consult--previewed-files () +(defun consult--temporary-files () "Return a function to open files temporarily for preview." (let ((dir default-directory) -(hook (make-symbol "consult--previewed-files")) +(hook (make-symbol "consult--temporary-files")) (orig-buffers (buffer-list)) temporary-buffers) (fset hook @@ -1189,7 +1189,7 @@ ORIG is the original function, HOOKS the arguments." (pcase-dolist (`(,win . ,state) wins) (setf (car (alist-get 'buffer state)) buf) (window-state-put state win -(lambda (name) +(lambda (&optional name) (if name (let ((default-directory dir)) (setq name (abbreviate-file-name (expand-file-name name))) @@ -1199,7 +1199,7 @@ ORIG is the original function, HOOKS the arguments." ;; returns nil instead of returning the Dired buffer. (get-file-buffer name) (cdr (assoc name temporary-buffers)) - (when-let (buf (consult--find-file-for-preview name)) + (when-let (buf (consult--find-file-temporarily name)) ;; Only add new buffer if not already in the list (unless (or (rassq buf temporary-buffers) (memq buf orig-buffers)) (add-hook 'window-selection-change-functions hook) @@ -3405,11 +3405,11 @@ narrowing and the settings `consult-goto-line-numbers' and (defun consult--file-preview () "Create preview function for files." - (let ((open (consult--previewed-files)) + (let ((open (consult--temporary-files)) (preview (consult--buffer-preview))) (lambda (action cand) (unless cand -(funcall open nil)) +(funcall open)) (funcall preview action (and cand (eq action 'preview) @@ -3654,10 +3654,10 @@ There exists no equivalent of this command in Emacs 28." (defun consult--bookmark-preview () "Create preview function for bookmarks." (let ((preview (consult--jump-preview)) -(open (consult--previewed-files))) +(open (consult--temporary-files))) (lambda (action cand) (unless cand -(funcall open nil)) +(funcall open)) (funcall preview action (when-let (bm (and cand (eq action 'preview) (assoc cand bookmark-alist))) @@ -4476,11 +4476,11 @@ FIND-FILE is the file open function, defaulting to `find-file'." (defun consult--grep-state () "Grep state function." - (let ((open (consult--previewed-files)) + (let ((open (consult--temporary-files)) (jump (consult--jump-state))) (lambda (action cand) (unless cand -(funcall open nil)) +(funcall open)) (funcall jump action (consult--grep-position cand (and (not (eq action 'exit)) open))
[elpa] externals/consult 16e49a8b1f 1/2: Update changelog
branch: externals/consult commit 16e49a8b1f33589db21e5a1a3989659ef8dcc742 Author: Daniel Mendler Commit: Daniel Mendler Update changelog --- CHANGELOG.org | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index de096fd2e1..ac149077c1 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -9,10 +9,10 @@ - =consult-goto-line=: Use =goto-line-history= on Emacs 28. - =consult-customize=: Evaluate settings at runtime. This change makes it possible to use =thing-at-point= to overwrite the =:initial= and =:add-history= settings. -- =consult--read-config= renamed to =consult--customize-alist= and changed the - format. The configuration is an alist. The car must be a command symbol. The - cdr must be a plist of keys and expressions, where the expressions evaluate - to the actual configuration values. +- Rename =consult--read-config= to =consult--customize-alist= and change the format. + The configuration is an alist. The car must be a command symbol. The cdr must + be a plist of keys and expressions, where the expressions evaluate to the + actual configuration values. - Mode hooks in previewed file buffers are delayed. The buffer is only fully initialized when leaving the minibuffer for recursive editing. - Increase =consult-preview-raw-size=. @@ -23,6 +23,8 @@ state changes. See the docstring of =consult--with-preview= for details. - Remove unused =consult-preview-map=. - Remove unnecessary =consult-recent-file-filter=. Use =recentf-exclude= instead. +- =consult--multi= sources can have a =:new= function now to create candidates. +- Rename =consult--temporary-files= to =consult--previewed-files=. * Version 0.16 (2022-03-08)
[elpa] externals/corfu 821bed082f: corfu-quick: Follow upstream changes of @protesilaos' modus-themes
branch: externals/corfu commit 821bed082fc53c2eca7ab2bd20effb81694feffc Author: Daniel Mendler Commit: Daniel Mendler corfu-quick: Follow upstream changes of @protesilaos' modus-themes --- extensions/corfu-quick.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/corfu-quick.el b/extensions/corfu-quick.el index 77be057602..8377ac7cd3 100644 --- a/extensions/corfu-quick.el +++ b/extensions/corfu-quick.el @@ -52,9 +52,9 @@ (defface corfu-quick1 'class color) (min-colors 88) (background dark)) - :background "#2a40b8" :weight bold :foreground "white") + :background "#203448" :weight bold :foreground "#c6eaff") (((class color) (min-colors 88) (background light)) - :background "#77baff" :weight bold :foreground "black") + :background "#dde3f4" :weight bold :foreground "#093060") (t :background "blue" :foreground "white")) "Face used for the first quick key." :group 'corfu-faces)
[elpa] externals/vertico 707e515dd7: vertico-quick: Follow upstream changes of @protesilaos' modus-themes
branch: externals/vertico commit 707e515dd7d5470d4e68b4cad14de579a218e7cc Author: Daniel Mendler Commit: Daniel Mendler vertico-quick: Follow upstream changes of @protesilaos' modus-themes --- extensions/vertico-quick.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/vertico-quick.el b/extensions/vertico-quick.el index 621b4d33ba..1628fc25f9 100644 --- a/extensions/vertico-quick.el +++ b/extensions/vertico-quick.el @@ -39,9 +39,9 @@ (defface vertico-quick1 'class color) (min-colors 88) (background dark)) - :background "#2a40b8" :weight bold :foreground "white") + :background "#203448" :weight bold :foreground "#c6eaff") (((class color) (min-colors 88) (background light)) - :background "#77baff" :weight bold :foreground "black") + :background "#dde3f4" :weight bold :foreground "#093060") (t :background "blue" :foreground "white")) "Face used for the first quick key." :group 'vertico-faces)
[nongnu] elpa/projectile b014d79f5b: Fix version extraction logic
branch: elpa/projectile commit b014d79f5bca2103cf055b27334ad89f007a6ac8 Author: Bozhidar Batsov Commit: Bozhidar Batsov Fix version extraction logic --- CHANGELOG.md | 3 ++- projectile.el | 19 +-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4601edd8f6..a5683df02d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ * [#1714](https://github.com/bbatsov/projectile/issues/1714): Fix `projectile-discover-projects-in-directory` not interactive. * [#1734](https://github.com/bbatsov/projectile/pull/1734): Make `projectile--find-matching-test` use `src-dir/test-dir` properties. * [#1750](https://github.com/bbatsov/projectile/issues/1750): Fix source and test directories for Maven projects. -* [#1765](https://github.com/bbatsov/projectile/issues/1765): Fix `src-dir`/`test-dir` not defaulting to `"src/"` and `"test/"` with `projectile-toggle-between-implementation-and-test` +* [#1765](https://github.com/bbatsov/projectile/issues/1765): Fix `src-dir`/`test-dir` not defaulting to `"src/"` and `"test/"` with `projectile-toggle-between-implementation-and-test`. +* Fix version extraction logic. ### Changes diff --git a/projectile.el b/projectile.el index 4330fbf73a..51097ad6c5 100644 --- a/projectile.el +++ b/projectile.el @@ -823,11 +823,17 @@ If the value is nil, there is no limit to the opend buffers count." ;;; Version information -(defconst projectile-version - (eval-when-compile -(lm-version (or load-file-name buffer-file-name))) +(defconst projectile-version "2.6.0-snapshot" "The current version of Projectile.") +(defun projectile--pkg-version () + "Extract Projectile's package version from its package metadata." + ;; Use `cond' below to avoid a compiler unused return value warning + ;; when `package-get-version' returns nil. See #3181. + ;; FIXME: Inline the logic from package-get-version and adapt it + (cond ((fboundp 'package-get-version) + (package-get-version + ;;;###autoload (defun projectile-version (&optional show-version) "Get the Projectile version as string. @@ -842,9 +848,10 @@ If the version number could not be determined, signal an error, if called interactively, or if SHOW-VERSION is non-nil, otherwise just return nil." (interactive (list t)) - (if show-version - (message "Projectile %s" projectile-version) -projectile-version)) + ((let ((version (or (projectile--pkg-version) projectile-version + (if show-version + (message "Projectile %s" version) + version))) ;;; Misc utility functions (defun projectile-difference (list1 list2)
[elpa] externals/consult 99b1644b73 1/2: Improve consult--multi API
branch: externals/consult commit 99b1644b73156a770bec6763f16d6fa69acc8e55 Author: Daniel Mendler Commit: Daniel Mendler Improve consult--multi API The result source plist will have either :new=nil or :new=t. --- consult.el | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/consult.el b/consult.el index 9ae2285bf2..946ea39e35 100644 --- a/consult.el +++ b/consult.el @@ -2305,8 +2305,8 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." (source (if tofu (consult--multi-source sources cand) (aref sources 0 -(cons (if tofu (substring cand 0 -1) cand) - `(:new t :action ,(plist-get source :new) ,@source)) +`(,(if tofu (substring cand 0 -1) cand) + :new t :action ,(plist-get source :new) ,@source) (defun consult--multi-candidates (sources) "Return `consult--multi' candidates from SOURCES." @@ -2387,8 +2387,8 @@ options are supported: :require-match, :history, :keymap, :initial, be overwritten only in special scenarios. The function returns the selected candidate in the form (cons candidate -source-plist). For non-existing candidates the plist contains the entry -`:new t'. The sources of the source list can either be symbols of source +source-plist). For non-existing candidates the plist has the entry `:new +t'. The sources of the source list can either be symbols of source variables or source values. Source values must be plists with the following fields: @@ -2433,7 +2433,9 @@ Optional source fields: (add-to-history history (car selected))) (when-let (action (plist-get (cdr selected) :action)) (funcall action (car selected))) -selected)) +(if (eq (plist-get (cdr selected) :new) t) +selected + `(,(car selected) :new nil ,@(cdr selected) Internal API: consult--prompt
[elpa] externals/consult 09c2520609 2/2: consult--multi-lookup: Add todo comment (See #539)
branch: externals/consult commit 09c252060914a3c0cd8a5cee5116f67123c0b937 Author: Daniel Mendler Commit: Daniel Mendler consult--multi-lookup: Add todo comment (See #539) --- consult.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/consult.el b/consult.el index 946ea39e35..078f945e40 100644 --- a/consult.el +++ b/consult.el @@ -2304,6 +2304,8 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." (let* ((tofu (consult--tofu-p (aref cand (1- (length cand) (source (if tofu (consult--multi-source sources cand) + ;; TODO Use narrowed source here or fallback to source + ;; with :default=t. Take source 0 only as last resort. (aref sources 0 `(,(if tofu (substring cand 0 -1) cand) :new t :action ,(plist-get source :new) ,@source)
[elpa] externals/consult updated (4a610493c7 -> 09c2520609)
elpasync pushed a change to branch externals/consult. from 4a610493c7 Rename back some functions for compatibility new 99b1644b73 Improve consult--multi API new 09c2520609 consult--multi-lookup: Add todo comment (See #539) Summary of changes: consult.el | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-)
[elpa] externals/consult 2d10dbd869 3/5: consult-buffer: Add comment
branch: externals/consult commit 2d10dbd8694225c5dc682e6bcad0e0c473a9974f Author: Daniel Mendler Commit: Daniel Mendler consult-buffer: Add comment --- consult.el | 1 + 1 file changed, 1 insertion(+) diff --git a/consult.el b/consult.el index 69413e0ee3..7c13b4c859 100644 --- a/consult.el +++ b/consult.el @@ -4322,6 +4322,7 @@ configuration of the virtual buffer sources." :prompt "Switch to: " :history 'consult--buffer-history :sort nil))) +;; For non-matching candidates, fall back to buffer creation. (unless (plist-get (cdr selected) :match) (consult--buffer-action (car selected)
[elpa] externals/consult updated (09c2520609 -> e3c6f0e41f)
elpasync pushed a change to branch externals/consult. from 09c2520609 consult--multi-lookup: Add todo comment (See #539) new 8bccc73073 consult--multi: Support the creation of new candidates (Fix #539) new 35e1be47ef consult--multi: Refine return value, return :match property new 2d10dbd869 consult-buffer: Add comment new 8e4e4fadc2 consult--read: Update docstring, update changelog new e3c6f0e41f consult--read: Use positional arguments for :lookup (see #539) Summary of changes: CHANGELOG.org | 8 ++- consult.el| 172 -- 2 files changed, 102 insertions(+), 78 deletions(-)
[elpa] externals/consult 35e1be47ef 2/5: consult--multi: Refine return value, return :match property
branch: externals/consult commit 35e1be47ef2090331f58409628d0c933dd01d324 Author: Daniel Mendler Commit: Daniel Mendler consult--multi: Refine return value, return :match property :match is either nil, t or new. --- consult.el | 45 - 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/consult.el b/consult.el index d483025d39..69413e0ee3 100644 --- a/consult.el +++ b/consult.el @@ -2318,8 +2318,7 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." sources)) ((seq-find (lambda (src) (plist-get src :default)) sources)) ((aref sources 0) -`(,(if tofu (substring selected 0 -1) selected) - :new t :action ,(plist-get src :new) ,@src) +`(,(if tofu (substring selected 0 -1) selected) :match nil ,@src) (defun consult--multi-candidates (sources) "Return `consult--multi' candidates from SOURCES." @@ -2396,14 +2395,15 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." OPTIONS is the plist of options passed to `consult--read'. The following options are supported: :require-match, :history, :keymap, :initial, :add-history, :sort and :inherit-input-method. The other options of -`consult--read' are used by the implementation of `consult--multi' and should -be overwritten only in special scenarios. +`consult--read' are used by the implementation of `consult--multi' and +should be overwritten only in special scenarios. The function returns the selected candidate in the form (cons candidate -source-plist). For non-existing candidates the plist has the entry `:new -t'. The sources of the source list can either be symbols of source -variables or source values. Source values must be plists with the -following fields: +source-plist). The plist has the key :match with a value nil if the +candidate does not exist, t if the candidate exists and `new' if the +candidate has been created. The sources of the source list can either be +symbols of source variables or source values. Source values must be +plists with the following fields: Required source fields: * :category - Completion category. @@ -2444,11 +2444,14 @@ Optional source fields: :state (consult--multi-state sources)) (when-let (history (plist-get (cdr selected) :history)) (add-to-history history (car selected))) -(when-let (action (plist-get (cdr selected) :action)) - (funcall action (car selected))) -(if (eq (plist-get (cdr selected) :new) t) -selected - `(,(car selected) :new nil ,@(cdr selected) +(if (plist-member (cdr selected) :match) +(when-let (fun (plist-get (cdr selected) :new)) + (funcall fun (car selected)) + (plist-put (cdr selected) :match 'new)) + (when-let (fun (plist-get (cdr selected) :action)) +(funcall fun (car selected))) + (setq selected `(,(car selected) :match t ,@(cdr selected +selected)) Internal API: consult--prompt @@ -4216,7 +4219,6 @@ If NORECORD is non-nil, do not record the buffer switch in the buffer list." :face consult-buffer :history buffer-name-history :state,#'consult--buffer-state -:new ,#'consult--buffer-action :enabled ,(lambda () consult-project-function) :items ,(lambda () @@ -4280,7 +4282,6 @@ If NORECORD is non-nil, do not record the buffer switch in the buffer list." :face consult-buffer :history buffer-name-history :state,#'consult--buffer-state -:new ,#'consult--buffer-action :default t :items ,(lambda () (consult--buffer-query :sort 'visibility @@ -4315,12 +4316,14 @@ keys. In order to determine the project-specific files and buffers, the default to `consult-buffer-sources'. See `consult--multi' for the configuration of the virtual buffer sources." (interactive) - (consult--multi (or sources consult-buffer-sources) - :require-match - (confirm-nonexistent-file-or-buffer) - :prompt "Switch to: " - :history 'consult--buffer-history - :sort nil)) + (let ((selected (consult--multi (or sources consult-buffer-sources) + :require-match + (confirm-nonexistent-file-or-buffer) + :prompt "Switch to: " + :history 'consult--buffer-history + :sort nil))) +(unless (plist-get (cdr selected) :match) + (consult--buffer-action (car selected) ;; Populate `consult-project-buffer-sources'. (setq consult-project-buffer-sources
[elpa] externals/consult 8e4e4fadc2 4/5: consult--read: Update docstring, update changelog
branch: externals/consult commit 8e4e4fadc27dd48269f607e9d290ccff3353a3e3 Author: Daniel Mendler Commit: Daniel Mendler consult--read: Update docstring, update changelog --- CHANGELOG.org | 8 +++- consult.el| 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 7771f80d60..b0c4beb476 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -21,9 +21,15 @@ - BREAKING API CHANGE of =consult--read=, =consult--prompt=, =consult--multi=: The state function protocol changed. The function gets notified of more completion state changes. See the docstring of =consult--with-preview= for details. +- BREAKING API CHANGE of =consult--read=: The lookup function protocol changed. + The lookup function must now take keyword arguments. - Remove unused =consult-preview-map=. - Remove unnecessary =consult-recent-file-filter=. Use =recentf-exclude= instead. -- =consult--multi= sources can have a =:new= function now to create candidates. +- =consult--multi= sources can have a =:new= function to create candidates. + When narrowed to a source, new candidates will be created by calling the + respective =:new= function. +- =consult--multi= returns =:match= information. =:match= can be nil, t, or new, + depending on if the candidate does not exist, exists or has been created. * Version 0.16 (2022-03-08) diff --git a/consult.el b/consult.el index 7c13b4c859..541e52dd50 100644 --- a/consult.el +++ b/consult.el @@ -2217,7 +2217,7 @@ DEFAULT is the default selected value. ADD-HISTORY is a list of items to add to the history. CATEGORY is the completion category. SORT should be set to nil if the candidates are already sorted. -LOOKUP is a lookup function passed the input, candidates and candidate string. +LOOKUP is a lookup function passed the :input, :selected, :narrow and :candidates keys. ANNOTATE is a function passed a candidate string to return an annotation. INITIAL is the initial input. STATE is the state function, see `consult--with-preview'.
[elpa] externals/consult 8bccc73073 1/5: consult--multi: Support the creation of new candidates (Fix #539)
branch: externals/consult commit 8bccc73073247cd395a84165515a68468790a6dd Author: Daniel Mendler Commit: Daniel Mendler consult--multi: Support the creation of new candidates (Fix #539) consult--read: Change the calling convention of the :lookup function. --- consult.el | 128 ++--- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/consult.el b/consult.el index 078f945e40..d483025d39 100644 --- a/consult.el +++ b/consult.el @@ -200,12 +200,12 @@ character, the *Completions* buffer and a few log buffers." :type '(repeat regexp)) (defcustom consult-buffer-sources - '(consult--source-buffer + '(consult--source-hidden-buffer +consult--source-buffer consult--source-recent-file consult--source-bookmark consult--source-project-buffer -consult--source-project-recent-file -consult--source-hidden-buffer) +consult--source-project-recent-file) "Sources used by `consult-buffer'. See also `consult-project-buffer-sources'. See `consult--multi' for a description of the source data structure." @@ -958,26 +958,27 @@ selection change to full Emacs markers." (setcar loc (set-marker (make-marker) (cdar loc) (caar loc loc)) -(defun consult--lookup-member (_ candidates cand) - "Lookup CAND in CANDIDATES list, return original element." - (car (member cand candidates))) +(cl-defun consult--lookup-member (&key selected candidates &allow-other-keys) + "Lookup SELECTED in CANDIDATES list, return original element." + (car (member selected candidates))) -(defun consult--lookup-cons (_ candidates cand) - "Lookup CAND in CANDIDATES alist, return cons." - (assoc cand candidates)) +(cl-defun consult--lookup-cons (&key selected candidates &allow-other-keys) + "Lookup SELECTED in CANDIDATES alist, return cons." + (assoc selected candidates)) -(defun consult--lookup-cdr (_ candidates cand) - "Lookup CAND in CANDIDATES alist, return cdr of element." - (cdr (assoc cand candidates))) +(cl-defun consult--lookup-cdr (&key selected candidates &allow-other-keys) + "Lookup SELECTED in CANDIDATES alist, return cdr of element." + (cdr (assoc selected candidates))) -(defun consult--lookup-location (_ candidates cand) - "Lookup CAND in CANDIDATES list of 'consult-location category, return the marker." - (when-let (found (member cand candidates)) +(cl-defun consult--lookup-location (&key selected candidates &allow-other-keys) + "Lookup SELECTED in CANDIDATES list of `consult-location' category. +Return the location marker." + (when-let (found (member selected candidates)) (car (consult--get-location (car found) -(defun consult--lookup-candidate (_ candidates cand) - "Lookup CAND in CANDIDATES list and return property 'consult--candidate." - (when-let (found (member cand candidates)) +(cl-defun consult--lookup-candidate (&key selected candidates &allow-other-keys) + "Lookup SELECTED in CANDIDATES list and return property `consult--candidate'." + (when-let (found (member selected candidates)) (get-text-property 0 'consult--candidate (car found (defun consult--forbid-minibuffer () @@ -1393,7 +1394,7 @@ FACE is the cursor face." "Add preview support for FUN. See `consult--with-preview' for the arguments PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE." - (let ((input "") selected timer last-preview) + (let ((input "") narrow selected timer last-preview) (consult--minibuffer-with-setup-hook (if (and state preview-key) (lambda () @@ -1419,7 +1420,7 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE." (with-selected-window (active-minibuffer-window) (let ((input (minibuffer-contents-no-properties))) (with-selected-window (or (minibuffer-selected-window) (next-window)) - (let ((transformed (funcall transform input cand)) + (let ((transformed (funcall transform narrow input cand)) (new-preview (cons input cand))) (when-let (debounce (consult--preview-key-debounce preview-key transformed)) (when timer @@ -1443,14 +1444,16 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE." (setq last-preview new-preview))) (consult--append-local-post-command-hook (lambda () - (setq input (minibuffer-contents-no-properties)) + (setq input (minibuffer-contents-no-properties) + narrow consult--narrow) (funcall consult--preview-function (lambda () (consult--append-local-post-command-hook - (lambda () (setq input (minibuffer-contents-no-properties)) + (lambda () (setq input (minibuffer-contents-no-properties) +
[elpa] externals/consult e3c6f0e41f 5/5: consult--read: Use positional arguments for :lookup (see #539)
branch: externals/consult commit e3c6f0e41f128a6fbeb5c037b2c913a618f52458 Author: Daniel Mendler Commit: Daniel Mendler consult--read: Use positional arguments for :lookup (see #539) --- CHANGELOG.org | 2 +- consult.el| 40 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index b0c4beb476..68bb531ba8 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -22,7 +22,7 @@ state function protocol changed. The function gets notified of more completion state changes. See the docstring of =consult--with-preview= for details. - BREAKING API CHANGE of =consult--read=: The lookup function protocol changed. - The lookup function must now take keyword arguments. + The function must now accept four or more arguments. - Remove unused =consult-preview-map=. - Remove unnecessary =consult-recent-file-filter=. Use =recentf-exclude= instead. - =consult--multi= sources can have a =:new= function to create candidates. diff --git a/consult.el b/consult.el index 541e52dd50..1292480933 100644 --- a/consult.el +++ b/consult.el @@ -958,25 +958,25 @@ selection change to full Emacs markers." (setcar loc (set-marker (make-marker) (cdar loc) (caar loc loc)) -(cl-defun consult--lookup-member (&key selected candidates &allow-other-keys) +(defun consult--lookup-member (selected candidates &rest _) "Lookup SELECTED in CANDIDATES list, return original element." (car (member selected candidates))) -(cl-defun consult--lookup-cons (&key selected candidates &allow-other-keys) +(defun consult--lookup-cons (selected candidates &rest _) "Lookup SELECTED in CANDIDATES alist, return cons." (assoc selected candidates)) -(cl-defun consult--lookup-cdr (&key selected candidates &allow-other-keys) +(defun consult--lookup-cdr (selected candidates &rest _) "Lookup SELECTED in CANDIDATES alist, return cdr of element." (cdr (assoc selected candidates))) -(cl-defun consult--lookup-location (&key selected candidates &allow-other-keys) +(defun consult--lookup-location (selected candidates &rest _) "Lookup SELECTED in CANDIDATES list of `consult-location' category. Return the location marker." (when-let (found (member selected candidates)) (car (consult--get-location (car found) -(cl-defun consult--lookup-candidate (&key selected candidates &allow-other-keys) +(defun consult--lookup-candidate (selected candidates &rest _) "Lookup SELECTED in CANDIDATES list and return property `consult--candidate'." (when-let (found (member selected candidates)) (get-text-property 0 'consult--candidate (car found @@ -2178,7 +2178,7 @@ PREVIEW-KEY are the preview keys." preview-key state (lambda (narrow input cand) (condition-case nil -(funcall lookup :input input :narrow narrow :candidates (funcall async nil) :selected cand) +(funcall lookup cand (funcall async nil) input narrow) (wrong-number-of-arguments ;; TODO Remove the condition-case after upgrades of :lookup functions (message "consult--read: The :lookup function protocol changed") @@ -2217,7 +2217,7 @@ DEFAULT is the default selected value. ADD-HISTORY is a list of items to add to the history. CATEGORY is the completion category. SORT should be set to nil if the candidates are already sorted. -LOOKUP is a lookup function passed the :input, :selected, :narrow and :candidates keys. +LOOKUP is a lookup function passed selected, candidates, input and narrow. ANNOTATE is a function passed a candidate string to return an annotation. INITIAL is the initial input. STATE is the state function, see `consult--with-preview'. @@ -2244,7 +2244,7 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." (list :prompt "Select: " :preview-key consult-preview-key :sort t -:lookup (lambda (&rest args) (plist-get args :selected)) +:lookup (lambda (selected &rest _) selected) Internal API: consult--multi @@ -2303,8 +2303,8 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method." (consult--ensure-list key))) sources -(cl-defun consult--multi-lookup (sources &key candidates selected narrow &allow-other-keys) - "Lookup SELECTED in CANDIDATES given SOURCES." +(defun consult--multi-lookup (sources selected candidates _input narrow &rest _) + "Lookup SELECTED in CANDIDATES given SOURCES, with potential NARROW." (unless (string-blank-p selected) (if-let (found (member selected candidates)) (cons (cdr (get-text-property 0 'multi-category (car found))) @@ -3011,13 +3011,14 @@ CURR-LINE is the current line number." (setcdr default-cand nil) (nconc b
[elpa] externals/consult updated (e3c6f0e41f -> 4223ef5edb)
elpasync pushed a change to branch externals/consult. from e3c6f0e41f consult--read: Use positional arguments for :lookup (see #539) new 5279e25178 consult--line-match: Simplify new 4dc67fc64b README: Update examples, add org-source with :new (See #539) new 4223ef5edb README: Update org-source Summary of changes: README.org | 55 --- consult.el | 7 +++ 2 files changed, 27 insertions(+), 35 deletions(-)
[elpa] externals/consult 4dc67fc64b 2/3: README: Update examples, add org-source with :new (See #539)
branch: externals/consult
commit 4dc67fc64bdab64553e07a3d825b8303fa234c91
Author: Daniel Mendler
Commit: Daniel Mendler
README: Update examples, add org-source with :new (See #539)
---
README.org | 54 +++---
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/README.org b/README.org
index 1491631aff..683b5e10f6 100644
--- a/README.org
+++ b/README.org
@@ -653,39 +653,31 @@ from a library like
https://github.com/minad/bookmark-view/.
bookmark-alist)
#+end_src
-Other useful sources allow the creation of terminal and eshell
-buffers if they do not exist yet.
+Another useful source lists all Org buffers and lets you create new ones. One
+can create similar sources for other major modes, e.g., for Eshell.
#+begin_src emacs-lisp
-(defun mode-buffer-exists-p (mode)
- (seq-some (lambda (buf)
- (provided-mode-derived-p
- (buffer-local-value 'major-mode buf)
- mode))
-(buffer-list)))
-
-(defvar eshell-source
- `(:category 'consult-new
-:face 'font-lock-constant-face
-:action ,(lambda (_) (eshell))
-:items
-,(lambda ()
- (unless (mode-buffer-exists-p 'eshell-mode)
- '("*eshell* (new)")
-
-(defvar term-source
- `(:category 'consult-new
-:face 'font-lock-constant-face
-:action
-,(lambda (_)
- (ansi-term (or (getenv "SHELL") "/bin/sh")))
-:items
-,(lambda ()
- (unless (mode-buffer-exists-p 'term-mode)
- '("*ansi-term* (new)")
-
-(add-to-list 'consult-buffer-sources 'eshell-source 'append)
-(add-to-list 'consult-buffer-sources 'term-source 'append)
+ (defvar org-source
+(list :category 'buffer
+ :face 'font-lock-constant-face
+ :name "Org buffers"
+ :narrow ?o
+ :state#'consult--buffer-state
+ :new
+ (lambda (name)
+(with-current-buffer (get-buffer-create name)
+ (insert "#+title: " name "\n\n")
+ (org-mode)
+ (consult--buffer-action (current-buffer
+ :items
+ (lambda ()
+(mapcar #'buffer-name
+(seq-filter
+ (lambda (x)
+ (eq (buffer-local-value 'major-mode x) 'org-mode))
+ (buffer-list))
+
+ (add-to-list 'consult-buffer-sources 'org-source 'append)
#+end_src
For more details, see the documentation of =consult-buffer= and of the
[elpa] externals/consult 4223ef5edb 3/3: README: Update org-source
branch: externals/consult commit 4223ef5edb3ed834fd9a80afb41a5fdcf561a2ab Author: Daniel Mendler Commit: Daniel Mendler README: Update org-source --- README.org | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.org b/README.org index 683b5e10f6..ea971eb18f 100644 --- a/README.org +++ b/README.org @@ -658,10 +658,11 @@ can create similar sources for other major modes, e.g., for Eshell. #+begin_src emacs-lisp (defvar org-source -(list :category 'buffer - :face 'font-lock-constant-face - :name "Org buffers" +(list :name "Org Buffer" + :category 'buffer :narrow ?o + :face 'consult-buffer + :history 'buffer-name-history :state#'consult--buffer-state :new (lambda (name)
[elpa] externals/consult 5279e25178 1/3: consult--line-match: Simplify
branch: externals/consult commit 5279e251787fde9cad9c82158566b7fa894a5e42 Author: Daniel Mendler Commit: Daniel Mendler consult--line-match: Simplify --- consult.el | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/consult.el b/consult.el index 1292480933..3d8b510b53 100644 --- a/consult.el +++ b/consult.el @@ -3011,14 +3011,13 @@ CURR-LINE is the current line number." (setcdr default-cand nil) (nconc before candidates))) -(defun consult--line-match (selected candidates input &rest rest) +(defun consult--line-match (selected candidates input &rest _) "Lookup position of match. SELECTED is the currently selected candidate. CANDIDATES is the list of candidates. -INPUT is the input string entered by the user. -REST are the remaining arguments passed to lookup." - (when-let (pos (apply #'consult--lookup-location selected candidates input rest)) +INPUT is the input string entered by the user." + (when-let (pos (consult--lookup-location selected candidates)) (if (or (string-blank-p input) (eq consult-line-point-placement 'line-beginning)) pos
[elpa] externals/compat e18ee33e09 1/4: Remove redundant binding of load-file-name in compat-entwine
branch: externals/compat commit e18ee33e091c8ec76a4235a50d1711818688ff7f Author: Philip Kaludercic Commit: Philip Kaludercic Remove redundant binding of load-file-name in compat-entwine --- compat.el | 32 +++- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/compat.el b/compat.el index b4473b0831..1283f64684 100644 --- a/compat.el +++ b/compat.el @@ -57,23 +57,21 @@ ((let* ((compat--generate-function 'compat--generate-minimal-no-prefix) (file (format "compat-%d.el" version)) defs) -(let ((load-file-name file)) - (with-temp-buffer -(insert-file-contents file) -(emacs-lisp-mode) -(while (progn - (forward-comment 1) - (not (eobp))) - (let ((form (read (current-buffer -(when (memq (car-safe form) -'(declare-function - compat-defun - compat-defmacro - compat-advise - compat-defvar - defvar)) - (push form defs)) - +(with-temp-buffer + (insert-file-contents file) + (emacs-lisp-mode) + (while (progn + (forward-comment 1) + (not (eobp))) +(let ((form (read (current-buffer + (when (memq (car-safe form) + '(declare-function +compat-defun +compat-defmacro +compat-advise +compat-defvar +defvar)) +(push form defs) (let ((byte-compile-current-file file)) (macroexpand-all (macroexp-progn
[elpa] externals/compat 322265d87b 2/4: Add 2022 to the copyright lines
branch: externals/compat commit 322265d87bfac76ead74e007a31298a20027d258 Author: Philip Kaludercic Commit: Philip Kaludercic Add 2022 to the copyright lines --- compat-24.el| 2 +- compat-25.el| 2 +- compat-26.el| 2 +- compat-27.el| 2 +- compat-28.el| 2 +- compat-macs.el | 2 +- compat-tests.el | 2 +- compat.el | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compat-24.el b/compat-24.el index ec4f08d695..a4beccb73f 100644 --- a/compat-24.el +++ b/compat-24.el @@ -1,6 +1,6 @@ ;;; compat-24.el --- Compatibility Layer for Emacs 24.4 -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> diff --git a/compat-25.el b/compat-25.el index f0d52775ad..8703a89fb2 100644 --- a/compat-25.el +++ b/compat-25.el @@ -1,6 +1,6 @@ ;;; compat-25.el --- Compatibility Layer for Emacs 25.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> diff --git a/compat-26.el b/compat-26.el index 294b197331..b3fbd14c80 100644 --- a/compat-26.el +++ b/compat-26.el @@ -1,6 +1,6 @@ ;;; compat-26.el --- Compatibility Layer for Emacs 26.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> diff --git a/compat-27.el b/compat-27.el index 83eb328ae3..b3a9181e28 100644 --- a/compat-27.el +++ b/compat-27.el @@ -1,6 +1,6 @@ ;;; compat-27.el --- Compatibility Layer for Emacs 27.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> diff --git a/compat-28.el b/compat-28.el index f6f78b955a..862dd08b71 100644 --- a/compat-28.el +++ b/compat-28.el @@ -1,6 +1,6 @@ ;;; compat-28.el --- Compatibility Layer for Emacs 28.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> diff --git a/compat-macs.el b/compat-macs.el index df7b1e29db..e1dcf81eff 100644 --- a/compat-macs.el +++ b/compat-macs.el @@ -1,6 +1,6 @@ ;;; compat-macs.el --- Compatibility Macros -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Keywords: lisp diff --git a/compat-tests.el b/compat-tests.el index b523482006..8ba6f44503 100644 --- a/compat-tests.el +++ b/compat-tests.el @@ -1,6 +1,6 @@ ;;; compat-tests.el --- Tests for compat.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Package-Requires: ((emacs "28.1")) diff --git a/compat.el b/compat.el index 1283f64684..13dd46dc19 100644 --- a/compat.el +++ b/compat.el @@ -1,6 +1,6 @@ ;;; compat.el --- Compatibility Library -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Free Software Foundation, Inc. +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. ;; Author: Philip Kaludercic ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht>
[elpa] externals/compat c2893a892b 4/4: Use full path in compat-entwine
branch: externals/compat commit c2893a892b577d9072253e4e30c8a48b490fff63 Author: Philip Kaludercic Commit: Philip Kaludercic Use full path in compat-entwine --- compat.el | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compat.el b/compat.el index 3fdb9dfd74..7a9c2e4b69 100644 --- a/compat.el +++ b/compat.el @@ -55,7 +55,12 @@ (bound-and-true-p compat-testing)) `(load ,(format "compat-%d.el" version))) ((let* ((compat--generate-function 'compat--generate-minimal-no-prefix) - (file (format "compat-%d.el" version)) + (file (expand-file-name +(format "compat-%d.el" version) +(file-name-directory + (or (bound-and-true-p byte-compile-current-file) + load-file-name + (buffer-file-name) defs) (with-temp-buffer (insert-file-contents file)
[elpa] externals/compat 530ad76f7e 3/4: Document why byte-compile-current-file is bound
branch: externals/compat commit 530ad76f7e415ba84958eb53e2071bbeb577f390 Author: Philip Kaludercic Commit: Philip Kaludercic Document why byte-compile-current-file is bound --- compat.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compat.el b/compat.el index 13dd46dc19..3fdb9dfd74 100644 --- a/compat.el +++ b/compat.el @@ -72,6 +72,9 @@ compat-defvar defvar)) (push form defs) +;; We bind `byte-compile-current-file' before macro-expanding, +;; so that `compat--generate-function' can correctly infer the +;; compatibility version currently being processed. (let ((byte-compile-current-file file)) (macroexpand-all (macroexp-progn
[elpa] externals/compat updated (cbf0055617 -> c2893a892b)
elpasync pushed a change to branch externals/compat. from cbf0055617 Bump version to 28.1.0.5 new e18ee33e09 Remove redundant binding of load-file-name in compat-entwine new 322265d87b Add 2022 to the copyright lines new 530ad76f7e Document why byte-compile-current-file is bound new c2893a892b Use full path in compat-entwine Summary of changes: compat-24.el| 2 +- compat-25.el| 2 +- compat-26.el| 2 +- compat-27.el| 2 +- compat-28.el| 2 +- compat-macs.el | 2 +- compat-tests.el | 2 +- compat.el | 44 +--- 8 files changed, 32 insertions(+), 26 deletions(-)
[elpa] externals/javaimp ba57d3ce4f: Fix javaimp-beginning-of-defun, javaimp-end-of-defun
branch: externals/javaimp commit ba57d3ce4f4a0bceed57a13d3d7d797424cbbc92 Author: Filipp Gunbin Commit: Filipp Gunbin Fix javaimp-beginning-of-defun, javaimp-end-of-defun --- javaimp-parse.el | 4 +-- javaimp.el | 87 ++-- 2 files changed, 55 insertions(+), 36 deletions(-) diff --git a/javaimp-parse.el b/javaimp-parse.el index bf705b0ed7..fd3b2ae305 100644 --- a/javaimp-parse.el +++ b/javaimp-parse.el @@ -534,8 +534,8 @@ and END, both exclusive, optionally filtering them with PRED, and their parents with PARENT-PRED. Neither of PRED or PARENT-PRED should move point. Note that parents may be outside of region given by BEG and END. BEG is the LIMIT argument to -`previous-single-property-change', END defaults to end of -accessible portion of the buffer." +`previous-single-property-change', and so may be nil. END +defaults to end of accessible portion of the buffer." (javaimp--parse-all-scopes) (let ((pos (or end (point-max))) scope res) diff --git a/javaimp.el b/javaimp.el index 2729ccd278..4d42e4adb7 100644 --- a/javaimp.el +++ b/javaimp.el @@ -27,7 +27,8 @@ ;; helps you to quickly add imports when stepping through compilation ;; errors. In addition, this module provides good Imenu support for ;; Java source files - with nesting and abstract methods in interfaces -;; and abstract classes. +;; and abstract classes. It provides suitable functions to use as +;; beginning-of-defun-function / end-of-defun-function as well. ;; ;; ;; Quick start: @@ -91,11 +92,11 @@ ;; java.util.Collections from JDK 11 (~ 5600 lines and > 1000 ;; "scopes") parses in ~1.5 seconds, which is not that bad... ;; -;; Parsing is also used for Imenu support. A simple debug command, -;; `javaimp-show-scopes', lists all parsed "scopes" (blocks of code in -;; braces). As there's no minor/major mode (yet), you have to set -;; `imenu-create-index-function' in major mode hook yourself. See -;; example below. +;; Parsing is also used for Imenu support and for navigation commands. +;; As there's no minor/major mode (yet), you have to set +;; `imenu-create-index-function' and `beginning-of-defun-function' / +;; `end-of-defun-function' in major mode hook yourself. See example +;; below. ;; ;; - `javaimp-imenu-use-sub-alists' - if non-nil then Imenu items are ;; presented in a nested fashion, instead of a flat list (the @@ -104,6 +105,10 @@ ;; See other defcustoms via 'M-x customize-group javaimp'. ;; ;; +;; `javaimp-show-scopes' lists all parsed "scopes" (blocks of code in +;; braces), with support for `next-error'. +;; +;; ;; Configuration example: ;; ;; (require 'javaimp) @@ -118,7 +123,7 @@ ;; (local-set-key (kbd "C-c o") #'javaimp-organize-imports) ;; (local-set-key (kbd "C-c s") #'javaimp-show-scopes) ;; -;; To override other functions from cc-mode: +;; To set imenu and navigation functions use: ;; ;; (setq imenu-create-index-function #'javaimp-imenu-create-index) ;; @@ -891,26 +896,34 @@ opening brace." (if (zerop arg) t (when (> arg 0) (setq arg (1- arg))) -(when-let* ((tmp (javaimp--get-sibling-defuns)) -(prev-idx (or (car tmp) -1)) -(siblings (cdr tmp)) -(target-idx (- prev-idx arg))) - (when (and (>= target-idx 0) - (< target-idx (length siblings))) -(goto-char (javaimp-scope-open-brace -(nth target-idx siblings))) +(let* ((ctx (javaimp--get-sibling-context)) + (prev-idx (or (nth 2 ctx) -1)) + (siblings (nthcdr 3 ctx)) + (target-idx (- prev-idx arg))) + (cond ((or (not siblings) (< target-idx 0)) + (goto-char (nth 0 ctx)) + nil) +((>= target-idx (length siblings)) + (goto-char (nth 1 ctx)) + nil) +(t + (goto-char (javaimp-scope-open-brace + (nth target-idx siblings (defun javaimp-end-of-defun () "Function to be used as `end-of-defun-function'." - (ignore-errors -(goto-char - (scan-lists (point) 1 0 - -(defun javaimp--get-sibling-defuns () - "Return list of the form (PREV-INDEX . SIBLINGS), where SIBLINGS -is a list of all sibling defun scopes. PREV-INDEX is the index -of the \"previous\" (relative to point) scope in this list, or -nil." + (when (javaimp-scope-p + (get-text-property (point) 'javaimp-parse-scope)) +(ignore-errors + (goto-char + (scan-lists (point) 1 0) + +(defun javaimp--get-sibling-context () + "Return list of the form (FLOOR CEILING PREV-INDEX . SIBLINGS), +where SIBLINGS is a list of all sibling defun scopes. PREV-INDEX +is the index of the \"previous\" (relative to point) scope in +this list, or nil. FLOOR and CEILING are positions before and +after this group of defuns." (save-excursion (save-restriction (widen) @@ -927,15 +940,17 @@ nil." ;; nest
[elpa] externals/embark 5e86f50825: Add some commentary on recommend key bindings (fix #493)
branch: externals/embark
commit 5e86f50825469a6ef00d7a3c6d6f59af5b759495
Author: Omar Antolín
Commit: Omar Antolín
Add some commentary on recommend key bindings (fix #493)
---
README.org | 18 ++
embark.texi | 23 +++
2 files changed, 41 insertions(+)
diff --git a/README.org b/README.org
index 9e17aed49c..84c4fbdf84 100644
--- a/README.org
+++ b/README.org
@@ -285,6 +285,24 @@ starting configuration:
(embark-collect-mode . consult-preview-at-point-mode))
#+end_src
+About the suggested key bindings for =embark-act= and =embark-dwim=:
+- Those key bindings are unlikely to work in the terminal, but
+ terminal users are probably well aware of this and will know to
+ select different bindings.
+- The suggested =C-.= binding is used by default in (at least some
+ installations of) GNOME to input emojis, and Emacs doesn't even get
+ a chance to respond to the binding. You can select a different key
+ binding for =embark-act= or use =ibus-setup= to change the shortcut for
+ emoji insertion (Emacs uses =C-x 8 e e=, in case you want to set the
+ same one system-wide).
+- The suggested alternative of =M-.= for =embark-dwim= is bound by default
+ to =xref-find-definitions=. That is a very useful command but
+ overwriting it with =embark-dwim= is sensible since in Embark's
+ default configuration, =embark-dwim= will also find the definition of
+ the identifier at point. (Note that =xref-find-definitions= with a
+ prefix argument prompts you for an identifier, =embark-dwim= does not
+ cover this case).
+
Other Embark commands such as =embark-act-all=, =embark-become=,
=embark-collect=, and =embark-export= can be run through =embark-act= as
actions bound to =A=, =B=, =S= (for "snapshot"), and =E= respectively, and
diff --git a/embark.texi b/embark.texi
index a222a5d844..08681d76cd 100644
--- a/embark.texi
+++ b/embark.texi
@@ -382,6 +382,29 @@ starting configuration:
(embark-collect-mode . consult-preview-at-point-mode))
@end lisp
+About the suggested key bindings for @samp{embark-act} and @samp{embark-dwim}:
+@itemize
+@item
+Those key bindings are unlikely to work in the terminal, but
+terminal users are probably well aware of this and will know to
+select different bindings.
+@item
+The suggested @samp{C-.} binding is used by default in (at least some
+installations of) GNOME to input emojis, and Emacs doesn't even get
+a chance to respond to the binding. You can select a different key
+binding for @samp{embark-act} or use @samp{ibus-setup} to change the shortcut
for
+emoji insertion (Emacs uses @samp{C-x 8 e e}, in case you want to set the
+same one system-wide).
+@item
+The suggested alternative of @samp{M-.} for @samp{embark-dwim} is bound by
default
+to @samp{xref-find-definitions}. That is a very useful command but
+overwriting it with @samp{embark-dwim} is sensible since in Embark's
+default configuration, @samp{embark-dwim} will also find the definition of
+the identifier at point. (Note that @samp{xref-find-definitions} with a
+prefix argument prompts you for an identifier, @samp{embark-dwim} does not
+cover this case).
+@end itemize
+
Other Embark commands such as @samp{embark-act-all}, @samp{embark-become},
@samp{embark-collect}, and @samp{embark-export} can be run through
@samp{embark-act} as
actions bound to @samp{A}, @samp{B}, @samp{S} (for ``snapshot''), and @samp{E}
respectively, and
[elpa] externals/embark-consult updated (f46b6ba6a5 -> 5e86f50825)
elpasync pushed a change to branch externals/embark-consult. from f46b6ba6a5 Use dircategory "Emacs misc features" for info manual (fix #491) adds 5e86f50825 Add some commentary on recommend key bindings (fix #493) No new revisions were added by this update. Summary of changes: README.org | 18 ++ embark.texi | 23 +++ 2 files changed, 41 insertions(+)
[elpa] externals/javaimp 74f101433b: Fix tests
branch: externals/javaimp
commit 74f101433b1821ed4827b4ac2a1ddcad6542630a
Author: Filipp Gunbin
Commit: Filipp Gunbin
Fix tests
---
javaimp-tests.el | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/javaimp-tests.el b/javaimp-tests.el
index a895fc6658..42b5daa069 100644
--- a/javaimp-tests.el
+++ b/javaimp-tests.el
@@ -165,7 +165,10 @@ throws E1 {"
(dolist (item test-items)
(with-temp-buffer
(insert (nth 0 item))
- (let* ((javaimp--parse-scope-hook parser)
+ (let* ((javaimp--parse-scope-hook
+ (lambda (arg)
+(save-excursion
+ (funcall parser arg
(scopes (javaimp--parse-get-all-scopes)))
(should (= 1 (length scopes)))
(should (eq (javaimp-scope-type (car scopes)) (nth 1 item)))
[elpa] externals/embark 5cbacb33d3: Have wgrep correctly restore binding for revert-buffer
branch: externals/embark
commit 5cbacb33d31c7ef9f28b4db62e0f94c1eabe0b6d
Author: Omar Antolín
Commit: Omar Antolín
Have wgrep correctly restore binding for revert-buffer
Thanks to @minad for catching this over in #171.
Also, remove the embarrasing embark-general-map bindings in grep
export buffers.
---
embark-consult.el | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/embark-consult.el b/embark-consult.el
index c62a645d8d..5a92032cf9 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -173,6 +173,7 @@ This function is meant to be added to
`embark-collect-mode-hook'."
(embark-define-keymap embark-consult-export-grep-map
"A keymap for Embark Export grep-mode buffers."
+ :parent nil
("g" revert-buffer))
(defun embark-consult-export-grep (lines)
@@ -183,11 +184,13 @@ This function is meant to be added to
`embark-collect-mode-hook'."
(dolist (line lines) (insert line "\n"))
(goto-char (point-min))
(grep-mode)
- (setq-local wgrep-header/footer-parser #'ignore)
- (when (fboundp 'wgrep-setup) (wgrep-setup))
+ ;; Set up keymap before possible wgrep-setup, so that wgrep
+ ;; restores our binding too when the user finishes editing.
(use-local-map (make-composed-keymap
embark-consult-export-grep-map
- (current-local-map
+ (current-local-map)))
+ (setq-local wgrep-header/footer-parser #'ignore)
+ (when (fboundp 'wgrep-setup) (wgrep-setup)))
(pop-to-buffer buf)))
(defun embark-consult-goto-grep (location)
[elpa] externals/embark-consult updated (5e86f50825 -> 5cbacb33d3)
elpasync pushed a change to branch externals/embark-consult. from 5e86f50825 Add some commentary on recommend key bindings (fix #493) adds 5cbacb33d3 Have wgrep correctly restore binding for revert-buffer No new revisions were added by this update. Summary of changes: embark-consult.el | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[elpa] externals/eev a0bc909a2d: Added a new video: (find-2022pict2eluavideo).
branch: externals/eev commit a0bc909a2dde5858f289449d9a755a08b8284ebf Author: Eduardo Ochs Commit: Eduardo Ochs Added a new video: (find-2022pict2eluavideo). --- ChangeLog | 12 VERSION | 4 ++-- eev-hlinks.el | 22 -- eev-intro.el | 7 +++ eev-videolinks.el | 27 ++- 5 files changed, 59 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 526ef6b598..6da1738cf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2022-04-19 Eduardo Ochs + + * eev-videolinks.el (ee-1stclassvideos-info): added + "2022pict2elua". + (find-2022pict2eluavideo): new function. + +2022-04-17 Eduardo Ochs + + * eev-hlinks.el (ee-find-efunctiondescr-links) + (ee-find-evardescr-links, ee-find-efacedescr-links) + (ee-find-man-links, ee-find-custom-links): added non-eev links. + 2022-04-16 Eduardo Ochs * eev-wconfig.el: new file. diff --git a/VERSION b/VERSION index 15bdb63af5..d58e87356b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Sat Apr 16 08:39:20 GMT 2022 -Sat Apr 16 05:39:20 -03 2022 +Tue Apr 19 21:12:46 GMT 2022 +Tue Apr 19 18:12:46 -03 2022 diff --git a/eev-hlinks.el b/eev-hlinks.el index b2d6c8e3e6..135d000f38 100644 --- a/eev-hlinks.el +++ b/eev-hlinks.el @@ -19,7 +19,7 @@ ;; ;; Author: Eduardo Ochs ;; Maintainer: Eduardo Ochs -;; Version:20220412 +;; Version:20220417 ;; Keywords: e-scripts ;; ;; Latest version: <http://angg.twu.net/eev-current/eev-hlinks.el> @@ -386,7 +386,9 @@ the \"*(find-here-links)*\" buffer." (let ((f (ee-efunctiondescr-bufferp))) `((find-efunction-links ',f) (find-efunctiondescr ',f) - (find-efunction ',f + (find-efunction ',f) + (describe-function ',f) + ))) (defvar ee-evardescr-re "^\\([^ \t\n]+\\) is a variable") (defun ee-evardescr-bufferp () (ee-buffer-help ee-evardescr-re 1)) @@ -394,14 +396,18 @@ the \"*(find-here-links)*\" buffer." (let ((v (ee-evardescr-bufferp))) `((find-evariable-links ',v) (find-evardescr ',v) - (find-evariable ',v + (find-evariable ',v) + (describe-variable ',v) + ))) (defvar ee-efacedescr-re "^Face: \\([^ \t\n]+\\)") (defun ee-efacedescr-bufferp () (ee-buffer-help ee-efacedescr-re 1)) (defun ee-find-efacedescr-links () (let ((f (ee-efacedescr-bufferp))) `((find-eface-links ',f) - (find-efacedescr ',f + (find-efacedescr ',f) + (describe-face ',f) + ))) (defvar ee-epackage-re "^\\([^ \t\n]+\\) is a[ -~]+ package") (defvar ee-epackage-re-27 "^Package \\([^ \t\n]+\\) is") ; for Emacs 27 @@ -416,13 +422,17 @@ the \"*(find-here-links)*\" buffer." (defvar ee-man-re "^\\*Man \\(.*\\)\\*$") (defun ee-find-man-links () (let ((mp (ee-buffer-re ee-man-re))) -`((find-man ,mp +`((find-man ,mp) + (man ,mp) + ))) (defvar ee-custom-re "^\\*Customize Group: \\(.*\\)\\*$") (defun ee-find-custom-links () (let* ((name (ee-buffer-re ee-custom-re)) (symbol (intern (downcase (replace-regexp-in-string " " "-" name) -`((find-customizegroup ',symbol +`((find-customizegroup ',symbol) + (customize-group ',symbol) + ))) ;; Other cases (defun ee-file-bufferp () buffer-file-name) diff --git a/eev-intro.el b/eev-intro.el index 5cc004fda9..07d7d43c25 100644 --- a/eev-intro.el +++ b/eev-intro.el @@ -13606,10 +13606,9 @@ Version of these instructions: 2021nov13. Read the README below and then install Emacs using either the link to the .exe or the link to the .zip: -http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/ -http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/README-windows-binaries -http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/emacs-28.0.50-snapshot-2021-01-15-installer.exe -http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/emacs-28.0.50-snapshot-2021-01-15.zip +https://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/ +https://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/README-windows-binaries +https://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-28/emacs-28.0.92-installer.exe You may need to create a desktop icon or shortcut to /bin/runemacs.exe. diff --git a/eev-videolinks.el b/eev-videolinks.el index 5345445fdc..f19735f004 100644 --- a/eev-videolinks.el +++ b/eev-videolinks.el @@ -19,7 +19,7 @@ ;; ;; Author: Eduardo Ochs ;; Maintainer: Eduardo Ochs -;; Version:20220218 +;; Version:20220419 ;; Keywords: e-scripts ;; ;; Latest version: <http://angg.twu.net/eev-current/eev-videolinks.el> @@ -63,6 +63,7 @@ ;; «.find-2022eevmake0video» (to "find-2022eevmake0video")
[nongnu] elpa/evil 2a5360eccc: Exclude final empty line from implicit inclusion in substitution
branch: elpa/evil
commit 2a5360eccc9bcb784e61c3b58ebe4690f2c7ea49
Author: Tom Dalziel
Commit: Tom Dalziel <33435574+tomd...@users.noreply.github.com>
Exclude final empty line from implicit inclusion in substitution
Fixes #1321
---
evil-commands.el | 16 ++--
evil-tests.el| 11 ++-
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/evil-commands.el b/evil-commands.el
index 8a54de7321..3344c42322 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -3826,13 +3826,17 @@ reveal.el. OPEN-SPOTS is a local version of
`reveal-open-spots'."
(string-match-p "\n" (buffer-substring-no-properties
match-beg match-end)))
(setq zero-length-match (= match-beg match-end))
- (when (and (string= "^" evil-ex-substitute-regex)
- (= (point) end-marker))
+ (when (= match-end end-marker)
;; The range (beg end) includes the final newline which
means
-;; end-marker is on one line down. With the regex "^" the
-;; beginning of this last line will be matched which we
don't
-;; want, so we abort here.
-(throw 'exit-search t))
+;; end-marker is on one line down, causing some issues...
+(when (and (not match-contains-newline) (bolp))
+ ;; With the exception of explicitly substituting
newlines,
+ ;; we abort when the match ends here and it's an empty
line
+ (throw 'exit-search t))
+(when (string= "^" evil-ex-substitute-regex)
+ ;; With the regex "^" the beginning of this last line
+ ;; will be matched which we don't want, so we abort here
+ (throw 'exit-search t)))
(setq evil-ex-substitute-last-point match-beg)
(if confirm
(let ((prompt
diff --git a/evil-tests.el b/evil-tests.el
index ad47b5daae..b1ea72f194 100644
--- a/evil-tests.el
+++ b/evil-tests.el
@@ -7590,7 +7590,16 @@ echo foxtrot\ngolf hotel"
(evil-test-buffer
"[x]xyxxz"
(":%s/x//g" [return])
- "[y]z")))
+ "[y]z"))
+ (ert-info ("Substitute doesn't match final empty line")
+(evil-test-buffer
+ "abc\n[d]ef\n\nghi"
+ (":s/$/4")
+ "abc\n[d]ef4\n\nghi")
+(evil-test-buffer
+ "abc\n[d]ef\n\nghi"
+ (":s/f\\w*/4")
+ "abc\n[d]e4\n\nghi")))
(ert-deftest evil-test-ex-repeat-substitute-replacement ()
"Test `evil-ex-substitute' with repeating of previous substitutions."
[elpa] externals/embark a1c3c3d52b 2/2: Bind embark-kill-buffer-and-window to K to avoid clash
branch: externals/embark
commit a1c3c3d52b924286a2c2034786da9e60d8134c94
Author: Omar Antolín
Commit: Omar Antolín
Bind embark-kill-buffer-and-window to K to avoid clash
---
embark.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/embark.el b/embark.el
index 5c155269a3..ee61b9937e 100644
--- a/embark.el
+++ b/embark.el
@@ -3885,7 +3885,7 @@ library, which have an obvious notion of associated
directory."
("b" switch-to-buffer)
("o" switch-to-buffer-other-window)
("z" embark-bury-buffer)
- ("q" embark-kill-buffer-and-window)
+ ("K" embark-kill-buffer-and-window)
("r" embark-rename-buffer)
("=" ediff-buffers)
("|" embark-shell-command-on-buffer)
[elpa] externals/embark 02d9abe592 1/2: Add command to toggle quitting of next action
branch: externals/embark
commit 02d9abe5929e7c95cba516d3f65a3d5d41aff78c
Author: Omar Antolín
Commit: Omar Antolín
Add command to toggle quitting of next action
It is bound to q in the keymap-prompter and to to M-q in the
completing-read prompter.
It would be nice to tell the user whether or not the next action will
quit, but this is impossible since it depends on
(alist-get action embark-quit-after-action)
but, of course, the action is not known yet!
---
embark.el | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/embark.el b/embark.el
index bfacd36457..5c155269a3 100644
--- a/embark.el
+++ b/embark.el
@@ -604,6 +604,9 @@ the variable `embark--target-buffer'.")
(defvar-local embark--command nil
"Command that started the completion session.")
+(defvar-local embark--toggle-quit nil
+ "Should we toggle the default quitting behavior for the next action?")
+
(defun embark--minibuffer-point ()
"Return length of minibuffer contents."
(max 0 (- (point) (minibuffer-prompt-end
@@ -1120,7 +1123,7 @@ UPDATE is the indicator update function."
(quit-window 'kill-buffer win))
(embark-completing-read-prompter prefix-map update)))
((or 'universal-argument 'universal-argument-more
- 'negative-argument 'digit-argument)
+ 'negative-argument 'digit-argument 'embark-toggle-quit)
;; prevent `digit-argument' from modifying the overriding map
(let ((overriding-terminal-local-map overriding-terminal-local-map))
(command-execute cmd))
@@ -1270,11 +1273,17 @@ UPDATE function is passed to it."
(let* ((candidates+def (embark--formatted-bindings keymap))
(candidates (car candidates+def))
(def (and (not no-default) (cdr candidates+def)))
+ (buf (current-buffer))
(choice
(catch 'choice
(minibuffer-with-setup-hook
(lambda ()
(let ((map (make-sparse-keymap)))
+(define-key map (kbd "M-q")
+(lambda ()
+ (interactive)
+ (with-current-buffer buf
+(embark-toggle-quit
(when-let (cycle (embark--cycle-key))
;; Rebind `embark-cycle' in order allow cycling
;; from the `completing-read' prompter. Additionally
@@ -1989,7 +1998,10 @@ performing the ACTION, assuming this is done from a
minibuffer.
If NEGATE is non-nil, return the opposite value."
(let* ((cfg embark-quit-after-action)
(quit (if (consp cfg) (alist-get action cfg (alist-get t cfg)) cfg)))
-(if negate (not quit) quit)))
+(when negate (setq quit (not quit))) ; Emacs 27.1 has an xor function...
+(when embark--toggle-quit (setq quit (not quit)))
+(setq embark--toggle-quit nil)
+quit))
;;;###autoload
(defun embark-act (&optional arg)
@@ -3239,6 +3251,13 @@ Return the category metadatum as the type of the target."
(interactive)
(user-error "Not meant to be called directly"))
+(defun embark-toggle-quit ()
+ "Toggle whether the following action quits the minibuffer."
+ (interactive)
+ (when (minibufferp)
+(setq embark--toggle-quit (not embark--toggle-quit))
+(message "Quitting toggled.")))
+
(defun embark-insert (string &optional multiline)
"Insert STRING at point.
Some whitespace is also inserted if necessary to avoid having the
@@ -3703,6 +3722,7 @@ library, which have an obvious notion of associated
directory."
:parent embark-meta-map
("i" embark-insert)
("w" kill-new)
+ ("q" embark-toggle-quit)
("E" embark-export)
("S" embark-collect)
("L" embark-live)
[elpa] externals/embark updated (5cbacb33d3 -> a1c3c3d52b)
elpasync pushed a change to branch externals/embark. from 5cbacb33d3 Have wgrep correctly restore binding for revert-buffer new 02d9abe592 Add command to toggle quitting of next action new a1c3c3d52b Bind embark-kill-buffer-and-window to K to avoid clash Summary of changes: embark.el | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-)
[elpa] externals/embark-consult updated (5cbacb33d3 -> a1c3c3d52b)
elpasync pushed a change to branch externals/embark-consult. from 5cbacb33d3 Have wgrep correctly restore binding for revert-buffer adds 02d9abe592 Add command to toggle quitting of next action adds a1c3c3d52b Bind embark-kill-buffer-and-window to K to avoid clash No new revisions were added by this update. Summary of changes: embark.el | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-)
[elpa] externals/kind-icon 6ba28476cb: Fix compilation warning
branch: externals/kind-icon commit 6ba28476cb93173c22d5872f6b85c9fbc38cffa0 Author: JD Smith <93749+jdtsm...@users.noreply.github.com> Commit: JD Smith <93749+jdtsm...@users.noreply.github.com> Fix compilation warning --- kind-icon.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kind-icon.el b/kind-icon.el index b94226a258..825ac190c4 100644 --- a/kind-icon.el +++ b/kind-icon.el @@ -215,6 +215,9 @@ float FRAC." (plist-get completion-extra-properties (intern (format ":%s" type-name))) (cdr (assq (intern type-name) metadata +(defconst kind-icon--unknown + (propertize "???" 'face '(:weight bold :background "red"))) + (defun kind-icon-formatted (kind) "Return a formatted kind badge, either icon or text abbreviation. Caches this badge in `kind-icon--cache', and returns the cached @@ -277,9 +280,6 @@ background-color." (propertize (concat pad-left "??" pad-right) 'face font-lock-warning-face))) kind-icon--unknown))) -(defconst kind-icon--unknown - (propertize "???" 'face '(:weight bold :background "red"))) - (defun kind-icon-margin-formatter (metadata) "Return a margin-formatter function which produces kind icons. METADATA is the completion metadata supplied by the caller (see
[elpa] externals/org 81289bddee: lisp/ox-latex.el: Add Daniel Fleischer as the maintainer
branch: externals/org commit 81289bddee665ee2708c9eaefbaa57796fc08ad2 Author: Bastien Commit: Bastien lisp/ox-latex.el: Add Daniel Fleischer as the maintainer --- lisp/ox-latex.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 0edba9e527..841ad48bc5 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2011-2022 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou +;; Maintainer: Daniel Fleischer ;; Keywords: outlines, hypermedia, calendar, wp ;; This file is part of GNU Emacs.
