daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-11-25 19:52:03 +01:00
parent 14ba373378
commit dbbae92267
280 changed files with 13451 additions and 11207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/ivy/ivy.el
View File

@@ -5,8 +5,8 @@
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
;; Maintainer: Basil L. Contovounesios <basil@contovou.net>
;; URL: https://github.com/abo-abo/swiper
;; Package-Version: 20250417.1209
;; Package-Revision: 2529a23f9f51
;; Package-Version: 20251123.1023
;; Package-Revision: ec9421340c88
;; Package-Requires: ((emacs "24.5"))
;; Keywords: matching
@@ -3171,11 +3171,11 @@ parts beyond their respective faces `ivy-confirm-face' and
`ivy-match-required-face'."
(dolist (pair '(("confirm" . ivy-confirm-face)
("match required" . ivy-match-required-face)))
(let ((i (string-match-p (car pair) prompt)))
(when i
(add-text-properties i (+ i (length (car pair)))
`(face ,(cdr pair) ,@props)
prompt))))
(let* ((beg (ivy--string-search (car pair) prompt))
(end (and beg (+ beg (length (car pair))))))
(when beg
(add-face-text-property beg end (cdr pair) nil prompt)
(add-text-properties beg end props prompt))))
prompt)
(defun ivy-prompt ()
@@ -3215,6 +3215,25 @@ parts beyond their respective faces `ivy-confirm-face' and
(when line (push line lines)))
(string-join (nreverse lines) "\n"))))
(defun ivy--propertize-prompt (prompt)
"Propertize PROMPT like `read-from-minibuffer' would.
Also handle `ivy-set-prompt-text-properties-function'."
(let ((len (length prompt))
;; Added unconditionally by `read-from-minibuffer'.
(props (list 'front-sticky t 'rear-nonsticky t 'field t))
;; Configurable.
(extras minibuffer-prompt-properties))
;; Filter out `face'; it is documented as being appended instead, and was
;; historically excluded from `ivy-set-prompt-text-properties-function'.
(while extras
(let ((key (pop extras))
(val (pop extras)))
(if (eq key 'face)
(add-face-text-property 0 len val t prompt)
(setq props (plist-put props key val)))))
(add-text-properties 0 len props prompt)
(funcall ivy-set-prompt-text-properties-function prompt props)))
(defun ivy--insert-prompt ()
"Update the prompt according to `ivy--prompt'."
(when (setq ivy--prompt (ivy-prompt))
@@ -3229,7 +3248,6 @@ parts beyond their respective faces `ivy-confirm-face' and
(setq head ivy--prompt)
(setq tail ""))
(let ((inhibit-read-only t)
(std-props '(front-sticky t rear-nonsticky t field t read-only t))
(n-str
(concat
(and (bound-and-true-p minibuffer-depth-indicate-mode)
@@ -3264,12 +3282,7 @@ parts beyond their respective faces `ivy-confirm-face' and
(when ivy-add-newline-after-prompt
(setq n-str (concat n-str "\n")))
(setq n-str (ivy--break-lines n-str (window-width)))
(set-text-properties 0 (length n-str)
`(face minibuffer-prompt ,@std-props)
n-str)
(setq n-str (funcall ivy-set-prompt-text-properties-function
n-str std-props))
(insert n-str))
(insert (ivy--propertize-prompt n-str)))
;; Mark prompt as selected if the user moves there or it is the only
;; option left. Since the user input stays put, we have to manually
;; remove the face as well.