[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Thu, 24 Apr 2008 05:11:12 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/04/24 05:11:08
Index: src/xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1209
retrieving revision 1.1210
diff -u -b -r1.1209 -r1.1210
--- src/xdisp.c 20 Apr 2008 22:46:14 -0000 1.1209
+++ src/xdisp.c 24 Apr 2008 05:11:07 -0000 1.1210
@@ -1723,7 +1723,10 @@
text, or we can't tell because W's current matrix is not up to
date. */
-static struct glyph *
+#ifndef HAVE_CARBON
+static
+#endif
+struct glyph *
x_y_to_hpos_vpos (w, x, y, hpos, vpos, dx, dy, area)
struct window *w;
int x, y;
@@ -22498,7 +22501,10 @@
in 20.x as well, and I think it's too risky to install
so near the release of 21.1. 2001-09-25 gerd. */
-static int
+#ifndef HAVE_CARBON
+static
+#endif
+int
fast_find_position (w, charpos, hpos, vpos, x, y, stop)
struct window *w;
EMACS_INT charpos;
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/04/02
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/04/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Jason Rumney, 2008/04/09
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/04/20
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Miles Bader <=