From: Glenn Morris Date: Thu, 8 Feb 2018 18:32:35 +0000 (-0500) Subject: Remove unused duplicate of minibuffer-completion-contents X-Git-Tag: emacs-27.0.90~5715 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d34dbc0b69b288ee5e969208ab05b00a3fcc7638;p=emacs.git Remove unused duplicate of minibuffer-completion-contents * src/minibuf.c (Fminibuffer_completion_contents): Remove. Unused since introduction of minubuffer.el 2008-04-09. (syms_of_minibuf): Remove Sminibuffer_completion_contents. * lisp/minibuffer.el (minibuffer-completion-contents): Doc tweak. --- diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 4d14b2641f3..ef0d40790c5 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -729,7 +729,8 @@ If ARGS are provided, then pass MESSAGE through `format-message'." (defun minibuffer-completion-contents () "Return the user input in a minibuffer before point as a string. -In Emacs-22, that was what completion commands operated on." +In Emacs 22, that was what completion commands operated on. +If the current buffer is not a minibuffer, return everything before point." (declare (obsolete nil "24.4")) (buffer-substring (minibuffer-prompt-end) (point))) diff --git a/src/minibuf.c b/src/minibuf.c index cbb0898a9ab..95e62ceddab 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -325,19 +325,6 @@ If the current buffer is not a minibuffer, return its entire contents. */) return make_buffer_string (prompt_end, ZV, 0); } -DEFUN ("minibuffer-completion-contents", Fminibuffer_completion_contents, - Sminibuffer_completion_contents, 0, 0, 0, - doc: /* Return the user input in a minibuffer before point as a string. -That is what completion commands operate on. -If the current buffer is not a minibuffer, return its entire contents. */) - (void) -{ - ptrdiff_t prompt_end = XINT (Fminibuffer_prompt_end ()); - if (PT < prompt_end) - error ("Cannot do completion in the prompt"); - return make_buffer_string (prompt_end, PT, 1); -} - /* Read from the minibuffer using keymap MAP and initial contents INITIAL, putting point minus BACKUP_N bytes from the end of INITIAL, @@ -2127,7 +2114,6 @@ characters. This variable should never be set globally. */); defsubr (&Sminibuffer_prompt_end); defsubr (&Sminibuffer_contents); defsubr (&Sminibuffer_contents_no_properties); - defsubr (&Sminibuffer_completion_contents); defsubr (&Stry_completion); defsubr (&Sall_completions);