diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-10-27 08:24:56 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-10-27 08:24:56 -0700 |
| commit | 0dfb896be2d84e069831faf3499fe6add629af62 (patch) | |
| tree | f1a660bb7e0bb41a45c57484863663427750482b /lisp/cus-start.el | |
| parent | dcd1095bc40f87d9ff6d8c7206221412970a3d95 (diff) | |
| parent | e0de9f3295b4c46cb7198ec0b9634809d7b7a36d (diff) | |
| download | emacs-0dfb896be2d84e069831faf3499fe6add629af62.tar.gz | |
Merge from origin/emacs-27
e0de9f3295 (origin/emacs-27) Don't skip empty lines when fitting mini...
a4ec03fa9b ; * etc/tutorials/TUTORIAL.de: Fix grammar (Bug#44246)
20c02e628c Improve documentation of display-fill-column-indicator
e2005f1f2a * INSTALL: Mention efaq.texi for installation of intlfonts.
71661b2872 Use WebKit sandboxing
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 3fd6ac031c0..6927b6df6b8 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -324,9 +324,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (resize-mini-frames frames (choice (const :tag "Never" nil) - (const :tag "Fit frame to buffer" t) + (const :tag "Fit mini frame to buffer" t) (function :tag "User-defined function")) - "27.1") + "27.2") (menu-bar-mode frames boolean nil ;; FIXME? ;; :initialize custom-initialize-default |