@end defopt
@defvar minibuffer-allow-text-properties
-If this variable is @code{nil}, then @code{read-from-minibuffer}
-and @code{read-string} strip all text properties from the minibuffer
-input before returning it. However,
-@code{read-no-blanks-input} (see below), as well as
-@code{read-minibuffer} and related functions (@pxref{Object from
-Minibuffer,, Reading Lisp Objects With the Minibuffer}), and all
-functions that do minibuffer input with completion, remove the @code{face}
-property unconditionally, regardless of the value of this variable.
-
-If this variable is non-@code{nil}, most text properties on strings
-from the completion table are preserved---but only on the part of the
-strings that were completed.
+If this variable is @code{nil}, then @code{read-from-minibuffer} strip
+all text properties from the minibuffer input before returning it.
+Otherwise, the minibuffer input is returned as is, along with its text
+properties. Moreover, if this variable is non-@code{nil}, most text
+properties on strings from the completion table are preserved as well.
@lisp
(let ((minibuffer-allow-text-properties t))
The variable @code{minibuffer-mode-map} is an alias for this variable.
@end defvar
-@defun read-no-blanks-input prompt &optional initial inherit-input-method
-This function reads a string from the minibuffer, but does not allow
-whitespace characters as part of the input: instead, those characters
-terminate the input. The arguments @var{prompt}, @var{initial}, and
-@var{inherit-input-method} are used as in @code{read-from-minibuffer}.
-
-This is a simplified interface to the @code{read-from-minibuffer}
-function, and passes the value of the @code{minibuffer-local-ns-map}
-keymap as the @var{keymap} argument for that function. Since the keymap
-@code{minibuffer-local-ns-map} does not rebind @kbd{C-q}, it @emph{is}
-possible to put a space into the string, by quoting it.
-
-This function discards text properties, regardless of the value of
-@code{minibuffer-allow-text-properties}.
-
-@smallexample
-@group
-(read-no-blanks-input @var{prompt} @var{initial})
-@equiv{}
-(let (minibuffer-allow-text-properties)
- (read-from-minibuffer @var{prompt} @var{initial} minibuffer-local-ns-map))
-@end group
-@end smallexample
-@end defun
-
-@c Slightly unfortunate name, suggesting it might be related to the
-@c Nextstep port...
-@defvar minibuffer-local-ns-map
-This built-in variable is the keymap used as the minibuffer local keymap
-in the function @code{read-no-blanks-input}. By default, it makes the
-following bindings, in addition to those of @code{minibuffer-local-map}:
-
-@table @asis
-@item @key{SPC}
-@cindex @key{SPC} in minibuffer
-@code{exit-minibuffer}
-
-@item @key{TAB}
-@cindex @key{TAB} in minibuffer
-@code{exit-minibuffer}
-
-@item @kbd{?}
-@cindex @kbd{?} in minibuffer
-@code{self-insert-and-exit}
-@end table
-@end defvar
-
@vindex minibuffer-default-prompt-format
@defun format-prompt prompt default &rest format-args
Format @var{prompt} with default value @var{default} according to the
current buffer is a minibuffer, but not the active minibuffer.
@end deffn
-@deffn Command self-insert-and-exit
-This command exits the active minibuffer after inserting the last
-character typed on the keyboard (found in @code{last-command-event};
-@pxref{Command Loop Info}).
-@end deffn
-
@deffn Command previous-history-element n
This command replaces the minibuffer contents with the value of the
@var{n}th previous (older) history element.
(defun self-insert-and-exit ()
"Terminate minibuffer input."
+ (declare (obsolete nil "30.1"))
(interactive)
(if (characterp last-command-event)
(call-interactively 'self-insert-command)
(make-obsolete-variable 'minibuffer-local-filename-completion-map
nil "30.1")
-(defvar-keymap minibuffer-local-ns-map
- :doc "Local keymap for the minibuffer when spaces are not allowed."
- :parent minibuffer-local-map
- "SPC" #'exit-minibuffer
- "TAB" #'exit-minibuffer
- "?" #'self-insert-and-exit)
-
(defvar-keymap minibuffer-narrow-completions-map
:doc "Keymap for completions narrowing commands."
"n" #'minibuffer-narrow-completions-to-current
(defalias 'minibuffer-narrow-completions-map
minibuffer-narrow-completions-map)
-(defun read-no-blanks-input (prompt &optional initial inherit-input-method)
- "Read a string from the terminal, not allowing blanks.
-Prompt with PROMPT. Whitespace terminates the input. If INITIAL is
-non-nil, it should be a string, which is used as initial input, with
-point positioned at the end, so that SPACE will accept the input.
-\(Actually, INITIAL can also be a cons of a string and an integer.
-Such values are treated as in `read-from-minibuffer', but are normally
-not useful in this function.)
-
-Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
-the current input method and the setting of `enable-multibyte-characters'.
-
-If `inhibit-interaction' is non-nil, this function will signal an
-`inhibited-interaction' error."
- (read-from-minibuffer prompt initial minibuffer-local-ns-map
- nil 'minibuffer-history nil inherit-input-method))
+(defvar-keymap minibuffer-local-ns-map
+ :doc "This variable is obsolete and no longer used.")
+
+(make-obsolete-variable 'minibuffer-local-ns-map nil "30.1")
+
+(define-obsolete-function-alias 'read-no-blanks-input 'read-string "30.1")
;;; Major modes for the minibuffer
projects / emacs.git / commitdiff