aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-05-03 11:47:50 +0300
committerEli Zaretskii2014-05-03 11:47:50 +0300
commit74a9022aba2055c1b4487eb5f69a274d108d893b (patch)
treecefa3127da97685d1097029fde2081b205b8856d
parente6cf6ca050891610596a559a2fb707570c4c1fe5 (diff)
downloademacs-74a9022aba2055c1b4487eb5f69a274d108d893b.tar.gz
emacs-74a9022aba2055c1b4487eb5f69a274d108d893b.zip
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.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/rmailsum.el4
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c23
4 files changed, 22 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b16c370e4e4..e1a0ee66dd7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-05-03 Eli Zaretskii <eliz@gnu.org>
2
3 * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
4
12014-05-03 Stefan Monnier <monnier@iro.umontreal.ca> 52014-05-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): 7 * 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 cbffb18f69f..ca884136a34 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -473,8 +473,8 @@ message."
473 (widen) 473 (widen)
474 (goto-char (point-min)) 474 (goto-char (point-min))
475 (while (>= total msgnum) 475 (while (>= total msgnum)
476 ;; Go back to the Rmail buffer so 476 ;; Go back to the Rmail buffer so FUNCTION and
477 ;; so FUNCTION and rmail-get-summary can see its local vars. 477 ;; rmail-get-summary can see its local vars.
478 (with-current-buffer main-buffer 478 (with-current-buffer main-buffer
479 ;; First test whether to include this message. 479 ;; First test whether to include this message.
480 (if (or (null function) 480 (if (or (null function)
diff --git a/src/ChangeLog b/src/ChangeLog
index 29fb2dd1edf..ca867c99599 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-05-03 Eli Zaretskii <eliz@gnu.org>
2
3 * buffer.c (overlay_strings): Fix the wording of the commentary.
4
12014-05-02 Paul Eggert <eggert@cs.ucla.edu> 52014-05-02 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Consult libpng-config more consistently (Bug#17339). 7 Consult libpng-config more consistently (Bug#17339).
diff --git a/src/buffer.c b/src/buffer.c
index 3e1359707cd..8077e47fa0b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3333,17 +3333,18 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str,
3333 } 3333 }
3334} 3334}
3335 3335
3336/* Return the concatenation of the strings associated with overlays that 3336/* Concatenate the strings associated with overlays that begin or end
3337 begin or end at POS, ignoring overlays that are specific to a window 3337 at POS, ignoring overlays that are specific to windows other than W.
3338 other than W. The strings are concatenated in the appropriate order: 3338 The strings are concatenated in the appropriate order: shorter
3339 shorter overlays nest inside longer ones, and higher priority inside 3339 overlays nest inside longer ones, and higher priority inside lower.
3340 lower. Normally all of the after-strings come first, but zero-sized 3340 Normally all of the after-strings come first, but zero-sized
3341 overlays have their after-strings ride along with the before-strings 3341 overlays have their after-strings ride along with the
3342 because it would look strange to print them inside-out. 3342 before-strings because it would look strange to print them
3343 3343 inside-out.
3344 Returns the string length, and stores the contents indirectly through 3344
3345 PSTR, if that variable is non-null. The string may be overwritten by 3345 Returns the concatenated string's length, and return the pointer to
3346 subsequent calls. */ 3346 that string via PSTR, if that variable is non-NULL. The storage of
3347 the concatenated strings may be overwritten by subsequent calls. */
3347 3348
3348ptrdiff_t 3349ptrdiff_t
3349overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr) 3350overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr)