[Emacs-diffs] emacs-24 r117053: Minor fixes for comments.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117053
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-03 11:47:50 +0300
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/rmailsum.el          
rmailsum.el-20091113204419-o5vbwnq5f7feedwu-8819
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/buffer.c                   buffer.c-20091113204419-o5vbwnq5f7feedwu-264

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-03 02:27:46 +0000
+++ b/lisp/ChangeLog    2014-05-03 08:47:50 +0000
@@ -1,3 +1,7 @@
+2014-05-03  Eli Zaretskii  <address@hidden>
+
+       * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
+
 2014-05-03  Stefan Monnier  <address@hidden>
 
        * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):

=== modified file 'lisp/mail/rmailsum.el'
--- a/lisp/mail/rmailsum.el     2014-02-10 01:34:22 +0000
+++ b/lisp/mail/rmailsum.el     2014-05-03 08:47:50 +0000
@@ -473,8 +473,8 @@
                (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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-02 19:34:03 +0000
+++ b/src/ChangeLog     2014-05-03 08:47:50 +0000
@@ -1,3 +1,7 @@
+2014-05-03  Eli Zaretskii  <address@hidden>
+
+       * buffer.c (overlay_strings): Fix the wording of the commentary.
+
 2014-05-02  Paul Eggert  <address@hidden>
 
        Consult libpng-config more consistently (Bug#17339).

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2014-04-15 13:21:18 +0000
+++ b/src/buffer.c      2014-05-03 08:47:50 +0000
@@ -3333,17 +3333,18 @@
     }
 }
 
-/* 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.
+/* 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 string length, and stores the contents indirectly through
-   PSTR, if that variable is non-null.  The string may be overwritten by
-   subsequent calls.  */
+   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)