diff options
| author | Po Lu <luangruo@yahoo.com> | 2025-03-04 14:32:33 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2025-03-04 14:32:33 +0800 |
| commit | 9daab9be343f930c8db4c33881abc96e65c01bd7 (patch) | |
| tree | 3274add08d7cbee7a34d91091c0ce71b1167216e /lisp/emacs-lisp | |
| parent | 9415941a9c65b72a3bc20ae0ec1765f3c0ed657d (diff) | |
| parent | 7dcf9b71e6ffc0cc92d2d504b1428c3ab432a028 (diff) | |
| download | emacs-9daab9be343f930c8db4c33881abc96e65c01bd7.tar.gz emacs-9daab9be343f930c8db4c33881abc96e65c01bd7.tar.bz2 emacs-9daab9be343f930c8db4c33881abc96e65c01bd7.zip | |
Merge from savannah/emacs-30
7dcf9b71e6f ; Don't document package-x.el
a5fd518d524 ; Document spurious warnings on macOS 15
625ed68aeaa Fix the use of xref-window-local-history together with Xr...
80917727676 completing-read-multiple: Fix support for ":" as separator
38cc36a3753 ; Improve docstring of cl-check-type
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/crm.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 8673b360319..d3d4524028d 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -3576,7 +3576,10 @@ Of course, we really can't know that for sure, so it's just a heuristic." ;;;###autoload (defmacro cl-check-type (form type &optional string) "Verify that FORM is of type TYPE; signal an error if not. -STRING is an optional description of the desired type." +STRING is an optional description of the desired type. + +Hint: To check the type of an object, use `cl-type-of'. +To define new types, see `cl-deftype'." (declare (debug (place cl-type-spec &optional stringp))) (and (or (not (macroexp-compiling-p)) (< cl--optimize-speed 3) (= cl--optimize-safety 3)) diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 676252ae126..a75ccd46f50 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -269,7 +269,9 @@ with empty strings removed." (setq-local completion-list-insert-choice-function (lambda (_start _end choice) (let* ((beg (save-excursion - (if (search-backward-regexp crm-separator nil t) + (if (search-backward-regexp crm-separator + (field-beginning) + t) (1+ (point)) (minibuffer-prompt-end)))) (end (save-excursion |