From 74a9022aba2055c1b4487eb5f69a274d108d893b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 May 2014 11:47:50 +0300 Subject: [PATCH] Minor fixes for comments. src/buffer.c (overlay_strings): Fix the wording of the commentary. lisp/mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment. --- lisp/ChangeLog | 4 ++++ lisp/mail/rmailsum.el | 4 ++-- src/ChangeLog | 4 ++++ src/buffer.c | 23 ++++++++++++----------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b16c370e4e..e1a0ee66dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-03 Eli Zaretskii + + * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment. + 2014-05-03 Stefan Monnier * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index cbffb18f69..ca884136a3 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -473,8 +473,8 @@ message." (widen) (goto-char (point-min)) (while (>= total msgnum) - ;; Go back to the Rmail buffer so - ;; so FUNCTION and rmail-get-summary can see its local vars. + ;; Go back to the Rmail buffer so FUNCTION and + ;; rmail-get-summary can see its local vars. (with-current-buffer main-buffer ;; First test whether to include this message. (if (or (null function) diff --git a/src/ChangeLog b/src/ChangeLog index 29fb2dd1ed..ca867c9959 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-05-03 Eli Zaretskii + + * buffer.c (overlay_strings): Fix the wording of the commentary. + 2014-05-02 Paul Eggert Consult libpng-config more consistently (Bug#17339). diff --git a/src/buffer.c b/src/buffer.c index 3e1359707c..8077e47fa0 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -3333,17 +3333,18 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, } } -/* Return the concatenation of the strings associated with overlays that - begin or end at POS, ignoring overlays that are specific to a window - other than W. The strings are concatenated in the appropriate order: - shorter overlays nest inside longer ones, and higher priority inside - lower. Normally all of the after-strings come first, but zero-sized - overlays have their after-strings ride along with the before-strings - because it would look strange to print them inside-out. - - Returns the string length, and stores the contents indirectly through - PSTR, if that variable is non-null. The string may be overwritten by - subsequent calls. */ +/* Concatenate the strings associated with overlays that begin or end + at POS, ignoring overlays that are specific to windows other than W. + The strings are concatenated in the appropriate order: shorter + overlays nest inside longer ones, and higher priority inside lower. + Normally all of the after-strings come first, but zero-sized + overlays have their after-strings ride along with the + before-strings because it would look strange to print them + inside-out. + + Returns the concatenated string's length, and return the pointer to + that string via PSTR, if that variable is non-NULL. The storage of + the concatenated strings may be overwritten by subsequent calls. */ ptrdiff_t overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr) -- 2.20.1