[elpa] externals/vertico-posframe 4b82c7e 1/3: Remove vertico-posframe--advice.
branch: externals/vertico-posframe commit 4b82c7e9af3b91c23b952d1a16932ae9308f60a8 Author: Feng Shu Commit: Feng Shu Remove vertico-posframe--advice. * vertico-posframe.el (vertico-posframe--last-window) (vertico-posframe--advice): removed. (vertico-posframe-mode): Remove vertico-posframe--advice. --- vertico-posframe.el | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/vertico-posframe.el b/vertico-posframe.el index b61ec91..0c3c4be 100644 --- a/vertico-posframe.el +++ b/vertico-posframe.el @@ -137,7 +137,6 @@ minibuffer will not be hided by minibuffer-cover." (defvar vertico-posframe--buffer " *vertico-posframe--buffer*") (defvar vertico-posframe--minibuffer-cover " *vertico-posframe--minibuffer-cover*") -(defvar vertico-posframe--last-window nil) ;; Fix warn (defvar exwm--connection) @@ -270,7 +269,7 @@ Show STRING when it is a string." (defun vertico-posframe-last-window () "Get the last actived window before active minibuffer." - (let ((window vertico-posframe--last-window)) + (let ((window (minibuffer-selected-window))) (or (if (window-live-p window) window (next-window)) @@ -318,11 +317,6 @@ Show STRING when it is a string." (add-hook 'minibuffer-exit-hook 'vertico-posframe--hide nil 'local) (setq-local cursor-type '(bar . 0))) -(defun vertico-posframe--advice (&rest _args) - "Advice for ORIG completion function, receiving ARGS." - (unless (minibufferp) ; minibuffer recursive -(setq vertico-posframe--last-window (selected-window - (defun vertico-posframe--minibuffer-message (message &rest _args) "Advice function of `minibuffer-message'. Argument MESSAGE ." @@ -339,8 +333,6 @@ Argument MESSAGE ." (advice-add #'minibuffer-message :before #'vertico-posframe--minibuffer-message) (advice-add #'vertico--display-candidates :override #'vertico-posframe--display) (advice-add #'vertico--setup :after #'vertico-posframe--setup) -(advice-add #'completing-read-default :before #'vertico-posframe--advice) -(advice-add #'completing-read-multiple :before #'vertico-posframe--advice) (add-hook 'post-command-hook #'vertico-posframe--post-command-function) ;; Create posframe in advance to limit flicker. (vertico-posframe--show-init) @@ -349,8 +341,6 @@ Argument MESSAGE ." (advice-remove #'minibuffer-message #'vertico-posframe--minibuffer-message) (advice-remove #'vertico--display-candidates #'vertico-posframe--display) (advice-remove #'vertico--setup #'vertico-posframe--setup) -(advice-remove #'completing-read-default #'vertico-posframe--advice) -(advice-remove #'completing-read-multiple #'vertico-posframe--advice) (remove-hook 'post-command-hook #'vertico-posframe--post-command-function) (posframe-delete vertico-posframe--buffer) (posframe-delete vertico-posframe--minibuffer-cover
[elpa] externals/vertico-posframe 65744eb 2/3: Remove vertico-posframe--post-command-function.
branch: externals/vertico-posframe commit 65744eb98495a14bd28a1220f856b584591961bd Author: Feng Shu Commit: Feng Shu Remove vertico-posframe--post-command-function. * vertico-posframe.el (vertico-posframe--post-command-function): removed. (vertico-posframe-mode): Do not deal with vertico-posframe--post-command-function. (vertico-posframe--display): move code of vertico-posframe--post-command-function to this. --- vertico-posframe.el | 59 + 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/vertico-posframe.el b/vertico-posframe.el index 0c3c4be..537de22 100644 --- a/vertico-posframe.el +++ b/vertico-posframe.el @@ -180,18 +180,30 @@ Optional argument FRAME ." (defun vertico-posframe--display (lines) "Display LINES in posframe." - (let ((count (vertico-posframe--format-count)) -(prompt (propertize (minibuffer-prompt) 'face 'minibuffer-prompt)) -(content (minibuffer-contents)) -(show-minibuffer (vertico-posframe--show-minibuffer-p))) + (let* ((show-minibuffer-p (vertico-posframe--show-minibuffer-p)) + (count (vertico-posframe--format-count)) + (prompt (propertize (minibuffer-prompt) 'face 'minibuffer-prompt)) + ;; NOTE: Vertico count in minibuffer is before-string of an + ;; overlay, so minibuffer contents will not include it. + (contents (minibuffer-contents)) + (n (+ (length count) + (max (point) (+ (length prompt) 1 + ;; FIXME: make sure background and foreground do + ;; not have similar color. ivy-posframe have not + ;; this problem, I can not find the reason. + (cursor-face + (list :foreground (face-attribute 'default :background) +:inherit 'vertico-posframe-cursor))) (with-current-buffer (get-buffer-create vertico-posframe--buffer) - (setq-local inhibit-modification-hooks t + (setq-local inhibit-read-only nil + inhibit-modification-hooks t cursor-in-non-selected-windows 'box) (erase-buffer) - (insert count prompt content " \n" (string-join lines))) + (insert count prompt contents "\n" (string-join lines)) + (add-text-properties n (+ n 1) `(face ,cursor-face))) (with-selected-window (vertico-posframe-last-window) ;; Create a posframe to cover minibuffer. - (if show-minibuffer + (if show-minibuffer-p (vertico-posframe--hide-minibuffer-cover) (vertico-posframe--create-minibuffer-cover)) (vertico-posframe--show @@ -281,37 +293,6 @@ Show STRING when it is a string." (posframe-hide vertico-posframe--buffer) (vertico-posframe--hide-minibuffer-cover))) -(defun vertico-posframe--post-command-function () - "`post-command-hook' function used by vertico-posframe." - (while-no-input -(redisplay) -(when (and vertico-posframe-mode - (not (minibufferp))) - (vertico-posframe--hide-minibuffer-cover)) -(when (and vertico-posframe-mode - (minibufferp) - (posframe-workable-p)) - (with-current-buffer (window-buffer (active-minibuffer-window)) -(let* ((point (point)) - (count (vertico-posframe--format-count)) - ;; NOTE: Vertico count in minibuffer is before-string - ;; of an overlay, so the result of `buffer-string' will - ;; not include it. - (contents (buffer-string)) - (n (+ point (length count))) - (cursor-face -;; FIXME: make sure background and foreground do -;; not have similar color. ivy-posframe have not -;; this problem, I can not find the reason. -(list :foreground (face-attribute 'default :background) - :inherit 'vertico-posframe-cursor))) - (remove-text-properties 0 (length contents) '(read-only nil) contents) - (with-current-buffer (get-buffer-create vertico-posframe--buffer) -(goto-char (point-min)) -(delete-region (point) (line-beginning-position 2)) -(insert count contents " \n") -(add-text-properties n (+ n 1) `(face ,cursor-face - (defun vertico-posframe--setup () "Setup minibuffer overlay, which pushes the minibuffer content down." (add-hook 'minibuffer-exit-hook 'vertico-posframe--hide nil 'local) @@ -333,7 +314,6 @@ Argument MESSAGE ." (advice-add #'minibuffer-message :before #'vertico-posframe--minibuffer-message) (advice-add #'vertico--display-candidates :override #'vertico-posframe--display) (advice-add #'vertico--setup :after #'vertico-posframe--setup) -(add-hook 'post-command-hook #'vertico-posframe--post-command-function) ;; Create posframe in advance to limit flicker. (vertico-posframe--show-init) (vertico-posframe--create-minibuffer-c
[elpa] externals/vertico-posframe 609d86a 3/3: v0.4.2
branch: externals/vertico-posframe commit 609d86a45ded8b04f271a64a9e88f778a8107e68 Author: Feng Shu Commit: Feng Shu v0.4.2 --- vertico-posframe.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertico-posframe.el b/vertico-posframe.el index 537de22..32c3f83 100644 --- a/vertico-posframe.el +++ b/vertico-posframe.el @@ -5,7 +5,7 @@ ;; Author: Feng Shu ;; Maintainer: Feng Shu ;; URL: https://github.com/tumashu/vertico-posframe -;; Version: 0.4.1 +;; Version: 0.4.2 ;; Keywords: abbrev, convenience, matching, vertico ;; Package-Requires: ((emacs "26.0") (posframe "1.0.0") (vertico "0.13.0"))
[elpa] externals/mct c2e1b0d: Minor doc update for consistency
branch: externals/mct commit c2e1b0db4080ab6365ae11a980159f34f6bc6ba2 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Minor doc update for consistency --- mct.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mct.el b/mct.el index f7a7e05..225a067 100644 --- a/mct.el +++ b/mct.el @@ -1016,7 +1016,7 @@ region.") (current-local-map (defun mct--setup-keymap () - "Setup minibuffer keymaps." + "Set up minibuffer keymaps." (use-local-map (make-composed-keymap mct-minibuffer-local-completion-map (current-local-map)))
[elpa] externals/consult 9baa0e7 1/3: Clarify bug report section (See #476)
branch: externals/consult commit 9baa0e73c7029fda374f1c0cefb3bccbadacc69f Author: Daniel Mendler Commit: Daniel Mendler Clarify bug report section (See #476) --- README.org | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.org b/README.org index 1dd69d1..8c581b4 100644 --- a/README.org +++ b/README.org @@ -1067,7 +1067,9 @@ out the following steps: This includes Consult, Vertico, Selectrum, Icomplete-vertical, Marginalia, Embark, Orderless and Prescient in case you are using any of those packages. 2. Ensure that one of =vertico-mode=, =selectrum-mode= or =icomplete-mode= is enabled. - Furthermore both =ivy-mode= and =helm-mode= must be disabled. + (Use =icomplete-mode= with a custom completion style configuration instead of + =fido-mode=, which always overwrites the completion style with =flex=. + Furthermore =ivy-mode= and =helm-mode= must be disabled.) 3. Ensure that the =completion-styles= variable is properly configured. Try to set =completion-styles= to a list including =substring= or =orderless=. 4. Try to reproduce the issue by starting a bare bone Emacs instance with =emacs -Q=
[elpa] externals/consult fbfb30a 2/3: Clarify consult-grep docs regarding its usage of Emacs regexp syntax (See #476)
branch: externals/consult commit fbfb30a473786424812ab44045df31b31c1cb1d5 Author: Daniel Mendler Commit: Daniel Mendler Clarify consult-grep docs regarding its usage of Emacs regexp syntax (See #476) --- README.org | 16 ++-- consult.el | 19 --- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/README.org b/README.org index 8c581b4..507629d 100644 --- a/README.org +++ b/README.org @@ -244,8 +244,10 @@ their descriptions. term. After at least =consult-async-min-input= characters, the search gets started. Consult splits the input string into two parts, if the first character is a punctuation character, like =#=. For example - =#grep-regexps#filter-string=, is split at the second =#=. The string - =grep-regexps= is passed to Grep. If you enter multiple regular expressions + =#regexps#filter-string=, is split at the second =#=. The string =regexps= is + passed to Grep. Note that Consult transforms Emacs regular expressions to + expressions understand by the search program. Always use Emacs regular + expressions at the prompt. If you enter multiple regular expressions separated by space only lines matching all regular expressions are shown. In order to match space literally, escape the space with a backslash. The =filter-string= is passed to the /fast/ Emacs filtering to further narrow down @@ -509,10 +511,10 @@ their descriptions. Consult has support for asynchronous generation of candidate lists. This feature is used for search commands like =consult-grep=, where the list of - matches is generated dynamically while the user is typing a grep regular - expression. The grep process is executed in the background. When modifying the - grep regular expression, the background process is terminated and a new process - is started with the modified regular expression. + matches is generated dynamically while the user is typing a regular expression. + The grep process is executed in the background. When modifying the regular + expression, the background process is terminated and a new process is started + with the modified regular expression. The matches, which have been found, can then be narrowed using the installed Emacs completion-style. This can be powerful if you are using for example the @@ -536,6 +538,8 @@ their descriptions. - =#defun=: Search for "defun" using grep. - =#consult embark=: Search for both "consult" and "embark" using grep. + - =#\(consult\|embark\)=: Search for "consult" or "embark" using grep. Note the + usage of Emacs-style regular expressions. - =#defun#consult=: Search for "defun" using grep, filter with the word "consult". - =/defun/consult=: It is also possible to use other punctuation diff --git a/consult.el b/consult.el index 409188c..2f628c2 100644 --- a/consult.el +++ b/consult.el @@ -4231,13 +4231,18 @@ INITIAL is inital input." (defun consult-grep (&optional dir initial) "Search for regexp with grep in DIR with INITIAL input. -The input string is split, the first part of the string is passed to -the asynchronous grep process and the second part of the string is -passed to the completion-style filtering. The input string is split at -a punctuation character, which is given as the first character of the -input string. The format is similar to Perl-style regular expressions, -e.g., /regexp/. Furthermore command line options can be passed to -grep, specified behind --. +The input string is split, the first part of the string is passed to the +asynchronous grep process and the second part of the string is passed to +the completion-style filtering. Note that the input string is +transformed from Emacs regular expressions to Posix regular expressions +Always enter Emacs regular expressions at the prompt. `consult-grep' +behaves like builtin Emacs search commands (Isearch etc) which take +Emacs regular expressions. + +The input string is split at a punctuation character, which is given as +the first character of the input string. The format is similar to +Perl-style regular expressions, e.g., /regexp/. Furthermore command line +options can be passed to grep, specified behind --. Example: #async-regexp -- grep-opts#filter-string
[elpa] externals/consult 85b4650 3/3: consult-grep: Add better examples to the docstring (See #476)
branch: externals/consult commit 85b4650c531511e119e3275559aaf3f8a45e30e8 Author: Daniel Mendler Commit: Daniel Mendler consult-grep: Add better examples to the docstring (See #476) --- consult.el | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/consult.el b/consult.el index 2f628c2..89647b9 100644 --- a/consult.el +++ b/consult.el @@ -4242,9 +4242,16 @@ Emacs regular expressions. The input string is split at a punctuation character, which is given as the first character of the input string. The format is similar to Perl-style regular expressions, e.g., /regexp/. Furthermore command line -options can be passed to grep, specified behind --. +options can be passed to grep, specified behind --. The overall prompt +input has the form `#async-regexp -- grep-opts#filter-string'. -Example: #async-regexp -- grep-opts#filter-string +Examples: + +#alpha beta : Search for alpha and beta in any order. +#alpha.*beta: Search for alpha before beta. +#\\(alpha\\|beta\\) : Search for alpha or beta (Note Emacs syntax!) +#word -- -C3: Search for word, include 3 lines as context +#first#second : Search for first, quick filter for second. The symbol at point is added to the future history. If `consult-grep' is called interactively with a prefix argument, the user can specify
[elpa] externals/consult updated (fec9fd3 -> 85b4650)
elpasync pushed a change to branch externals/consult. from fec9fd3 Rename function in analogy to the Emacs 28 API new 9baa0e7 Clarify bug report section (See #476) new fbfb30a Clarify consult-grep docs regarding its usage of Emacs regexp syntax (See #476) new 85b4650 consult-grep: Add better examples to the docstring (See #476) Summary of changes: README.org | 20 +--- consult.el | 30 +- 2 files changed, 34 insertions(+), 16 deletions(-)
[elpa] externals/consult updated (85b4650 -> 202b8b8)
elpasync pushed a change to branch externals/consult. from 85b4650 consult-grep: Add better examples to the docstring (See #476) new 50c2865 README: Update bug report section new c5bf480 README: Add consult-grep example new 202b8b8 Ensure that async setup happens later Summary of changes: README.org | 11 ++- consult.el | 28 2 files changed, 22 insertions(+), 17 deletions(-)
[elpa] externals/consult 202b8b8 3/3: Ensure that async setup happens later
branch: externals/consult commit 202b8b8077be9d873319286f0804f771bd44a3c9 Author: Daniel Mendler Commit: Daniel Mendler Ensure that async setup happens later This should fix consult-grep with fido-mode (See #476) --- README.org | 6 ++ consult.el | 28 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.org b/README.org index dea1316..aa88ca1 100644 --- a/README.org +++ b/README.org @@ -1072,10 +1072,8 @@ out the following steps: This includes Consult, Vertico, Selectrum, Icomplete-vertical, Marginalia, Embark, Orderless and Prescient in case you are using any of those packages. 2. Either use the default completion UI or ensure that exactly one of - =vertico-mode=, =selectrum-mode=, =mct-mode=, or =icomplete-mode= is enabled. (Use - =icomplete-mode= instead of =fido-mode=, since Fido always overwrites the - =completion-styles= style with =flex=. Furthermore =ivy-mode= and =helm-mode= must be - disabled.) + =vertico-mode=, =selectrum-mode=, =mct-mode=, or =icomplete-mode= is enabled. + Furthermore =ivy-mode= and =helm-mode= must be disabled. 3. Ensure that the =completion-styles= variable is properly configured. Try to set =completion-styles= to a list including =substring= or =orderless=. 4. Try to reproduce the issue by starting a bare bone Emacs instance with =emacs -Q= diff --git a/consult.el b/consult.el index 89647b9..ae12c61 100644 --- a/consult.el +++ b/consult.el @@ -1447,18 +1447,22 @@ BIND is the asynchronous function binding." (let ((async (car bind))) `(let ((,async ,@(cdr bind)) (orig-chunk)) (consult--minibuffer-with-setup-hook - (lambda () - (when (functionp ,async) - (setq orig-chunk read-process-output-max - read-process-output-max (max read-process-output-max consult--process-chunk)) - (funcall ,async 'setup) - ;; Push input string to request refresh. - ;; We use a symbol in order to avoid adding lambdas to the hook variable. - ;; Symbol indirection because of bug#46407. - (let ((sym (make-symbol "consult--async-after-change"))) - (fset sym (lambda (&rest _) (funcall ,async (minibuffer-contents-no-properties - (run-at-time 0 nil sym) - (add-hook 'after-change-functions sym nil 'local + ;; Append such that we overwrite the completion style setting of + ;; `fido-mode'. See `consult--async-split' and + ;; `consult--split-setup'. + (:append +(lambda () + (when (functionp ,async) +(setq orig-chunk read-process-output-max + read-process-output-max (max read-process-output-max consult--process-chunk)) +(funcall ,async 'setup) +;; Push input string to request refresh. +;; We use a symbol in order to avoid adding lambdas to the hook variable. +;; Symbol indirection because of bug#46407. +(let ((sym (make-symbol "consult--async-after-change"))) + (fset sym (lambda (&rest _) (funcall ,async (minibuffer-contents-no-properties + (run-at-time 0 nil sym) + (add-hook 'after-change-functions sym nil 'local) (let ((,async (if (functionp ,async) ,async (lambda (_) ,async (unwind-protect ,(macroexp-progn body)
[elpa] externals/consult 50c2865 1/3: README: Update bug report section
branch: externals/consult commit 50c2865c9ec7de421213f43e8e2c22dde3b0610b Author: Daniel Mendler Commit: Daniel Mendler README: Update bug report section Include mct, which is also fully supported by Consult. --- README.org | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.org b/README.org index 507629d..d990091 100644 --- a/README.org +++ b/README.org @@ -1070,10 +1070,11 @@ out the following steps: 1. *Update all the relevant packages to the newest version*. This includes Consult, Vertico, Selectrum, Icomplete-vertical, Marginalia, Embark, Orderless and Prescient in case you are using any of those packages. -2. Ensure that one of =vertico-mode=, =selectrum-mode= or =icomplete-mode= is enabled. - (Use =icomplete-mode= with a custom completion style configuration instead of - =fido-mode=, which always overwrites the completion style with =flex=. - Furthermore =ivy-mode= and =helm-mode= must be disabled.) +2. Either use the default completion UI or ensure that exactly one of + =vertico-mode=, =selectrum-mode=, =mct-mode=, or =icomplete-mode= is enabled. (Use + =icomplete-mode= instead of =fido-mode=, since Fido always overwrites the + =completion-styles= style with =flex=. Furthermore =ivy-mode= and =helm-mode= must be + disabled.) 3. Ensure that the =completion-styles= variable is properly configured. Try to set =completion-styles= to a list including =substring= or =orderless=. 4. Try to reproduce the issue by starting a bare bone Emacs instance with =emacs -Q= @@ -1101,6 +1102,7 @@ Minimal setup with the default completion system for =emacs -Q=: Please provide the necessary important information with your bug report: - The minimal configuration snippet used to reproduce the issue. +- Your completion UI (Default completion, Vertico, Selectrum, Mct or Icomplete). - The full stack trace in case the bug triggers an exception. - Your Emacs version, since bugs are often version-dependent. - Your operating system, since Emacs builds vary between Linux, Mac and
[elpa] externals/consult c5bf480 2/3: README: Add consult-grep example
branch: externals/consult commit c5bf480124770353fe1b0595cc63f05784acf49a Author: Daniel Mendler Commit: Daniel Mendler README: Add consult-grep example --- README.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.org b/README.org index d990091..dea1316 100644 --- a/README.org +++ b/README.org @@ -537,7 +537,8 @@ their descriptions. Examples: - =#defun=: Search for "defun" using grep. - - =#consult embark=: Search for both "consult" and "embark" using grep. + - =#consult embark=: Search for both "consult" and "embark" using grep in any order. + - =#first.*second=: Search for "first" followed by "second" using grep. - =#\(consult\|embark\)=: Search for "consult" or "embark" using grep. Note the usage of Emacs-style regular expressions. - =#defun#consult=: Search for "defun" using grep, filter with the word
[elpa] externals/org b59ccbf: org-element-at-point: Improve warning message
branch: externals/org commit b59ccbf55b6d9e37bd25a3bf40c44d01bd626e20 Author: Ihor Radchenko Commit: Ihor Radchenko org-element-at-point: Improve warning message * lisp/org-element.el (org-element-at-point): Describe warning as parser error when `org-element--parse-to' throws an error. The error may be thrown when parser encounters issue not related to cache. Fixes confusion in https://list.orgmode.org/871r2vpblx@yandex.com/T/#u --- lisp/org-element.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 84c1b72..e757890 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -7580,7 +7580,7 @@ element ending there." (condition-case err (org-element--parse-to pom) (error - (org-element--cache-warn "Cache corruption detected in %s::%S. Resetting.\n The error was: %S\n Backtrace:\n%S\n Please report this to Org mode mailing list (M-x org-submit-bug-report)." + (org-element--cache-warn "Org parser error in %s::%S. Resetting.\n The error was: %S\n Backtrace:\n%S\n Please report this to Org mode mailing list (M-x org-submit-bug-report)." (buffer-name (current-buffer)) pom err
[elpa] externals/consult b93bc62: consult-grep: Improve docstring
branch: externals/consult commit b93bc629ff0613c41192246d870be6f8a8824dc7 Author: Daniel Mendler Commit: Daniel Mendler consult-grep: Improve docstring --- consult.el | 35 --- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/consult.el b/consult.el index ae12c61..dbb69e4 100644 --- a/consult.el +++ b/consult.el @@ -4235,21 +4235,26 @@ INITIAL is inital input." (defun consult-grep (&optional dir initial) "Search for regexp with grep in DIR with INITIAL input. -The input string is split, the first part of the string is passed to the -asynchronous grep process and the second part of the string is passed to -the completion-style filtering. Note that the input string is -transformed from Emacs regular expressions to Posix regular expressions -Always enter Emacs regular expressions at the prompt. `consult-grep' -behaves like builtin Emacs search commands (Isearch etc) which take -Emacs regular expressions. - -The input string is split at a punctuation character, which is given as -the first character of the input string. The format is similar to -Perl-style regular expressions, e.g., /regexp/. Furthermore command line -options can be passed to grep, specified behind --. The overall prompt -input has the form `#async-regexp -- grep-opts#filter-string'. - -Examples: +The input string is split, the first part of the string (grep input) is +passed to the asynchronous grep process and the second part of the string is +passed to the completion-style filtering. + +The input string is split at a punctuation character, which is given as the +first character of the input string. The format is similar to Perl-style +regular expressions, e.g., /regexp/. Furthermore command line options can be +passed to grep, specified behind --. The overall prompt input has the form +`#async-input -- grep-opts#filter-string'. + +Note that the grep input string is transformed from Emacs regular expressions +to Posix regular expressions. Always enter Emacs regular expressions at the +prompt. `consult-grep' behaves like builtin Emacs search commands, e.g., +Isearch, which take Emacs regular expressions. Furthermore the asynchronous +input split into words, each word must match separately and in any order. See +`consult--regexp-compiler' for the inner workings. In order to disable +transformations of the grep input, adjust `consult--regexp-compiler' +accordingly. + +Here we give a few example inputs: #alpha beta : Search for alpha and beta in any order. #alpha.*beta: Search for alpha before beta.
[elpa] externals/org 521c534: org-src: Refactor inline src block fontify lines
branch: externals/org commit 521c534101cf5d49cda70e3e9ffd494cc72fe594 Author: TEC Commit: TEC org-src: Refactor inline src block fontify lines * lisp/org-src.el (org-fontify-inline-src-blocks-1): Refactor `org-fontify-inline-src-blocks-1' to bring down the maximum line length. While we're at it, get rid of the debugging `message' call that somehow made its way in, and an unused variable in the `let' statement. --- lisp/org-src.el | 35 ++- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/lisp/org-src.el b/lisp/org-src.el index 639a447..46fed05 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -664,37 +664,46 @@ as `org-src-fontify-natively' is non-nil." (defun org-fontify-inline-src-blocks-1 (limit) "Fontify inline src_LANG blocks, from `point' up to LIMIT." - (let ((case-fold-search t) -(initial-point (point))) -(while (re-search-forward "\\_
[elpa] externals/pyim 10af0e5: * pyim-page.el (pyim-page-refresh): 不再 minibuffer 中使用 posframe, 可靠性不太好。
branch: externals/pyim commit 10af0e57df3ffd15305d4ec4abb5770a8ba14e50 Author: Feng Shu Commit: Feng Shu * pyim-page.el (pyim-page-refresh): 不再 minibuffer 中使用 posframe, 可靠性不太好。 --- pyim-page.el | 50 ++ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pyim-page.el b/pyim-page.el index d91e56e..b6d29d6 100644 --- a/pyim-page.el +++ b/pyim-page.el @@ -183,8 +183,9 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 :candidates 关键字对应的位置，这个 hastable 最终会做为参数传递 给 `pyim-page-style' 相关的函数，用于生成用于在选词框中显示的 字符串。" - (let* ((end (pyim-page-end)) + (let* ((message-log-max nil) (start (1- (pyim-page-start))) + (end (pyim-page-end)) (candidates pyim-candidates) (candidate-showed (mapcar (lambda (x) @@ -203,33 +204,26 @@ page 的概念，比如，上面的 “nihao” 的 *待选词列表* 就可以 ;; Show page. (when (and (null unread-command-events) (null unread-post-input-method-events)) - (let ((message-log-max nil)) -(cond - ((and (eq (selected-window) (minibuffer-window)) - ;; posframe 可以用到 minibuffer 中，效果良好，popup 效果不好， - ;; 会导致 minibuffer 莫名其妙的变大。 - (not (and (eq pyim-page-tooltip 'posframe) - (functionp 'posframe-workable-p) - (posframe-workable-p - ;; 在 minibuffer 中输入中文时，使用当前输入的 - ;; 下一行来显示候选词。 - (pyim-page-minibuffer-message - (concat pyim-page-minibuffer-separator - (pyim-page-style:minibuffer page-info - ((pyim-probe-exwm-environment) - ;; when exwm-xim is used, page should be showed - ;; in minibuffer. - (message (pyim-page-style:exwm page-info))) - ;; 在普通 buffer 中输入中文时，使用 `pyim-page-tooltip' - ;; 指定的方式来显示候选词。 - (pyim-page-tooltip - (pyim-page-tooltip-show - (let ((func (intern (format "pyim-page-style:%S" pyim-page-style - (if (functionp func) - (funcall func page-info) - (pyim-page-style:two-lines page-info))) - (overlay-start pyim-preview-overlay))) - (t (message (pyim-page-style:minibuffer page-info + (cond + ;; 在 minibuffer 中输入中文时，默认使用当前输入行来显示候选词。以前在 + ;; minibuffer 中试用过 posframe, 在 linux 环境下，运行还不错，但在 + ;; windows 环境下，似乎有很严重的性能问题，原因未知。 + ((eq (selected-window) (minibuffer-window)) +(pyim-page-minibuffer-message + (concat pyim-page-minibuffer-separator + (pyim-page-style:minibuffer page-info + ;; 在 exwm 环境下使用 exwm-xim 输入中文时，使用 minibuffer 来显示 page。 + ((pyim-probe-exwm-environment) +(message (pyim-page-style:exwm page-info))) + ;; 普通 buffer 中，使用 `pyim-page-tooltip' 指定的方式显示候选词。 + (pyim-page-tooltip +(pyim-page-tooltip-show + (let ((func (intern (format "pyim-page-style:%S" pyim-page-style + (if (functionp func) + (funcall func page-info) + (pyim-page-style:two-lines page-info))) + (overlay-start pyim-preview-overlay))) + (t (message (pyim-page-style:minibuffer page-info))) (declare-function pyim-process-terminate "pyim-process")
[elpa] externals/vertico updated (b99ce0c -> b517f35)
elpasync pushed a change to branch externals/vertico. from b99ce0c Version 0.17 new ea9070e vertico-directory-up: Expand tilde when going up from ~/ (#163) new 00b7ade vertico-directory-up: Only expand "~" if there is no shadowed path new b517f35 vertico-directory-up: Handle ~user/ paths Summary of changes: extensions/vertico-directory.el | 4 1 file changed, 4 insertions(+)
[elpa] externals/vertico b517f35 3/3: vertico-directory-up: Handle ~user/ paths
branch: externals/vertico commit b517f35598f4c941a8f1b5e1aef885a93b149bc7 Author: Daniel Mendler Commit: Daniel Mendler vertico-directory-up: Handle ~user/ paths --- extensions/vertico-directory.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el index 60b1823..72c91b6 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -71,12 +71,12 @@ (when (and (> (point) (minibuffer-prompt-end)) (eq (char-before) ?/) (vertico-directory--completing-file-p)) +(let ((path (buffer-substring (minibuffer-prompt-end) (point + (when (string-match-p "\\`~[^/]*/\\'" path) +(delete-minibuffer-contents) +(insert (file-name-directory (expand-file-name path) (save-excursion (goto-char (1- (point))) - (when (and (= (1- (point)) (minibuffer-prompt-end)) - (eq (char-before) ?~)) -(delete-char -1) -(insert (expand-file-name "~"))) (when (search-backward "/" (minibuffer-prompt-end) t) (delete-region (1+ (point)) (point-max)) t
[elpa] externals/vertico ea9070e 1/3: vertico-directory-up: Expand tilde when going up from ~/ (#163)
branch: externals/vertico commit ea9070ebce93fcb14f3a7e15703bf345834812b3 Author: Masahiro Nakamura <13937915+tsu...@users.noreply.github.com> Commit: GitHub vertico-directory-up: Expand tilde when going up from ~/ (#163) --- extensions/vertico-directory.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el index f31f165..0e201e4 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -73,6 +73,9 @@ (vertico-directory--completing-file-p)) (save-excursion (goto-char (1- (point))) + (when (eq (char-before) ?~) +(delete-char -1) +(insert (expand-file-name "~"))) (when (search-backward "/" (minibuffer-prompt-end) t) (delete-region (1+ (point)) (point-max)) t
[elpa] externals/vertico 00b7ade 2/3: vertico-directory-up: Only expand "~" if there is no shadowed path
branch: externals/vertico commit 00b7adea34e7edf9cabf0f5a54ad5f6e1ba81413 Author: Daniel Mendler Commit: Daniel Mendler vertico-directory-up: Only expand "~" if there is no shadowed path --- extensions/vertico-directory.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el index 0e201e4..60b1823 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -73,7 +73,8 @@ (vertico-directory--completing-file-p)) (save-excursion (goto-char (1- (point))) - (when (eq (char-before) ?~) + (when (and (= (1- (point)) (minibuffer-prompt-end)) + (eq (char-before) ?~)) (delete-char -1) (insert (expand-file-name "~"))) (when (search-backward "/" (minibuffer-prompt-end) t)
[elpa] externals/csharp-mode 856ecbc 2/2: Merge pull request #253 from jacobilsoe/tree-sitter-indent-doc-fix
branch: externals/csharp-mode commit 856ecbc0a78ae3bdc2db2ae4d16be43e2d9d9c5e Merge: 9917e1b d432115 Author: Jen-Chieh Shen Commit: GitHub Merge pull request #253 from jacobilsoe/tree-sitter-indent-doc-fix Added tree-sitter-indent to required tree-sitter packages --- README.org | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index 32be818..29e1f07 100644 --- a/README.org +++ b/README.org @@ -17,7 +17,7 @@ highlighting and indentation. - instance initializers - anonymous functions and methods - verbatim literal strings (those that begin with @) - - generics + - generics - intelligent insertion of matched pairs of curly braces. - compilation-mode support for msbuild, devenv and xbuild. @@ -26,6 +26,7 @@ You can enable experimental tree sitter support for indentation and highlighting #+begin_src elisp (use-package tree-sitter :ensure t) (use-package tree-sitter-langs :ensure t) + (use-package tree-sitter-indent :ensure t) (use-package csharp-mode :ensure t @@ -44,7 +45,7 @@ wrong syntax highlighting, look at how the patterns are written in =csharp-tree-sitter-mode.el=, then submit a pr with a couple new ones added. When testing and debugging this, it is actually as simple as =M-x eval-buffer= on =csharp-tree-sitter-mode.el=, then =M-x revert-buffer= in the file you are testing. -It should update and show the correct syntax highlighting. +It should update and show the correct syntax highlighting. So the development cycle is:
[elpa] externals/csharp-mode d432115 1/2: Added tree-sitter-indent to required tree-sitter packages
branch: externals/csharp-mode commit d432115bb872c6660d3ffeba42bd2d68b617ee98 Author: Jacob Ilsø Commit: Jacob Ilsø Added tree-sitter-indent to required tree-sitter packages --- README.org | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index 32be818..29e1f07 100644 --- a/README.org +++ b/README.org @@ -17,7 +17,7 @@ highlighting and indentation. - instance initializers - anonymous functions and methods - verbatim literal strings (those that begin with @) - - generics + - generics - intelligent insertion of matched pairs of curly braces. - compilation-mode support for msbuild, devenv and xbuild. @@ -26,6 +26,7 @@ You can enable experimental tree sitter support for indentation and highlighting #+begin_src elisp (use-package tree-sitter :ensure t) (use-package tree-sitter-langs :ensure t) + (use-package tree-sitter-indent :ensure t) (use-package csharp-mode :ensure t @@ -44,7 +45,7 @@ wrong syntax highlighting, look at how the patterns are written in =csharp-tree-sitter-mode.el=, then submit a pr with a couple new ones added. When testing and debugging this, it is actually as simple as =M-x eval-buffer= on =csharp-tree-sitter-mode.el=, then =M-x revert-buffer= in the file you are testing. -It should update and show the correct syntax highlighting. +It should update and show the correct syntax highlighting. So the development cycle is:
[elpa] externals/vertico e92f318: vertico-directory-up: Simplify
branch: externals/vertico commit e92f3180d626dbaab797a058f0d2ac1db743e614 Author: Daniel Mendler Commit: Daniel Mendler vertico-directory-up: Simplify --- extensions/vertico-directory.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el index 72c91b6..ffeec32 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -74,7 +74,7 @@ (let ((path (buffer-substring (minibuffer-prompt-end) (point (when (string-match-p "\\`~[^/]*/\\'" path) (delete-minibuffer-contents) -(insert (file-name-directory (expand-file-name path) +(insert (expand-file-name path (save-excursion (goto-char (1- (point))) (when (search-backward "/" (minibuffer-prompt-end) t)
[elpa] externals/embark 07124c7: Give of zebra stripe lower priority than overlay for hl-line-mode
branch: externals/embark commit 07124c7c66c61dd28f55be301573cf30a22a5fac Author: Omar Antolín Commit: Omar Antolín Give of zebra stripe lower priority than overlay for hl-line-mode Thanks to @protesilaos for reporting this and providing a patch (which is slightly different to this change, only for cosmetic reasons). --- embark.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/embark.el b/embark.el index 4c87656..d029b16 100644 --- a/embark.el +++ b/embark.el @@ -2510,8 +2510,9 @@ determine the width." (condition-case nil (forward-button columns) (user-error (goto-char (point-max -(overlay-put (make-overlay pt (point)) - 'face 'embark-collect-zebra-highlight))) +(let ((stripe (make-overlay pt (point + (overlay-put stripe 'priority -100) ; below hl-line-mode's -50 + (overlay-put stripe 'face 'embark-collect-zebra-highlight (define-minor-mode embark-collect-zebra-minor-mode "Minor mode to highlight alternate rows in an Embark Collect buffer.
[elpa] externals/embark-consult updated (e0057f6 -> 07124c7)
elpasync pushed a change to branch externals/embark-consult. from e0057f6 Add keymap prompter support for C-u C-u, C-u C-u C-u, C-u 3 1 C-u, etc. adds 07124c7 Give of zebra stripe lower priority than overlay for hl-line-mode No new revisions were added by this update. Summary of changes: embark.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[elpa] externals-release/org 0acd2fe: manual: Rename nodes to silence Emacs name check
branch: externals-release/org
commit 0acd2fed204007f812fbaef4c3528a52f4bba13f
Author: Kyle Meyer
Commit: Kyle Meyer
manual: Rename nodes to silence Emacs name check
* doc/org-manual.org (Advanced Export Configuration):
(Extracting Source Code): Rename "Hooks" subheading so that ox-texinfo
does not make it unique by appending " (N)".
The Emacs repo has a check for problematic characters in info nodes
that flagged "Hooks (2)" (bug#52126). As mentioned in that thread,
this case is actually probably not problematic because the name
doesn't _start_ with "(". However, it's easy enough to sidestep the
warning, and adding the extra context doesn't hurt.
---
doc/org-manual.org | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index ad1a06a..5c9bf43 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -15571,7 +15571,7 @@ for usage and configuration details.
:DESCRIPTION: Fine-tuning the export output.
:END:
-*** Hooks
+*** Export hooks
:PROPERTIES:
:UNNUMBERED: notoc
:END:
@@ -18203,7 +18203,7 @@ expanded anyway.
#+kindex: C-c C-v f
Choose a file to tangle. Bound to {{{kbd(C-c C-v f)}}}.
-*** Hooks
+*** Tangle hooks
:PROPERTIES:
:UNNUMBERED: notoc
:END:
[elpa] externals/org updated (521c534 -> 8ca2546)
elpasync pushed a change to branch externals/org. from 521c534 org-src: Refactor inline src block fontify lines new 0acd2fe manual: Rename nodes to silence Emacs name check new 8ca2546 Merge branch 'bugfix' Summary of changes: doc/org-manual.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[elpa] externals/org 8ca2546: Merge branch 'bugfix'
branch: externals/org
commit 8ca254696b002f5079e31ac12a1ad87c003f673d
Merge: 521c534 0acd2fe
Author: Kyle Meyer
Commit: Kyle Meyer
Merge branch 'bugfix'
---
doc/org-manual.org | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 19f42fc..b65e2f1 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -15586,7 +15586,7 @@ for usage and configuration details.
:DESCRIPTION: Fine-tuning the export output.
:END:
-*** Hooks
+*** Export hooks
:PROPERTIES:
:UNNUMBERED: notoc
:END:
@@ -18242,7 +18242,7 @@ expanded anyway.
#+kindex: C-c C-v f
Choose a file to tangle. Bound to {{{kbd(C-c C-v f)}}}.
-*** Hooks
+*** Tangle hooks
:PROPERTIES:
:UNNUMBERED: notoc
:END:
[nongnu] elpa/geiser 8c2fcf6: Fix for filename completion inside scheme strings
branch: elpa/geiser commit 8c2fcf6b8a072f6fe896178747119766c6609dd0 Author: jao Commit: jao Fix for filename completion inside scheme strings It seems we were abusing comint-dynamic-complete-filename when there's the perfectly fine comint-filename-completion. --- elisp/geiser-completion.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el index c479972..3a2943d 100644 --- a/elisp/geiser-completion.el +++ b/elisp/geiser-completion.el @@ -1,6 +1,6 @@ ;;; geiser-completion.el -- tab completion -;; Copyright (C) 2009, 2010, 2011, 2012, 2018, 2020 Jose Antonio Ortega Ruiz +;; Copyright (C) 2009, 2010, 2011, 2012, 2018, 2020, 2021 Jose Antonio Ortega Ruiz ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the Modified BSD License. You should @@ -157,7 +157,7 @@ we're looking for a module name.") (defun geiser-completion--for-filename () (when (geiser-syntax--in-string-p) (let ((comint-completion-addsuffix "\"")) - (comint-dynamic-complete-filename + (ignore-errors (comint-filename-completion) (defun geiser-completion--setup (enable) (set (make-local-variable 'completion-at-point-functions)
