diff options
| author | Paul Eggert | 2011-04-04 12:30:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-04 12:30:48 -0700 |
| commit | 1e792e4d80f58bdb5b460518729eb0585b10f8d3 (patch) | |
| tree | 73d3272a2f981ca1991c9cc6c6cae2ca403eda18 /src | |
| parent | aa86731f7416c8739f206d0c5eca52e2a6d3c827 (diff) | |
| download | emacs-1e792e4d80f58bdb5b460518729eb0585b10f8d3.tar.gz emacs-1e792e4d80f58bdb5b460518729eb0585b10f8d3.zip | |
* textprop.c (set_text_properties_1): Change while to do-while,
since the condition is always true at first.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/textprop.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9bd13eaeb7b..5c5d72c89cb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-04 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * textprop.c (set_text_properties_1): Change while to do-while, | ||
| 4 | since the condition is always true at first. | ||
| 5 | |||
| 3 | * intervals.c (graft_intervals_into_buffer): Mark var as used. | 6 | * intervals.c (graft_intervals_into_buffer): Mark var as used. |
| 4 | (interval_deletion_adjustment): Return unsigned value. | 7 | (interval_deletion_adjustment): Return unsigned value. |
| 5 | All uses changed. | 8 | All uses changed. |
diff --git a/src/textprop.c b/src/textprop.c index cd89efeb38d..53f92ec936b 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1379,8 +1379,8 @@ set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object propertie | |||
| 1379 | i = next_interval (i); | 1379 | i = next_interval (i); |
| 1380 | } | 1380 | } |
| 1381 | 1381 | ||
| 1382 | /* We are starting at the beginning of an interval, I */ | 1382 | /* We are starting at the beginning of an interval I. LEN is positive. */ |
| 1383 | while (len > 0) | 1383 | do |
| 1384 | { | 1384 | { |
| 1385 | if (i == 0) | 1385 | if (i == 0) |
| 1386 | abort (); | 1386 | abort (); |
| @@ -1412,6 +1412,7 @@ set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object propertie | |||
| 1412 | 1412 | ||
| 1413 | i = next_interval (i); | 1413 | i = next_interval (i); |
| 1414 | } | 1414 | } |
| 1415 | while (len > 0); | ||
| 1415 | } | 1416 | } |
| 1416 | 1417 | ||
| 1417 | DEFUN ("remove-text-properties", Fremove_text_properties, | 1418 | DEFUN ("remove-text-properties", Fremove_text_properties, |