From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 2 Sep 2022 12:51:27 +0000 (+0200)
Subject: Make minibuffer-eldef-shorten-default obsolete
X-Git-Tag: emacs-29.0.90~1856^2~791
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99bf269ca035aeb99116a075d5bd42cf6dc1feb1;p=emacs.git

Make minibuffer-eldef-shorten-default obsolete

* lisp/minibuf-eldef.el (minibuffer-eldef-shorten-default): Make
variable obsolete in favor of 'minibuffer-default-prompt-format'.
* doc/emacs/mini.texi (Basic Minibuffer): Delete above obsolete
variable (bug#50935).
---

diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index e71d653210a..90e50a41d53 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -58,12 +58,8 @@ the default argument is shown with the user option
 Emacs hides the default argument as soon as you modify the contents of
 the minibuffer (since typing @key{RET} would no longer submit that
 default).  If you ever bring back the original minibuffer text, the
-prompt again shows the default.  Furthermore, if you change the
-variable @code{minibuffer-eldef-shorten-default} to a non-@code{nil}
-value, the default argument is displayed as @samp{[@var{default-arg}]}
-instead of @samp{(default @var{default-arg})}, saving some screen
-space.  To enable this minor mode, type @kbd{M-x
-minibuffer-electric-default-mode}.
+prompt again shows the default.  To enable this minor mode, type
+@kbd{M-x minibuffer-electric-default-mode}.
 
   Since the minibuffer appears in the echo area, it can conflict with
 other uses of the echo area.  If an error message or an informative
diff --git a/etc/NEWS b/etc/NEWS
index 1512d45fdc1..5feef9aa63f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -109,6 +109,12 @@ files when the Emacs session which locked it crashes, or was otherwise
 interrupted, and didn't exit gracefully.  See the "(emacs) Saving
 Emacs Sessions" node in the Emacs manual for more details.
 
+** Miscellaneous
+
++++
+*** User option 'minibuffer-eldef-shorten-default' is now obsolete.
+Customize the user option 'minibuffer-default-prompt-format' instead.
+
 
 * Startup Changes in Emacs 29.1
 
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 3f04a3e9219..ba7e68eb81d 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -64,6 +64,8 @@
   :type 'boolean
   :group 'minibuffer
   :version "24.3")
+(make-obsolete-variable 'minibuffer-eldef-shorten-default
+                        'minibuffer-default-prompt-format "29.1")
 
 (defvar minibuffer-default-in-prompt-regexps
   (minibuffer-default--in-prompt-regexps)