diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-02-06 08:10:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-02-06 08:10:38 -0800 |
| commit | c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33 (patch) | |
| tree | 0eff275884c2392219cea211e538993d65927b43 /lisp/cus-start.el | |
| parent | fdc56b5d567b2e5aac017582a75b34351d53b867 (diff) | |
| parent | 8ad48a0bdd0806fe3bfbabf00c845381d9107cb0 (diff) | |
| download | emacs-c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33.tar.gz emacs-c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33.tar.bz2 emacs-c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33.zip | |
Merge from origin/emacs-27
8ad48a0bdd (origin/emacs-27) Improve doc string of 'text-scale-adjust'
7a25ff767d Clarify the indent-rigidly doc string
6c5ddf0e0b Fix two small tab bar issues
c71e08eba9 Fix last change in syntax.texi
# Conflicts:
# lisp/indent.el
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 27fdb723441..c0a4a6dda06 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -343,7 +343,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const :tag "Never" nil) (const :tag "Always" t) (repeat (symbol :tag "Parameter"))) - "25.1") + "27.1") (iconify-child-frame frames (choice (const :tag "Do nothing" nil) |