aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-06 00:17:04 -0800
committerPaul Eggert2011-03-06 00:17:04 -0800
commitacbfe54c07f24929f584ba9e29baf4401ee4bfd9 (patch)
tree5a422caf516193d884104a7a4a18cfb22c20ab37 /src
parentd8a3e89e23a24e823666818d1f34b5cba72cf3fc (diff)
downloademacs-acbfe54c07f24929f584ba9e29baf4401ee4bfd9.tar.gz
emacs-acbfe54c07f24929f584ba9e29baf4401ee4bfd9.zip
* xdisp.c (SKIP_GLYPHS): Removed unused macro.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xdisp.c12
2 files changed, 1 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b67dd8bf797..6321786bee4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -12,6 +12,7 @@
12 (produce_glyphless_glyph): Make a pointer "const" 12 (produce_glyphless_glyph): Make a pointer "const"
13 since it might point to immutable storage. 13 since it might point to immutable storage.
14 (update_window_cursor): Now static, since it's not used elsewhere. 14 (update_window_cursor): Now static, since it's not used elsewhere.
15 (SKIP_GLYPHS): Removed unused macro.
15 16
162011-03-06 Michael Shields <shields@msrl.com> (tiny change) 172011-03-06 Michael Shields <shields@msrl.com> (tiny change)
17 18
diff --git a/src/xdisp.c b/src/xdisp.c
index 3155116c48d..4c1e906c04c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12382,18 +12382,6 @@ redisplay_window_1 (Lisp_Object window)
12382} 12382}
12383 12383
12384 12384
12385/* Increment GLYPH until it reaches END or CONDITION fails while
12386 adding (GLYPH)->pixel_width to X. */
12387
12388#define SKIP_GLYPHS(glyph, end, x, condition) \
12389 do \
12390 { \
12391 (x) += (glyph)->pixel_width; \
12392 ++(glyph); \
12393 } \
12394 while ((glyph) < (end) && (condition))
12395
12396
12397/* Set cursor position of W. PT is assumed to be displayed in ROW. 12385/* Set cursor position of W. PT is assumed to be displayed in ROW.
12398 DELTA and DELTA_BYTES are the numbers of characters and bytes by 12386 DELTA and DELTA_BYTES are the numbers of characters and bytes by
12399 which positions recorded in ROW differ from current buffer 12387 which positions recorded in ROW differ from current buffer