diff options
| author | Richard M. Stallman | 2003-07-17 10:15:15 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2003-07-17 10:15:15 +0000 |
| commit | fdc39b5955e385f0470ed5da20b929920c91bf78 (patch) | |
| tree | 4a777d698c71eec4f737b2026e5dd6aa4d9299dd /src | |
| parent | d023326a873e20bac2837f0ef639fe1f154e41d5 (diff) | |
| download | emacs-fdc39b5955e385f0470ed5da20b929920c91bf78.tar.gz emacs-fdc39b5955e385f0470ed5da20b929920c91bf78.zip | |
(xim_initialize): Redo 6/24 change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8437771d9b4..54ea2643859 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2003-07-17 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * xterm.c (xim_initialize): Redo 6/24 change. | ||
| 4 | |||
| 1 | 2003-07-15 Stefan Monnier <monnier@cs.yale.edu> | 5 | 2003-07-15 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 6 | ||
| 3 | * buffer.c (copy_overlays): Use EMACS_INT for positions. | 7 | * buffer.c (copy_overlays): Use EMACS_INT for positions. |
diff --git a/src/xterm.c b/src/xterm.c index 63b0139b4a9..92c3317c106 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8140,7 +8140,7 @@ xim_initialize (dpyinfo, resource_name) | |||
| 8140 | /* This is XPointer in XFree86 | 8140 | /* This is XPointer in XFree86 |
| 8141 | but (XPointer *) on Tru64, at | 8141 | but (XPointer *) on Tru64, at |
| 8142 | least, hence the configure test. */ | 8142 | least, hence the configure test. */ |
| 8143 | (XPointer) xim_inst); | 8143 | (XRegisterIMInstantiateCallback_arg6) xim_inst); |
| 8144 | #else /* not HAVE_X11R6_XIM */ | 8144 | #else /* not HAVE_X11R6_XIM */ |
| 8145 | dpyinfo->xim = NULL; | 8145 | dpyinfo->xim = NULL; |
| 8146 | xim_open_dpy (dpyinfo, resource_name); | 8146 | xim_open_dpy (dpyinfo, resource_name); |