summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2024-10-12 05:53:27 -0400
committerEli Zaretskii <eliz@gnu.org>2024-10-12 05:53:27 -0400
commitbb5b25181ea7a4393f019dc641a981bdb6687c62 (patch)
tree678a5f622075e4cb031764d67af0ec620276fd5d /lisp/emacs-lisp
parent16e835171a8ce388e581174925e47263e864727d (diff)
parent0f8f0773183a07a229b23d3f970723ceb9585aef (diff)
downloademacs-bb5b25181ea7a4393f019dc641a981bdb6687c62.tar.gz
emacs-bb5b25181ea7a4393f019dc641a981bdb6687c62.tar.bz2
emacs-bb5b25181ea7a4393f019dc641a981bdb6687c62.zip
Merge from origin/emacs-30
0f8f0773183 ; * doc/emacs/search.texi (Word Search): Document 'dictio... fb155bcfb6f ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix. 6dbe4e99ac4 ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve... d664227f81a ; More accurate documentation of 'file-newer-than-file-p' e49b479f869 Fix c-ts-mode indentation for initializer lists (bug#73661) f520008744b Avoid segfaults in Rmail-MIME 6a5c2edd84f Eglot: use :immediate t when resolving completions (bug#7... cd36e070c24 Eglot: minor changes to doc and docstrings 1ea0d9b891b Revert "Set treesit-primary-parser for tree-sitter modes" 52746ceb625 Remove duplicate indent rules in elixir-ts-mode ed57faafc74 Set treesit-primary-parser for tree-sitter modes 37a6c859b04 ; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capita... 2d4d6dc43a4 Delete XIE X extension from TODO
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/chart.el17
-rw-r--r--lisp/emacs-lisp/cl-macs.el2
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 3acf2588f24..ac2e0645f96 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -574,13 +574,16 @@ R1 and R2 are dotted pairs. Colorize it with FACE."
(defun chart-bar-quickie (dir title namelst nametitle numlst numtitle
&optional max sort-pred)
- "Wash over the complex EIEIO stuff and create a nice bar chart.
-Create it going in direction DIR [`horizontal' `vertical'] with TITLE
-using a name sequence NAMELST labeled NAMETITLE with values NUMLST
-labeled NUMTITLE.
-Optional arguments:
-Set the chart's max element display to MAX, and sort lists with
-SORT-PRED if desired."
+ "Create a bar chart named TITLE in direction DIR [`horizontal' `vertical'].
+NAMELST is the list of bar names and NAMETITLE is the name the of axis
+containing them.
+NUMLST is the list of values and NUMTITLE is the name of the value
+axis.
+Optional argument MAX limits the chart's max element display to MAX by
+passing it as second argument to `chart-trim', otherwise the chart's
+display is unlimited.
+Optional argument SORT-PRED is a predicate function passed as second
+argument to `chart-sort' to sort the lists if desired."
(let ((nc (make-instance 'chart-bar
:title title
:key-label "8-m" ; This is a text key pic
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 2e501005bf7..b37f744b175 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2505,7 +2505,7 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...).
(defmacro cl-once-only (names &rest body)
"Generate code to evaluate each of NAMES just once in BODY.
-This macro helps with writing other macros. Each of names is
+This macro helps with writing other macros. Each of NAMES is
either (NAME FORM) or NAME, which latter means (NAME NAME).
During macroexpansion, each NAME is bound to an uninterned
symbol. The expansion evaluates each FORM and binds it to the