[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d90fd58c02: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master d90fd58c02: Merge from origin/emacs-28 |
Date: |
Sun, 6 Feb 2022 00:49:45 -0500 (EST) |
branch: master
commit d90fd58c026b9007970730d431ae04b4925c30d7
Merge: 32dc552a53 821c240075
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
821c240075 Fix ietf-drums-get-comment doc string
638247baa4 Fix typo in display.texi
---
doc/lispref/display.texi | 2 +-
lisp/mail/ietf-drums.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 5d75e58108..b749d3d892 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -7317,7 +7317,7 @@ current buffer, and returns it.
@end defun
@defun insert-button label &rest properties
-This insert a button with the label @var{label} at point,
+This inserts a button with the label @var{label} at point,
and returns it.
@end defun
diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el
index 9bdc0533e3..473f95ca50 100644
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@ -150,7 +150,7 @@ backslash and doublequote.")
(buffer-string))))
(defun ietf-drums-get-comment (string)
- "Return the first comment in STRING."
+ "Return the last comment in STRING."
(with-temp-buffer
(ietf-drums-init string)
(let (result c)