aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2003-11-29 11:10:07 +0000
committerJan Djärv2003-11-29 11:10:07 +0000
commit019b1f0e337b2994e33a7350da95f64f0777b3a6 (patch)
tree3af0b3f6a939e1c72e634d612d5b972f5d91a8ad /src
parent03d6484ea449799da1d223491c12d29204aa708a (diff)
downloademacs-019b1f0e337b2994e33a7350da95f64f0777b3a6.tar.gz
emacs-019b1f0e337b2994e33a7350da95f64f0777b3a6.zip
* dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
to compile on terminal configuration.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dispnew.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 19ffd8f9428..0c892743236 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12003-11-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12003-11-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
4 to compile on terminal configuration.
5
3 * fileio.c (Fread_file_name): Check use_file_dialog also before 6 * fileio.c (Fread_file_name): Check use_file_dialog also before
4 calling Fx_file_dialog. 7 calling Fx_file_dialog.
5 8
diff --git a/src/dispnew.c b/src/dispnew.c
index c391cd6b615..279c1f10e58 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5726,11 +5726,13 @@ buffer_posn_from_coords (w, x, y, dx, dy, object, pos)
5726 *dx = x0 + it.first_visible_x - it.current_x; 5726 *dx = x0 + it.first_visible_x - it.current_x;
5727 *dy = *y - it.current_y; 5727 *dy = *y - it.current_y;
5728 5728
5729#ifdef HAVE_WINDOW_SYSTEM
5729 if (it.what == IT_IMAGE 5730 if (it.what == IT_IMAGE
5730 && (img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL 5731 && (img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL
5731 && !NILP (img->spec)) 5732 && !NILP (img->spec))
5732 *object = img->spec; 5733 *object = img->spec;
5733 else 5734 else
5735#endif
5734 *object = STRINGP (it.string) ? it.string : w->buffer; 5736 *object = STRINGP (it.string) ? it.string : w->buffer;
5735 *pos = it.current; 5737 *pos = it.current;
5736 *x = it.hpos; 5738 *x = it.hpos;