aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog16
-rw-r--r--src/xdisp.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d872cd03239..0c9e50ae65d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1221,14 +1221,14 @@
1221 in macros. 1221 in macros.
1222 1222
1223 * abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, 1223 * abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c,
1224 casefiddle.c, category.c, ccl.c, charset.c, cmds.c, coding.c, 1224 * casefiddle.c, category.c, ccl.c, charset.c, cmds.c, coding.c,
1225 composite.c, data.c, dired.c, dispnew.c, doc.c, dosfns.c, emacs.c, 1225 * composite.c, data.c, dired.c, dispnew.c, doc.c, dosfns.c, emacs.c,
1226 eval.c, fileio.c, filelock.c, fns.c, fontset.c, frame.c, frame.h, 1226 * eval.c, fileio.c, filelock.c, fns.c, fontset.c, frame.c, frame.h,
1227 indent.c, keyboard.c, keymap.c, lread.c, macros.c, marker.c, 1227 * indent.c, keyboard.c, keymap.c, lread.c, macros.c, marker.c,
1228 minibuf.c, mocklisp.c, msdos.c, print.c, process.c, search.c, 1228 * minibuf.c, mocklisp.c, msdos.c, print.c, process.c, search.c,
1229 sunfns.c, syntax.c, textprop.c, undo.c, w16select.c, w32console.c, 1229 * sunfns.c, syntax.c, textprop.c, undo.c, w16select.c, w32console.c,
1230 w32fns.c, w32menu.c, w32proc.c, w32select.c, window.c, xdisp.c, 1230 * w32fns.c, w32menu.c, w32proc.c, w32select.c, window.c, xdisp.c,
1231 xfaces.c, xmenu.c, xselect.c : Update usage of CHECK_ macros 1231 * xfaces.c, xmenu.c, xselect.c: Update usage of CHECK_ macros
1232 (remove unused second argument). 1232 (remove unused second argument).
1233 1233
12342001-11-02 Stefan Monnier <monnier@cs.yale.edu> 12342001-11-02 Stefan Monnier <monnier@cs.yale.edu>
diff --git a/src/xdisp.c b/src/xdisp.c
index 320075ba49d..f64e3eeabf5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1625,7 +1625,7 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
1625 it->continuation_pixel_width = it->pixel_width; 1625 it->continuation_pixel_width = it->pixel_width;
1626 } 1626 }
1627 1627
1628 /* Reset these values to zero becaue the produce_special_glyphs 1628 /* Reset these values to zero because the produce_special_glyphs
1629 above has changed them. */ 1629 above has changed them. */
1630 it->pixel_width = it->ascent = it->descent = 0; 1630 it->pixel_width = it->ascent = it->descent = 0;
1631 it->phys_ascent = it->phys_descent = 0; 1631 it->phys_ascent = it->phys_descent = 0;