[elpa] externals/org updated (3cbd9f4233 -> 54f8b0bfd0)
elpasync pushed a change to branch externals/org. from 3cbd9f4233 org-lint: New checker for SCHEDULED/DEADLINE with inactive timestamp new a25d00d5df org-return: Do not insert inside folded region new 73e332a307 Merge branch 'bugfix' new 928f2d7fb0 Revert "org-return: Do not insert inside folded region" new 52bc95676c org-insert-heading: Fix when folded text is kept right at the new heading new 54f8b0bfd0 Merge branch 'bugfix' Summary of changes: lisp/org.el | 5 - testing/lisp/test-org.el | 18 -- 2 files changed, 20 insertions(+), 3 deletions(-)
[elpa] externals/org 73e332a307 1/3: Merge branch 'bugfix'
branch: externals/org commit 73e332a307276fa09d7fb8c1ab9684475c8e6069 Merge: 3cbd9f4233 a25d00d5df Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 6abb2db958..0c7fef0fa9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17950,6 +17950,8 @@ If INDENT is non-nil, call `newline-and-indent' with ARG to indent unconditionally; otherwise, call `newline' with ARG and INTERACTIVE, which can trigger indentation if `electric-indent-mode' is enabled." + (when interactive +(org-fold-check-before-invisible-edit 'insert)) (if indent (org-newline-and-indent arg) (newline arg interactive)))
[elpa] externals/org-remark 5cd59e70ef: docs: style sheets
branch: externals/org-remark
commit 5cd59e70ef2e52a83079952d28a787b95fe775c7
Author: Noboru Ota
Commit: Noboru Ota
docs: style sheets
---
docs/resources/reset.css | 114 ++
docs/resources/style.css | 175 +++
2 files changed, 289 insertions(+)
diff --git a/docs/resources/reset.css b/docs/resources/reset.css
new file mode 100644
index 00..9a6c3065f8
--- /dev/null
+++ b/docs/resources/reset.css
@@ -0,0 +1,114 @@
+/*
+Software License Agreement (BSD License)
+
+Copyright (c) 2006, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and
+binary forms, with or without modification, arepermitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
+
+html {
+color: #000;
+background: #FFF;
+}
+
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4,
+h5, h6, pre, code, form, fieldset, legend, input,
+button, textarea, p, blockquote, th, td {
+margin: 0;
+padding: 0;
+}
+
+table {
+border-collapse: collapse;
+border-spacing: 0;
+}
+
+fieldset, img {
+border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong,
+th, var, optgroup {
+font-style: inherit;
+font-weight: inherit;
+}
+
+del, ins {
+text-decoration: none;
+}
+
+li {
+list-style:none;
+}
+
+caption, th {
+text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+font-size: 100%;
+font-weight: normal;
+}
+
+q:before, q:after {
+content:'';
+}
+
+abbr, acronym {
+border: 0;
+font-variant: normal;
+}
+
+sup {
+vertical-align: baseline;
+}
+sub {
+vertical-align: baseline;
+}
+
+legend {
+color: #000;
+}
+
+input, button, textarea, select, optgroup, option {
+font-family: inherit;
+font-size: inherit;
+font-style: inherit;
+font-weight: inherit;
+}
+
+input, button, textarea, select {
+*font-size: 100%;
+}
diff --git a/docs/resources/style.css b/docs/resources/style.css
new file mode 100644
index 00..a86ff3dd12
--- /dev/null
+++ b/docs/resources/style.css
@@ -0,0 +1,175 @@
+/* This stylesheet is used by manuals and a few older resources. */
+
+@import url('reset.css');
+
+
+/*** PAGE LAYOUT ***/
+
+html, body {
+ font-size: 1em;
+ text-align: left;
+ text-decoration: none;
+}
+html { background-color: #e7e7e7; }
+
+body {
+ max-width: 74.92em;
+ margin: 0 auto;
+ padding: .5em 1em 1em 1em;
+ background-color: white;
+ border: .1em solid #c0c0c0;
+}
+
+/*** BASIC ELEMENTS ***/
+
+/* Size and positioning */
+
+p, pre, li, dt, dd, table, code, address { line-height: 1.3em; }
+
+h1 { font-size: 2em; margin: 1em 0 }
+h2 { font-size: 1.50em; margin: 1.0em 0 0.87em 0; }
+h3 { font-size: 1.30em; margin: 1.0em 0 0.87em 0; }
+h4 { font-size: 1.13em; margin: 1.0em 0 0.88em 0; }
+h5 { font-size: 1.00em; margin: 1.0em 0 1.00em 0; }
+
+p, pre { margin: 1em 0; }
+pre { overflow: auto; padding-bottom: .3em; }
+
+ul, ol, blockquote { margin-left: 1.5%; margin-right: 1.5%; }
+hr { margin: 1em 0; }
+/* Lists of underlined links are difficult to read. The top margin
+ gives a little more spacing between entries. */
+ul li { margin: .5em 1em; }
+ol li { margin: 1em; }
+ol ul li { margin: .5em 1em; }
+ul li p, ul ul li { margin-top: .3em; margin-bottom: .3em; }
+ul ul, ol ul { margin-top: 0; margin-bottom: 0; }
+
+/* Separate description lists from preceding text */
+dl { margin: 1em 0 0 0; }
+/* separate the "term" from subsequent "description" */
+dt { margin: .5em 0; }
+/* separate the "description" from subsequent list item
+ when the final child is an anonymous box */
+dd { margin: .5em 3% 1em 3%; }
+/* separate anonymous box (used to be the fi
[elpa] externals-release/org 52bc95676c 2/2: org-insert-heading: Fix when folded text is kept right at the new heading
branch: externals-release/org commit 52bc95676c89e2b2460d8a66d44dd41017464b08 Author: Ihor Radchenko Commit: Ihor Radchenko org-insert-heading: Fix when folded text is kept right at the new heading * lisp/org.el (org-insert-heading): Do not slurp blank lines after previous heading into the contents of the newly added one. These blank lines might be folded and we end up with point before folded spaces * ... * testing/lisp/test-org.el (test-org/insert-heading): Add test. (test-org/insert-todo-heading-respect-content): Do not expect trailing newline after the newly added heading. The test did not intentionally test this particular behavior (other tests do not expect trailing newlines to be _always_ added). Reported-by: Max Nikulin Link: https://orgmode.org/list/ubpcoi$f7n$1...@ciao.gmane.io --- lisp/org.el | 5 - testing/lisp/test-org.el | 18 -- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 02a0813392..09805836dd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6323,7 +6323,10 @@ unconditionally." (if (not level) (outline-next-heading) ;before first headline (org-back-to-heading invisible-ok) (when (equal arg '(16)) (org-up-heading-safe)) -(org-end-of-subtree))) +(org-end-of-subtree invisible-ok 'to-heading))) + ;; At `point-max', if the file does not have ending newline, + ;; create one, so that we are not appending stars at non-empty + ;; line. (unless (bolp) (insert "\n")) (when (and blank? (save-excursion (backward-char) diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index db9ad75726..db018b52d4 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -1965,7 +1965,21 @@ CLOCK: [2022-09-17 sam. 11:00]--[2022-09-17 sam. 11:46] => 0:46" (org-test-with-temp-text "* H1\n\n* H" (let ((org-blank-before-new-entry '((heading . t (org-insert-heading '(4)) - (buffer-string)) + (buffer-string) + ;; Do not include potentially folded empty lines. + (org-test-with-temp-text " +* Sec1 +** SubSec1 + +text + +** SubSec2 + +text +" +(org-content) +(org-insert-heading '(4)) +(should-not (org-fold-folded-p (ert-deftest test-org/insert-todo-heading-respect-content () "Test `org-insert-todo-heading-respect-content' specifications." @@ -1992,7 +2006,7 @@ CLOCK: [2022-09-17 sam. 11:00]--[2022-09-17 sam. 11:46] => 0:46" ;; Use the same TODO keyword as current heading. (should (equal -"* TODO \n" +"* TODO " (org-test-with-temp-text "* TODO\n** WAITING\n" (org-insert-todo-heading-respect-content) (buffer-substring-no-properties (line-beginning-position) (point-max))
[elpa] externals-release/org a25d00d5df 1/2: org-return: Do not insert inside folded region
branch: externals-release/org commit a25d00d5dff6c162b1bb7542201c590052d267fa Author: Ihor Radchenko Commit: Ihor Radchenko org-return: Do not insert inside folded region * lisp/org.el (org--newline): When called interactively, check for invisible edits. Reported-by: Kaiyu Zheng Link: https://orgmode.org/list/87wmxs8hxt.fsf@localhost --- lisp/org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index c5c0808104..02a0813392 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17663,6 +17663,8 @@ If INDENT is non-nil, call `newline-and-indent' with ARG to indent unconditionally; otherwise, call `newline' with ARG and INTERACTIVE, which can trigger indentation if `electric-indent-mode' is enabled." + (when interactive +(org-fold-check-before-invisible-edit 'insert)) (if indent (org-newline-and-indent arg) (newline arg interactive)))
[elpa] externals/org 54f8b0bfd0 3/3: Merge branch 'bugfix'
branch: externals/org commit 54f8b0bfd08645db7e2393d0c1eb287969b181d9 Merge: 928f2d7fb0 52bc95676c Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/org.el | 5 - testing/lisp/test-org.el | 18 -- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 6abb2db958..8511304857 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6372,7 +6372,10 @@ unconditionally." (if (not level) (outline-next-heading) ;before first headline (org-back-to-heading invisible-ok) (when (equal arg '(16)) (org-up-heading-safe)) -(org-end-of-subtree))) +(org-end-of-subtree invisible-ok 'to-heading))) + ;; At `point-max', if the file does not have ending newline, + ;; create one, so that we are not appending stars at non-empty + ;; line. (unless (bolp) (insert "\n")) (when (and blank? (save-excursion (backward-char) diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 1b00f6c455..3f38a560ea 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -2035,7 +2035,21 @@ CLOCK: [2022-09-17 sam. 11:00]--[2022-09-17 sam. 11:46] => 0:46" (org-test-with-temp-text "* H1\n\n* H" (let ((org-blank-before-new-entry '((heading . t (org-insert-heading '(4)) - (buffer-string)) + (buffer-string) + ;; Do not include potentially folded empty lines. + (org-test-with-temp-text " +* Sec1 +** SubSec1 + +text + +** SubSec2 + +text +" +(org-content) +(org-insert-heading '(4)) +(should-not (org-fold-folded-p (ert-deftest test-org/insert-todo-heading-respect-content () "Test `org-insert-todo-heading-respect-content' specifications." @@ -2062,7 +2076,7 @@ CLOCK: [2022-09-17 sam. 11:00]--[2022-09-17 sam. 11:46] => 0:46" ;; Use the same TODO keyword as current heading. (should (equal -"* TODO \n" +"* TODO " (org-test-with-temp-text "* TODO\n** WAITING\n" (org-insert-todo-heading-respect-content) (buffer-substring-no-properties (line-beginning-position) (point-max)
[elpa] externals/org-transclusion b10d4de93c: docs: html style sheet
branch: externals/org-transclusion
commit b10d4de93c6c0523bd4e7e72c11ef3a9a5630370
Author: Noboru Ota
Commit: Noboru Ota
docs: html style sheet
---
docs/resources/manual.css | 100 +++---
docs/resources/reset.css | 114 ++
docs/resources/style.css | 175 ++
3 files changed, 313 insertions(+), 76 deletions(-)
diff --git a/docs/resources/manual.css b/docs/resources/manual.css
index 38685ac744..944336e8aa 100644
--- a/docs/resources/manual.css
+++ b/docs/resources/manual.css
@@ -1,76 +1,24 @@
-/** Based on Org-roam's css
-https://github.com/org-roam/org-roam/blob/master/doc/assets/page.css
- **/
-:root {
- --border: #526980;
- --code: #007;
-}
-
-body {
-margin: 5ex auto;
-max-width: 850px;
-line-height: 1.5em;
-font-family: sans-serif;
-font-size: 18px;
-}
-
-h1, h2, h3 {
-font-weight: normal;
-}
-
-.settitle {
-display: none;
-}
-
-pre, code {
-font-family: x, monospace;
-}
-
-pre {
-padding: 1ex;
-background: #eee;
-border: solid 1px #ddd;
-min-width: 0;
-font-size: 80%;
-overflow: auto;
-}
-
-code {
-color: var(--code);
-}
-
-img {
-max-width: 100%;
-}
-
-table {
- border-collapse: collapse;
- width: 100%;
-}
-
-pre.menu-comment {
- background: none;
- border: none;
- font-family: sans-serif;
- padding: 0;
- margin: 0;
- font-size: 100%;
-}
-
-thead {
- border-bottom: 1px solid var(--border);
-}
-
-tfoot {
- border-top: 1px solid var(--border);
-}
-
-blockquote {
- margin-left: 1rem;
- font-style: italic;
- font-family: serif;
- border-left: 3px solid;
- border-left-color: currentcolor;
- border-color: var(--text-color);
- padding-left: 1em;
-}
+/* Style-sheet to use for Emacs manuals */
+
+/* Copyright (C) 2013-2022 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without any warranty.
+*/
+
+@import url('style.css');
+
+/* makeinfo convert @deffn and similar functions to something inside
+ . style.css uses italic for blockquote. This looks poor
+ in the Emacs manuals, which make extensive use of @defun (etc).
+ In particular, references to function arguments appear as
+ inside . Since is also italic, it makes it
+ impossible to distinguish variables. We could change to
+ e.g. bold-italic, or normal, or a different color, but that does
+ not look as good IMO. So we just override blockquote to be non-italic.
+ */
+blockquote { font-style: normal; }
+
+var { font-style: italic; }
diff --git a/docs/resources/reset.css b/docs/resources/reset.css
new file mode 100644
index 00..9a6c3065f8
--- /dev/null
+++ b/docs/resources/reset.css
@@ -0,0 +1,114 @@
+/*
+Software License Agreement (BSD License)
+
+Copyright (c) 2006, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and
+binary forms, with or without modification, arepermitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
+
+html {
+color: #000;
+background: #FFF;
+}
+
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4,
+h5, h6, pre, code, form, fieldset, legend, input,
+button, textarea, p, blockquote, th, td {
+margin: 0;
+padding: 0;
+}
+
+table {
+border-collapse: collapse;
+border-spacing: 0;
+}
+
+fieldset, img {
+border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong,
+th, var, optgroup {
+font-style: inherit;
+font-weight: inherit;
+}
+
+del, ins {
+text-decoration:
[elpa] externals/org 928f2d7fb0 2/3: Revert "org-return: Do not insert inside folded region"
branch: externals/org commit 928f2d7fb03e0932f3280af7a5087a564eaaf5e6 Author: Ihor Radchenko Commit: Ihor Radchenko Revert "org-return: Do not insert inside folded region" This reverts commit a25d00d5dff6c162b1bb7542201c590052d267fa. Direct call to `org-fold-check-before-invisible-edit' is no longer necessary on main. We use `org-fold-catch-invisible-edits-commands'. --- lisp/org.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 0c7fef0fa9..6abb2db958 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17950,8 +17950,6 @@ If INDENT is non-nil, call `newline-and-indent' with ARG to indent unconditionally; otherwise, call `newline' with ARG and INTERACTIVE, which can trigger indentation if `electric-indent-mode' is enabled." - (when interactive -(org-fold-check-before-invisible-edit 'insert)) (if indent (org-newline-and-indent arg) (newline arg interactive)))
[elpa] externals-release/org updated (27a41d418d -> 52bc95676c)
elpasync pushed a change to branch externals-release/org. from 27a41d418d org-element--cache-before-change: Fix edge case creating heading new a25d00d5df org-return: Do not insert inside folded region new 52bc95676c org-insert-heading: Fix when folded text is kept right at the new heading Summary of changes: lisp/org.el | 7 ++- testing/lisp/test-org.el | 18 -- 2 files changed, 22 insertions(+), 3 deletions(-)
[elpa] externals/urgrep df52f3cda2 1/3: Pass the finalized tool regexp syntx to the tool's command function
branch: externals/urgrep commit df52f3cda23e4023fbbfd71e2ff6a216b60f39fe Author: Jim Porter Commit: Jim Porter Pass the finalized tool regexp syntx to the tool's command function This doesn't change anything in practice, but it's slightly more correct. --- urgrep.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urgrep.el b/urgrep.el index 4f65fa8576..d1ece09ac1 100644 --- a/urgrep.el +++ b/urgrep.el @@ -589,7 +589,7 @@ COLOR: non-nil (the default) if the output should use color." (setq case-fold (isearch-no-upper-case-p query regexp-syntax))) ;; Build the command arguments. (if cmd-fun - (funcall cmd-fun query :tool tool :regexp regexp-syntax + (funcall cmd-fun query :tool tool :regexp tool-re-syntax :case-fold case-fold :hidden hidden :files files :group group :context context :color color) (let ((arguments (urgrep--get-prop 'arguments tool))
[elpa] externals/urgrep 6c684d74e5 3/3: Simplify the option-building in `eshell/urgrep`
branch: externals/urgrep commit 6c684d74e565acf209f63b0600b7ea72f6922bc5 Author: Jim Porter Commit: Jim Porter Simplify the option-building in `eshell/urgrep` --- urgrep.el | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/urgrep.el b/urgrep.el index ec65953d7a..7fb2c639d2 100644 --- a/urgrep.el +++ b/urgrep.el @@ -1291,11 +1291,10 @@ Recursively search for PATTERN within PATH.") (if context-after (string-to-number context-after) 0) options) ;; Fill the options to pass to `urgrep'. - (when context (setq options (nconc `(:context ,context) options))) - (when group (setq options (nconc `(:group ,(car group)) options))) - (when case-fold (setq options (nconc `(:case-fold ,(car case-fold)) - options))) - (when regexp (setq options (nconc `(:regexp ,(car regexp)) options))) + (when context (setq options `(:context ,context . ,options))) + (when group (setq options `(:group ,(car group) . ,options))) + (when case-fold (setq options `(:case-fold ,(car case-fold) . ,options))) + (when regexp (setq options `(:regexp ,(car regexp) . ,options))) ;; Run `urgrep'. (if (and (not (bound-and-true-p eshell-plain-grep-behavior)) (eshell-interactive-output-p) @@ -1309,7 +1308,7 @@ Recursively search for PATTERN within PATH.") (when (not (equal directory default-directory)) (error "Can't use plain urgrep with a non-default directory yet")) (unless (eshell-interactive-output-p) - (setq options (append '(:color nil) options))) + (setq options `(:color nil . ,options))) (throw 'eshell-replace-command (let* (;; Ensure we generate a POSIX shell-like command so that ;; Eshell can (hopefully) parse it correctly.
[elpa] externals/urgrep 842c97a8d1 2/3: Pass the default-directory as `:default-directory` and make it private
branch: externals/urgrep commit 842c97a8d1f933931c6ff1653a02ae5871638621 Author: Jim Porter Commit: Jim Porter Pass the default-directory as `:default-directory` and make it private This helps remove any potential ambiguity with keyword args to pass along to `urgrep-command`. --- urgrep.el | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/urgrep.el b/urgrep.el index d1ece09ac1..ec65953d7a 100644 --- a/urgrep.el +++ b/urgrep.el @@ -1200,27 +1200,34 @@ Type \\[urgrep-set-file-wildcards] to set a wildcard to filter the files \ searched." (interactive (let ((default-directory (urgrep--read-directory current-prefix-arg))) - `(,@(urgrep--read-query nil) :directory ,default-directory))) + `(,@(urgrep--read-query nil) :default-directory ,default-directory))) (let* ((tool (urgrep-get-tool (plist-get rest :tool))) - (directory (prog1 (plist-get rest :directory) - (cl-remf rest :directory))) + (directory (prog1 (plist-get rest :default-directory) + (cl-remf rest :default-directory))) (full-query (cons query rest)) (command (apply #'urgrep-command full-query))) (urgrep--start command full-query tool directory))) ;;;###autoload -(cl-defun urgrep-run-command (command &key directory tool) - "Recursively search in DIRECTORY using the given COMMAND. +(cl-defun urgrep-run-command (command &key ((:default-directory directory)) + tool) + "Recursively search using the given COMMAND. + +TOOL is the search tool corresponding to COMMAND (see +`urgrep-get-tool'). If nil, guess the tool based on the value of +COMMAND. When called interactively, this behaves like `urgrep', but allows you -to edit the command before running it." +to edit the command before running it. + +\(fn COMMAND &key TOOL)" (interactive (let* ((default-directory (urgrep--read-directory current-prefix-arg)) (query (urgrep--read-query nil)) (command (urgrep--read-command (apply #'urgrep-command query))) (tool (condition-case nil (urgrep--guess-tool command) (error (plist-get (cdr query) :tool) - (list command :directory default-directory :tool tool))) + (list command :default-directory default-directory :tool tool))) (let ((tool (if tool (urgrep-get-tool tool) (urgrep--guess-tool command (urgrep--start command command tool directory)))
[elpa] externals/urgrep updated (0f6b3ea835 -> 6c684d74e5)
elpasync pushed a change to branch externals/urgrep. from 0f6b3ea835 Clean up our implementation for let-binding buffer-local variables new df52f3cda2 Pass the finalized tool regexp syntx to the tool's command function new 842c97a8d1 Pass the default-directory as `:default-directory` and make it private new 6c684d74e5 Simplify the option-building in `eshell/urgrep` Summary of changes: urgrep.el | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-)
[nongnu] elpa/helm 8d48f2224f: No need to pass minibuffer-completing-file-name in HFF
branch: elpa/helm commit 8d48f2224f07dac10a5af4f375e4d8b9763726e5 Author: Thierry Volpiatto Commit: Thierry Volpiatto No need to pass minibuffer-completing-file-name in HFF The source is anyway using completing-file-name attr. When passing minibuffer-completing-file-name, it is propagated to helm-ls-git when brosing project from HFF, as a result match are higlighted only on basename of branches (when using -a). --- helm-files.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm-files.el b/helm-files.el index c069a213a9..5e43ca749a 100644 --- a/helm-files.el +++ b/helm-files.el @@ -5455,8 +5455,7 @@ Use it for non-interactive calls of `helm-find-files'." (expand-file-name tap ;; Ensure not being prompted for password each time we ;; navigate to a directory. - (password-cache t) - (minibuffer-completing-file-name t)) + (password-cache t)) (helm-set-local-variable 'helm-follow-mode-persistent nil 'helm-drag-mouse-1-fn 'helm-ff-drag-mouse-1-fn) (unless helm-source-find-files
[nongnu] elpa/helm-core updated (cc462522ba -> 8d48f2224f)
elpasync pushed a change to branch elpa/helm-core. from cc462522ba Update issue template adds 8d48f2224f No need to pass minibuffer-completing-file-name in HFF No new revisions were added by this update. Summary of changes: helm-files.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[elpa] externals/org 35960e1614 2/2: org-babel-execute-subtree: Document the argument in the docstring
branch: externals/org commit 35960e1614842fc88b0ad193479f71e2153ac02a Author: Ihor Radchenko Commit: Ihor Radchenko org-babel-execute-subtree: Document the argument in the docstring * lisp/ob-core.el (org-babel-execute-subtree): Clarify the meaning of command argument in the docstring. --- lisp/ob-core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 4496f4c4a4..373cbf3203 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1397,7 +1397,7 @@ the current buffer." (defun org-babel-execute-subtree (&optional arg) "Execute source code blocks in a subtree. Call `org-babel-execute-src-block' on every source block in -the current subtree." +the current subtree, passing over the prefix argument ARG." (interactive "P") (save-restriction (save-excursion
[elpa] externals/org bbdf9781c2 1/2: test-org/insert-todo-heading-respect-content: Fix tests
branch: externals/org commit bbdf9781c2f85448797830144b8c017c9238af61 Author: Ihor Radchenko Commit: Ihor Radchenko test-org/insert-todo-heading-respect-content: Fix tests * testing/lisp/test-org.el (test-org/insert-todo-heading-respect-content): Do not assert newline after newly added heading. See 52bc95676. --- testing/lisp/test-org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 3f38a560ea..deac5bd1aa 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -2082,7 +2082,7 @@ text (buffer-substring-no-properties (line-beginning-position) (point-max) (should (equal -"* TODO \n" +"* TODO " (let ((org-todo-keywords '((sequence "FIRST" "TODO" "|" "DONE" (org-test-with-temp-text "* TODO\n** WAITING\n" (org-insert-todo-heading-respect-content) @@ -2090,7 +2090,7 @@ text ;; Pass prefix argument. (should (equal -"* FIRST \n" +"* FIRST " (let ((org-todo-keywords '((sequence "FIRST" "TODO" "|" "DONE" (org-test-with-temp-text "* TODO\n** WAITING\n" (org-insert-todo-heading-respect-content '(4))
[elpa] externals/org updated (54f8b0bfd0 -> 35960e1614)
elpasync pushed a change to branch externals/org. from 54f8b0bfd0 Merge branch 'bugfix' new bbdf9781c2 test-org/insert-todo-heading-respect-content: Fix tests new 35960e1614 org-babel-execute-subtree: Document the argument in the docstring Summary of changes: lisp/ob-core.el | 2 +- testing/lisp/test-org.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[nongnu] elpa/helm-core updated (8d48f2224f -> da93e5c1f7)
elpasync pushed a change to branch elpa/helm-core. from 8d48f2224f No need to pass minibuffer-completing-file-name in HFF adds 150e25c48c Add more functions to helm-completing-read-command-categories adds da93e5c1f7 Fix bad completing-read default arg "nil" No new revisions were added by this update. Summary of changes: helm-mode.el | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-)
[nongnu] elpa/helm da93e5c1f7 2/2: Fix bad completing-read default arg "nil"
branch: elpa/helm
commit da93e5c1f7193fda629afcbe5bb539d92b64c9db
Author: Thierry Volpiatto
Commit: Thierry Volpiatto
Fix bad completing-read default arg "nil"
Some functions like debug-on-entry use (symbol-name sym)
without checking if sym is non nil, so the return value become
"nil".
---
helm-mode.el | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/helm-mode.el b/helm-mode.el
index f2b4a60a22..dc7f2a7f41 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -568,7 +568,10 @@ If COLLECTION is an `obarray', a TEST should be needed.
See `obarray'."
do (setq cands (delete d cands))
when str collect str)
cands))
- ((and (not (equal default ""))
+ ;; Some functions like debug-on-entry use (symbol-name sym)
+ ;; without checking if sym is non nil, so the return value become
+ ;; "nil".
+ ((and (not (member default '("" "nil")))
(string= helm-pattern ""))
(cons default (delete (helm-stringify default)
cands)))
[nongnu] elpa/helm updated (8d48f2224f -> da93e5c1f7)
elpasync pushed a change to branch elpa/helm. from 8d48f2224f No need to pass minibuffer-completing-file-name in HFF new 150e25c48c Add more functions to helm-completing-read-command-categories new da93e5c1f7 Fix bad completing-read default arg "nil" Summary of changes: helm-mode.el | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-)
[nongnu] elpa/helm 150e25c48c 1/2: Add more functions to helm-completing-read-command-categories
branch: elpa/helm
commit 150e25c48c165401e47c09f71fec4d95cec6b3ee
Author: Thierry Volpiatto
Commit: Thierry Volpiatto
Add more functions to helm-completing-read-command-categories
---
helm-mode.el | 7 +++
1 file changed, 7 insertions(+)
diff --git a/helm-mode.el b/helm-mode.el
index 8d7e852e06..f2b4a60a22 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -993,9 +993,16 @@ behavior as emacs vanilla.")
(defvar helm-completing-read-command-categories
'(("customize-variable" . symbol-help)
+("customize-set-variable" . symbol-help)
+("customize-set-value" . symbol-help)
+("customize-save-variable" . symbol-help)
+("set-variable" . symbol-help)
("customize-group" . symbol-help)
("find-function" . symbol-help)
("find-variable" . symbol-help)
+("trace-function" . symbol-help)
+("trace-function-foreground" . symbol-help)
+("trace-function-background" . symbol-help)
("find-library" . library)
("kill-buffer" . buffer)
("package-install" . package)
[nongnu] elpa/wfnames ea33697222 2/2: Add move line up and down commands
branch: elpa/wfnames commit ea336972227a5ffe29fed0aaa1ccaadf90743db3 Author: Thierry Volpiatto Commit: Thierry Volpiatto Add move line up and down commands --- wfnames.el | 22 ++ 1 file changed, 22 insertions(+) diff --git a/wfnames.el b/wfnames.el index 2edde04301..e2ed215f12 100644 --- a/wfnames.el +++ b/wfnames.el @@ -100,6 +100,8 @@ ;; This override ispell completion in iedit map which is useless ;; here. (define-key map (kbd "C-M-i") #'completion-at-point) +(define-key map (kbd "M-p") #'wfnames-move-line-up) +(define-key map (kbd "M-n") #'wfnames-move-line-down) map)) (defun wfnames-capf () @@ -317,6 +319,26 @@ This is used as `revert-buffer-function' for `wfnames-mode'." (wfnames-revert-current-line-1))) (re-search-forward "\\(?:/[^/]*\\)*/" (line-end-position) t))) +(defun wfnames-move-line-1 (arg) + "Move line one line down or up according to ARG. +ARG can be 1 for down or -1 for up." + (beginning-of-line) + (let* ((next (+ 1 (line-end-position))) + (line (buffer-substring (point) next))) +(delete-region (point) next) +(forward-line arg) +(insert line) +(forward-line -1))) + +(defun wfnames-move-line-down () + "Move line one line down." + (interactive) + (wfnames-move-line-1 1)) + +(defun wfnames-move-line-up () + "Move line one line up." + (interactive) + (wfnames-move-line-1 -1)) (provide 'wfnames)
[nongnu] elpa/wfnames 4c497aa8d2 1/2: Remove comment
branch: elpa/wfnames commit 4c497aa8d25403ceb2deaa5f6c811b489abaa152 Author: Thierry Volpiatto Commit: Thierry Volpiatto Remove comment --- wfnames.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/wfnames.el b/wfnames.el index 1a0f376296..2edde04301 100644 --- a/wfnames.el +++ b/wfnames.el @@ -106,8 +106,6 @@ "Provide filename completion in wfnames buffer." (let ((beg (line-beginning-position)) (end (point))) -;; FIXME: Does it make sense to extend beyond END to allow completing -;; file names mid-string? (list beg end #'completion-file-name-table :exit-function (lambda (str _status) (when (and (stringp str)
[nongnu] elpa/wfnames updated (e4d6097892 -> ea33697222)
elpasync pushed a change to branch elpa/wfnames. from e4d6097892 Use parents arg for make-directory new 4c497aa8d2 Remove comment new ea33697222 Add move line up and down commands Summary of changes: wfnames.el | 24 ++-- 1 file changed, 22 insertions(+), 2 deletions(-)
[elpa] externals/embark 1ca4f35342: Add key binding for make-symbolic-link
branch: externals/embark commit 1ca4f35342e953443adca63dd9077dcf9055 Author: Omar Antolín Camarena Commit: Omar Antolín Camarena Add key binding for make-symbolic-link --- embark.el | 1 + 1 file changed, 1 insertion(+) diff --git a/embark.el b/embark.el index 7e812171c9..704eea7bf5 100644 --- a/embark.el +++ b/embark.el @@ -4180,6 +4180,7 @@ This simply calls RUN with the REST of its arguments inside "D" #'delete-directory "r" #'rename-file "c" #'copy-file + "s" #'make-symbolic-link "j" #'embark-dired-jump "!" #'shell-command "&" #'async-shell-command
[elpa] externals/embark-consult updated (087bad2824 -> 1ca4f35342)
elpasync pushed a change to branch externals/embark-consult. from 087bad2824 Flip the meaning of the argument to embark-bindings adds 1ca4f35342 Add key binding for make-symbolic-link No new revisions were added by this update. Summary of changes: embark.el | 1 + 1 file changed, 1 insertion(+)
[nongnu] elpa/git-commit 667deaa74e: magit-stage-file: Fix staging ignored files
branch: elpa/git-commit commit 667deaa74e54031406d1c4e339c06493689ef102 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-stage-file: Fix staging ignored files --- lisp/magit-apply.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el index 43514d7929..d47b91e332 100644 --- a/lisp/magit-apply.el +++ b/lisp/magit-apply.el @@ -312,9 +312,9 @@ at point, stage the file but not its content." (list (magit-file-relative-name) ;;;###autoload -(defun magit-stage-file (files) +(defun magit-stage-file (files &optional force) "Read one or more files and stage all changes in those files. -With a prefix argument offer ignored files for completion." +With prefix argument FORCE, offer ignored files for completion." (interactive (let* ((choices (if current-prefix-arg (magit-ignored-files) @@ -325,11 +325,13 @@ With a prefix argument offer ignored files for completion." (default (car (member default choices (list (magit-completing-read-multiple (if current-prefix-arg "Stage ignored file,s: " "Stage file,s: ") -choices nil t nil nil default +choices nil t nil nil default) + current-prefix-arg))) (magit-with-toplevel ;; For backward compatibility, and because of ;; the function's name, don't require a list. -(magit-stage-1 nil (if (listp files) files (list files) +(magit-stage-1 (and force "--force") + (if (listp files) files (list files) ;;;###autoload (defun magit-stage-modified (&optional all)
[nongnu] elpa/magit updated (4881835572 -> 667deaa74e)
elpasync pushed a change to branch elpa/magit. from 4881835572 magit-log-reflog-re: Remove redundant '?' operator adds 667deaa74e magit-stage-file: Fix staging ignored files No new revisions were added by this update. Summary of changes: lisp/magit-apply.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
[nongnu] elpa/magit-section updated (4881835572 -> 667deaa74e)
elpasync pushed a change to branch elpa/magit-section. from 4881835572 magit-log-reflog-re: Remove redundant '?' operator adds 667deaa74e magit-stage-file: Fix staging ignored files No new revisions were added by this update. Summary of changes: lisp/magit-apply.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
[elpa] externals/cape 11cc35cc89 2/2: cape-wrap-super: Do not use private completion--some
branch: externals/cape commit 11cc35cc890c4789a12ca32e35917a15ec2bc1c5 Author: Daniel Mendler Commit: Daniel Mendler cape-wrap-super: Do not use private completion--some completion--some is private and performs unnecessary error handling. The assumption is that none of the merged tables throws an error. --- cape.el | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cape.el b/cape.el index 0d706f5644..57935f12ae 100644 --- a/cape.el +++ b/cape.el @@ -887,16 +887,14 @@ The functions `cape-wrap-super' and `cape-capf-super' are experimental." (setq cand-ht ht) (delq nil (apply #'nconc (nreverse candidates) (_ ;; try-completion and test-completion - (completion--some - (pcase-lambda (`(,table . ,plist)) - (complete-with-action - action table str - (if-let (pr (plist-get plist :predicate)) - (if pred - (lambda (x) (and (funcall pr x) (funcall pred x))) -pr) -pred))) - tables + (cl-loop for (table . plist) in tables thereis + (complete-with-action +action table str +(if-let (pr (plist-get plist :predicate)) +(if pred +(lambda (x) (and (funcall pr x) (funcall pred x))) + pr) + pred)) :exclusive no :company-prefix-length ,prefix-len ,@(mapcan
[elpa] externals/cape 01cee20ded 1/2: Add cape-wrap-super and cape-capf-super for consistency
branch: externals/cape commit 01cee20ded0f5790186f3e88b0414491de8640de Author: Daniel Mendler Commit: Daniel Mendler Add cape-wrap-super and cape-capf-super for consistency --- CHANGELOG.org | 2 + README.org| 23 - cape.el | 150 ++ 3 files changed, 91 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 8eb108dab6..fae614508a 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -5,6 +5,8 @@ * Development - Add =cape-wrap-debug= and =cape-capf-debug= to add debug messages to a Capf. +- Add =cape-wrap-super= and =cape-capf-super= for better consistency with the other + Capf combinators. * Version 0.17 (2023-08-14) diff --git a/README.org b/README.org index 5a0b2836d4..a8d0695f93 100644 --- a/README.org +++ b/README.org @@ -65,7 +65,7 @@ Furthermore the =cape-*= functions are Capfs which you can add to the since each of the Capfs adds a small runtime cost. Note that the Capfs which occur earlier in the list take precedence, such that the first Capf returning a result will win and the later Capfs may not get a chance to run. In order to -merge Capfs you can try the experimental function =cape-super-capf=. +merge Capfs you can try the experimental function =cape-capf-super=. One must distinguish the buffer-local and the global value of the =completion-at-point-functions= variable. The buffer-local value of the list takes @@ -175,7 +175,7 @@ It is possible to merge multiple Company backends and use them as a single Capf using the ~company--multi-backend-adapter~ function from Company. The adapter transforms multiple Company backends into a single Company backend, which can then be used as a Capf via ~cape-company-to-capf~. Capfs can be merged directly -with ~cape-super-capf~. +with ~cape-capf-super~. #+begin_src emacs-lisp (require 'company) @@ -191,34 +191,34 @@ with ~cape-super-capf~. /Throw multiple Capfs under the Cape and get a Super-Capf!/ -Cape supports merging multiple Capfs using the function ~cape-super-capf~. This +Cape supports merging multiple Capfs using the function ~cape-capf-super~. This feature is *EXPERIMENTAL* and should only be used carefully in special scenarios. Due to some technical details, only a subset of Capfs can be merged. Merge Capfs one by one and make sure that you get the desired outcome on each step. -Note that ~cape-super-capf~ is not needed if you want to use multiple Capfs which +Note that ~cape-capf-super~ is not needed if you want to use multiple Capfs which are tried one after the other, for example you can use ~cape-file~ together with programming mode Capfs by adding ~cape-file~ to the ~completion-at-point-functions~ list. File completion will then be available in comments and string literals, -but not in normal code. ~cape-super-capf~ is only necessary if you want to combine +but not in normal code. ~cape-capf-super~ is only necessary if you want to combine multiple Capfs, such that the candidates from multiple sources appear /together/ in the completion list at the same time. Capf merging works only for completion functions which are sufficiently well-behaved and completion functions which do not define completion boundaries. -~cape-super-capf~ has the same restrictions as ~completion-table-merge~ and -~completion-table-in-turn~. As a simple rule of thumb, ~cape-super-capf~ works only +~cape-capf-super~ has the same restrictions as ~completion-table-merge~ and +~completion-table-in-turn~. As a simple rule of thumb, ~cape-capf-super~ works only for static completion functions like ~cape-dabbrev~, ~cape-keyword~, ~cape-dict~, etc., but not for multi-step completions like ~cape-file~. #+begin_src emacs-lisp ;; Merge the dabbrev, dict and keyword capfs, display candidates together. (setq-local completion-at-point-functions -(list (cape-super-capf #'cape-dabbrev #'cape-dict #'cape-keyword))) +(list (cape-capf-super #'cape-dabbrev #'cape-dict #'cape-keyword))) ;; Alternative: Define named Capf instead of using the anonymous Capf directly -(defalias 'cape-dabbrev-dict-keyword - (cape-super-capf #'cape-dabbrev #'cape-dict #'cape-keyword)) +(defun cape-dabbrev-dict-keyword () + (cape-wrap-super #'cape-dabbrev #'cape-dict #'cape-keyword)) (setq-local completion-at-point-functions (list #'cape-dabbrev-dict-keyword)) #+end_src @@ -230,7 +230,7 @@ allows you to merge multiple Company backends. /The Capf-Buster ensures that you always get a fresh set of candidates!/ If a Capf caches the candidates for too long we can use a cache busting -Capf-transformer. For example the Capf merging function ~cape-super-capf~ creates +Capf-transformer. For example the Capf merging function ~cape-capf-super~ creates a Capf, which caches the candidates for the whole lifetime of the Capf. Therefore you may want to combine a merged Capf with a cache buster under some circumstances. It
[elpa] externals/cape updated (df831c35aa -> 11cc35cc89)
elpasync pushed a change to branch externals/cape. from df831c35aa cape-wrap-debug: Keep track of completion table id new 01cee20ded Add cape-wrap-super and cape-capf-super for consistency new 11cc35cc89 cape-wrap-super: Do not use private completion--some Summary of changes: CHANGELOG.org | 2 + README.org| 23 - cape.el | 148 +- 3 files changed, 89 insertions(+), 84 deletions(-)
[elpa] externals/urgrep 037e2957cd 2/3: Add a subheading for the v0.1.1 release notes
branch: externals/urgrep commit 037e2957cd43b4dbb44764862cebb7e8a785b96f Author: Jim Porter Commit: Jim Porter Add a subheading for the v0.1.1 release notes --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 14a2b8fe98..a2c12f7597 100644 --- a/NEWS.md +++ b/NEWS.md @@ -19,6 +19,7 @@ ## v0.1.1 (2023-06-07) +### Bug fixes - Fix Eshell integration ---
[elpa] externals/urgrep updated (6c684d74e5 -> 2f3d5402b7)
elpasync pushed a change to branch externals/urgrep. from 6c684d74e5 Simplify the option-building in `eshell/urgrep` new 35586c85b9 Add support for passing `:directory` to `urgrep-command` new 037e2957cd Add a subheading for the v0.1.1 release notes new 2f3d5402b7 Eshell builtin now supports multiple paths, so add some ellipses Summary of changes: NEWS.md | 7 +++- urgrep-tests.el | 126 ++-- urgrep.el | 109 +--- 3 files changed, 177 insertions(+), 65 deletions(-)
[elpa] externals/urgrep 35586c85b9 1/3: Add support for passing `:directory` to `urgrep-command`
branch: externals/urgrep
commit 35586c85b915adbcdcee0f88fbf9adb96a61abfb
Author: Jim Porter
Commit: Jim Porter
Add support for passing `:directory` to `urgrep-command`
This also fixes the old limitation with the Eshell builtin so now you can
pass
directories as arguments to it.
---
NEWS.md | 6 ++-
urgrep-tests.el | 126 ++--
urgrep.el | 107 ---
3 files changed, 175 insertions(+), 64 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 0b6e08182b..14a2b8fe98 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,11 +5,15 @@
### New features
- Add support for toggling whether to search in hidden files (`M-s h` in the
search prompt, or `urgrep-search-hidden-files` globally)
+- Add `:directory` key to `urgrep-command`, allowing you to specify zero or
more
+ directories to search in
+- `urgrep` builtin for Eshell now supports specifying search directories as
+ arguments
- Allow setting the search tool to use on the fly when reading the query
(`M-s t` in the search prompt)
### Breaking changes
-- `urgrep-run-command` now takes `directory` and `tool` as optional keys
+- `urgrep-run-command` now takes `:tool` as an optional key to match `urgrep`
---
diff --git a/urgrep-tests.el b/urgrep-tests.el
index e4aca926ce..6883cab221 100644
--- a/urgrep-tests.el
+++ b/urgrep-tests.el
@@ -135,7 +135,7 @@ joined to compare against COMMAND."
(let ((tool (assq 'ugrep urgrep-tools))
(common-args '("ugrep" "--color=always"
"--colors=mt=01;31:fn=35:ln=:bn=:se=:sl=:cx=:ne"
- "-n" "--ignore-files")))
+ "-rn" "--ignore-files")))
;; String/case
(urgrep-tests/check-command
(urgrep-command "foo" :tool tool)
@@ -201,10 +201,18 @@ joined to compare against COMMAND."
(urgrep-command "foo" :tool tool :files '("*.c" "*.h"))
(append common-args '("--include=*.c" "--include=*.h" "--heading"
"--break"
"-i" "-F" "-e" "foo")))
+;; Directory
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory "dir")
+ (append common-args '("--heading" "--break" "-i" "-F" "-e" "foo" "dir")))
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory '("dir1" "dir2"))
+ (append common-args '("--heading" "--break" "-i" "-F" "-e" "foo" "dir1"
+ "dir2")))
;; Color
(urgrep-tests/check-command
(urgrep-command "foo" :tool tool :color nil)
- (append '("ugrep" "--color=never" "-n" "--ignore-files" "--heading"
+ (append '("ugrep" "--color=never" "-rn" "--ignore-files" "--heading"
"--break" "-i" "-F" "-e" "foo")
(ert-deftest urgrep-tests/command/ripgrep ()
@@ -275,6 +283,13 @@ joined to compare against COMMAND."
(urgrep-command "foo" :tool tool :files '("*.c" "*.h"))
(append common-args '("-g" "*.c" "-g" "*.h" "--heading" "-i" "-F" "--"
"foo")))
+;; Directory
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory "dir")
+ (append common-args '("--heading" "-i" "-F" "--" "foo" "dir")))
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory '("dir1" "dir2"))
+ (append common-args '("--heading" "-i" "-F" "--" "foo" "dir1" "dir2")))
;; Color
(urgrep-tests/check-command
(urgrep-command "foo" :tool tool :color nil)
@@ -343,6 +358,13 @@ joined to compare against COMMAND."
(urgrep-command "foo" :tool tool :files '("*.c" "*.h"))
(append common-args '("-G" "^[^\\000]*\\.(c|h)$" "--group" "-i" "-Q" "--"
"foo")))
+;; Directory
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory "dir")
+ (append common-args '("--group" "-i" "-Q" "--" "foo" "dir")))
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory '("dir1" "dir2"))
+ (append common-args '("--group" "-i" "-Q" "--" "foo" "dir1" "dir2")))
;; Color
(urgrep-tests/check-command
(urgrep-command "foo" :tool tool :color nil)
@@ -421,6 +443,15 @@ joined to compare against COMMAND."
(urgrep-command "foo" :tool tool :files '("*.c" "*.h"))
(append common-args no-hidden-args '("-G" "^[^\\000]*\\.(c|h)$" "--group"
"-i" "-Q" "--" "foo")))
+;; Directory
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory "dir")
+ (append common-args no-hidden-args '("--group" "-i" "-Q" "--" "foo"
+ "dir")))
+(urgrep-tests/check-command
+ (urgrep-command "foo" :tool tool :directory '("dir1" "dir2"))
+ (append common-args no-hidden-args '("--group" "-i" "-Q" "--" "foo" "dir1"
+ "dir2")))
;; Color
(urgrep-tests/check-com
[elpa] externals/urgrep 2f3d5402b7 3/3: Eshell builtin now supports multiple paths, so add some ellipses
branch: externals/urgrep commit 2f3d5402b78a70f442808a274bc077a3da950f66 Author: Jim Porter Commit: Jim Porter Eshell builtin now supports multiple paths, so add some ellipses --- urgrep.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urgrep.el b/urgrep.el index 1ce6b98ba4..95c386ace0 100644 --- a/urgrep.el +++ b/urgrep.el @@ -1323,7 +1323,7 @@ This is meant to be used as a command in Eshell." "number of lines of trailing context to print") ;; General options (?h "help" nil nil "show this help message") - :usage "[OPTION]... PATTERN [PATH] + :usage "[OPTION]... PATTERN [PATH]... Recursively search for PATTERN within PATH.") (unless args (error "Expected a search pattern")) (let* ((query (car args))
[nongnu] elpa/popup 4036e5590a 1/2: perf(popup.el): enable lexical binding
branch: elpa/popup commit 4036e5590a842390b12919473cb71654cae28783 Author: StrawberryTea Commit: StrawberryTea perf(popup.el): enable lexical binding --- popup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popup.el b/popup.el index 963d7e8676..f39c512b89 100644 --- a/popup.el +++ b/popup.el @@ -1,4 +1,4 @@ -;;; popup.el --- Visual Popup User Interface +;;; popup.el --- Visual Popup User Interface -*- lexical-binding: t; -*- ;; Copyright (C) 2009-2015 Tomohiro Matsuyama ;; Copyright (c) 2020-2023 Jen-Chieh Shen
[nongnu] elpa/popup 769318d039 2/2: Merge pull request #140 from LemonBreezes/enable-lexical-binding-2
branch: elpa/popup commit 769318d0391e6d9a718e227678234f27f7c13a47 Merge: cb76e6d517 4036e5590a Author: Jen-Chieh Shen Commit: GitHub Merge pull request #140 from LemonBreezes/enable-lexical-binding-2 perf(popup.el): enable lexical binding --- popup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popup.el b/popup.el index 963d7e8676..f39c512b89 100644 --- a/popup.el +++ b/popup.el @@ -1,4 +1,4 @@ -;;; popup.el --- Visual Popup User Interface +;;; popup.el --- Visual Popup User Interface -*- lexical-binding: t; -*- ;; Copyright (C) 2009-2015 Tomohiro Matsuyama ;; Copyright (c) 2020-2023 Jen-Chieh Shen
[nongnu] elpa/helm-core updated (da93e5c1f7 -> 6239110f8a)
elpasync pushed a change to branch elpa/helm-core. from da93e5c1f7 Fix bad completing-read default arg "nil" adds 6239110f8a completions-detailed is available only after 28.1 (#2613) No new revisions were added by this update. Summary of changes: helm-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[nongnu] elpa/helm 6239110f8a: completions-detailed is available only after 28.1 (#2613)
branch: elpa/helm commit 6239110f8a83e95fe8d466b595bf4f6407545baa Author: Thierry Volpiatto Commit: Thierry Volpiatto completions-detailed is available only after 28.1 (#2613) --- helm-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm-mode.el b/helm-mode.el index dc7f2a7f41..27b674ab68 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -1191,7 +1191,8 @@ dynamically otherwise use `helm-completing-read-default-2'." (unless (completion-metadata-get metadata 'category) (setq metadata `(metadata (category . ,it)) category it))) -(helm-aif (and completions-detailed +(helm-aif (and (boundp 'completions-detailed) + completions-detailed (assoc-default category helm-completing-read-extra-metadata)) (progn (setq metadata it)
