diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2024-12-16 22:21:37 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2024-12-16 23:04:18 +0100 |
| commit | 80dc431b5a453c8200260969c8e2904e2d353b1e (patch) | |
| tree | 8abfbd0efe0e875748628e96c645081bb321321e /src/minibuf.c | |
| parent | 16eb038d472b5765beb3b18e1058846efbdf97af (diff) | |
| download | emacs-80dc431b5a453c8200260969c8e2904e2d353b1e.tar.gz emacs-80dc431b5a453c8200260969c8e2904e2d353b1e.tar.bz2 emacs-80dc431b5a453c8200260969c8e2904e2d353b1e.zip | |
all-completions: Drop support for obsolete calling convention
* src/minibuf.c (Fall_completions):
* lisp/subr.el (all-completions): Drop support for old calling
convention, obsolete since 23.1.
* src/minibuf.c (Finternal_complete_buffer): Update caller.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 1f94e0e650e..9fd5c236f0b 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1826,7 +1826,7 @@ or from one of the possible completions. */) return Fsubstring (bestmatch, zero, end); } -DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0, +DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 3, 0, doc: /* Search for partial matches of STRING in COLLECTION. Test each possible completion specified by COLLECTION @@ -1859,12 +1859,8 @@ the string key and the associated value. To be acceptable, a possible completion must also match all the regexps in `completion-regexp-list' (unless COLLECTION is a function, in -which case that function should itself handle `completion-regexp-list'). - -An obsolete optional fourth argument HIDE-SPACES is still accepted for -backward compatibility. If non-nil, strings in COLLECTION that start -with a space are ignored unless STRING itself starts with a space. */) - (Lisp_Object string, Lisp_Object collection, Lisp_Object predicate, Lisp_Object hide_spaces) +which case that function should itself handle `completion-regexp-list'). */) + (Lisp_Object string, Lisp_Object collection, Lisp_Object predicate) { Lisp_Object tail, elt, eltstring; Lisp_Object allmatches; @@ -1932,12 +1928,6 @@ with a space are ignored unless STRING itself starts with a space. */) if (STRINGP (eltstring) && SCHARS (string) <= SCHARS (eltstring) - /* If HIDE_SPACES, reject alternatives that start with space - unless the input starts with space. */ - && (NILP (hide_spaces) - || (SBYTES (string) > 0 - && SREF (string, 0) == ' ') - || SREF (eltstring, 0) != ' ') && (tem = Fcompare_strings (eltstring, zero, make_fixnum (SCHARS (string)), string, zero, @@ -2155,7 +2145,7 @@ If FLAG is nil, invoke `try-completion'; if it is t, invoke return Ftry_completion (string, Vbuffer_alist, predicate); else if (EQ (flag, Qt)) { - Lisp_Object res = Fall_completions (string, Vbuffer_alist, predicate, Qnil); + Lisp_Object res = Fall_completions (string, Vbuffer_alist, predicate); if (SCHARS (string) > 0) return res; else |