mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
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.
This commit is contained in:
parent
759dedfab0
commit
689f04a2dd
@ -1369,7 +1369,7 @@ given width and precision, if specified.
|
|||||||
|
|
||||||
@item >
|
@item >
|
||||||
This flag causes the substitution to be truncated on the right to the
|
This flag causes the substitution to be truncated on the right to the
|
||||||
given width, if specified.
|
given width and precision, if specified.
|
||||||
|
|
||||||
@item ^
|
@item ^
|
||||||
This flag converts the substituted text to upper case (@pxref{Case
|
This flag converts the substituted text to upper case (@pxref{Case
|
||||||
|
@ -38,7 +38,7 @@ For instance:
|
|||||||
(?l . \"ls\")))
|
(?l . \"ls\")))
|
||||||
|
|
||||||
Each %-spec may contain optional flag, width, and precision
|
Each %-spec may contain optional flag, width, and precision
|
||||||
modifiers, as follows:
|
specifiers, as follows:
|
||||||
|
|
||||||
%<flags><width><precision>character
|
%<flags><width><precision>character
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ The following flags are allowed:
|
|||||||
* ^: Convert to upper case.
|
* ^: Convert to upper case.
|
||||||
* _: Convert to lower 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.
|
ones in `format' when applied to %s.
|
||||||
|
|
||||||
For example, \"%<010b\" means \"substitute into the output the
|
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.
|
"Return STR formatted according to FLAGS, WIDTH, and TRUNC.
|
||||||
FLAGS is a list of keywords as returned by
|
FLAGS is a list of keywords as returned by
|
||||||
`format-spec--parse-flags'. WIDTH and TRUNC are either nil or
|
`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)
|
(let (diff str-width)
|
||||||
;; Truncate original string first, like `format' does.
|
;; Truncate original string first, like `format' does.
|
||||||
(when trunc
|
(when trunc
|
||||||
|
Loading…
Reference in New Issue
Block a user