diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-12-06 09:44:18 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-12-06 09:44:18 -0500 |
| commit | 4d93859c871be523e58d21a5138a63a76dc4df39 (patch) | |
| tree | 3f81c346a2cb28e1dc260cc12c282a61d2da8fbe /lisp/minibuffer.el | |
| parent | 283db0d703f984bbfcbc1bde9c78fa399af36c50 (diff) | |
| parent | d529207b0eb26b623fadf4716581add58f2cc282 (diff) | |
| download | emacs-4d93859c871be523e58d21a5138a63a76dc4df39.tar.gz emacs-4d93859c871be523e58d21a5138a63a76dc4df39.tar.bz2 emacs-4d93859c871be523e58d21a5138a63a76dc4df39.zip | |
Merge remote-tracking branch 'origin/emacs-28' into trunk
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 0a5fb72774b..28bd1df59ab 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -283,8 +283,9 @@ the form (concat S2 S)." ((eq (car-safe action) 'boundaries) (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0))) `(boundaries - ,(max (min (length string) (length s1)) - (+ beg (- (length s1) (length s2)))) + ,(min (length string) + (max (length s1) + (+ beg (- (length s1) (length s2))))) . ,(and (eq (car-safe res) 'boundaries) (cddr res))))) ((stringp res) (if (string-prefix-p s2 res completion-ignore-case) |