branch: externals/cm-mode
commit 5797272b1160feed405b4a89fd6005ac38e98041
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Update doc string of cm-merge-comment.
---
cm-mode.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cm-mode.el b/cm-mode.el
index 7945cbea15..e415047c15 100644
--- a/cm-mode.el
+++ b/cm-mode.el
@@ -776,12 +776,12 @@ CHANGE matches `cm-author'; if CHANGE has no author; or if
(string= author cm-author))))
(defun cm-merge-comment (change)
- "Merge CHANGE with a following comment.
-CHANGE is a list as returned by `cm-markup-at-point'. If there
-is a comment following CHANGE, return an updated list that
-contains both CHANGE and the comment. If CHANGE is a comment
-itself, check if there's another change preceding it and include
-it."
+ "Merge CHANGE and an adjacent comment.
+CHANGE is a list as returned by `cm-markup-at-point'. Check if
+there is a comment following CHANGE, or, if CHANGE is a comment
+itself, check if there is a change preceding CHANGE. If there
+is, return an updated list that contains both. If CHANGE is nil,
+return nil."
(unless (not change)
(cond
((cm-comment-p change)
