diff options
| author | Basil L. Contovounesios <basil@contovou.net> | 2024-03-17 13:04:32 +0100 |
|---|---|---|
| committer | Basil L. Contovounesios <basil@contovou.net> | 2024-03-21 10:43:17 +0100 |
| commit | 689f04a2ddfae856153bed762cc1461d66ec88de (patch) | |
| tree | b662210dac531ff2ac5ed0faa5a1f2370666103f | |
| parent | 759dedfab07a1c4db49c1291c9dde2aee648919d (diff) | |
| download | emacs-689f04a2ddf.tar.gz | |
Clarify description of format-spec truncation
* doc/lispref/strings.texi (Custom Format Strings): Mention that
precision specifier affects both '<' and '>' truncation (bug#69822).
* lisp/format-spec.el (format-spec, format-spec--do-flags): Use same
terminology as 'format', especially when referring to its behavior.
| -rw-r--r-- | doc/lispref/strings.texi | 2 | ||||
| -rw-r--r-- | lisp/format-spec.el | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index a364fef3aab..eca69002779 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1369,7 +1369,7 @@ given width and precision, if specified. @item > This flag causes the substitution to be truncated on the right to the -given width, if specified. +given width and precision, if specified. @item ^ This flag converts the substituted text to upper case (@pxref{Case diff --git a/lisp/format-spec.el b/lisp/format-spec.el index cf34017b994..73f9fccd793 100644 --- a/lisp/format-spec.el +++ b/lisp/format-spec.el @@ -38,7 +38,7 @@ For instance: (?l . \"ls\"))) Each %-spec may contain optional flag, width, and precision -modifiers, as follows: +specifiers, as follows: %<flags><width><precision>character @@ -51,7 +51,7 @@ The following flags are allowed: * ^: Convert to upper case. * _: Convert to lower case. -The width and truncation modifiers behave like the corresponding +The width and precision specifiers behave like the corresponding ones in `format' when applied to %s. For example, \"%<010b\" means \"substitute into the output the @@ -145,7 +145,7 @@ is returned, where each format spec is its own element." "Return STR formatted according to FLAGS, WIDTH, and TRUNC. FLAGS is a list of keywords as returned by `format-spec--parse-flags'. WIDTH and TRUNC are either nil or -string widths corresponding to `format-spec' modifiers." +string widths corresponding to `format-spec' specifiers." (let (diff str-width) ;; Truncate original string first, like `format' does. (when trunc |