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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b16c370e4e4e234795b87b95dc6baf6afc5de965..e1a0ee66dd7635aba1784538fe75c254e723bed1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
+
 2014-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * 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 cbffb18f69f932b98b8e7081578ff8a63aff0b97..ca884136a34480ad8a35bc7d044742f46f64ed6a 100644 (file)
--- 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 29fb2dd1edfee933adfa4a59b0996b64a083dbf6..ca867c99599777ea4c44b0d14910bb12b9fe84ed 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * buffer.c (overlay_strings): Fix the wording of the commentary.
+
 2014-05-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        Consult libpng-config more consistently (Bug#17339).

diff --git a/src/buffer.c b/src/buffer.c
index 3e1359707cd449710bd929a7eb31bb2f21043c45..8077e47fa0bf8dd650f312b72d28544baf6b1e54 100644 (file)
--- 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)