[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v |
Date: |
Thu, 01 Nov 2007 07:41:50 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 07/11/01 07:41:50
Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -b -r1.697 -r1.698
--- xfns.c 25 Oct 2007 02:38:37 -0000 1.697
+++ xfns.c 1 Nov 2007 07:41:49 -0000 1.698
@@ -138,11 +138,7 @@
#endif /* USE_GTK */
-#ifdef HAVE_X11R4
#define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
-#else
-#define MAXREQUEST(dpy) ((dpy)->max_request_size)
-#endif
/* The gray bitmap `bitmaps/gray'. This is done because xterm.c uses
it, and including `bitmaps/gray' more than once is a problem when
@@ -1619,7 +1615,6 @@
if (FRAME_X_WINDOW (f))
{
BLOCK_INPUT;
-#ifdef HAVE_X11R4
{
XTextProperty text, icon;
int bytes, stringp;
@@ -1687,12 +1682,6 @@
if (do_free_text_value)
xfree (text.value);
}
-#else /* not HAVE_X11R4 */
- XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
- SDATA (name));
- XStoreName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
- SDATA (name));
-#endif /* not HAVE_X11R4 */
UNBLOCK_INPUT;
}
}
@@ -1879,23 +1868,6 @@
-#if !defined (HAVE_X11R4) && !defined (HAVE_XSETWMPROTOCOLS)
-
-Status
-XSetWMProtocols (dpy, w, protocols, count)
- Display *dpy;
- Window w;
- Atom *protocols;
- int count;
-{
- Atom prop;
- prop = XInternAtom (dpy, "WM_PROTOCOLS", False);
- if (prop == None) return False;
- XChangeProperty (dpy, w, prop, XA_ATOM, 32, PropModeReplace,
- (unsigned char *) protocols, count);
- return True;
-}
-#endif /* not HAVE_X11R4 && not HAVE_XSETWMPROTOCOLS */
#ifdef USE_X_TOOLKIT
@@ -4013,11 +3985,7 @@
dpyinfo->visual = DefaultVisualOfScreen (screen);
-#ifdef HAVE_X11R4
vinfo_template.visualid = XVisualIDFromVisual (dpyinfo->visual);
-#else
- vinfo_template.visualid = dpyinfo->visual->visualid;
-#endif
vinfo_template.screen = XScreenNumberOfScreen (screen);
vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask,
&vinfo_template, &n_visuals);
- [Emacs-diffs] Changes to emacs/src/xfns.c,v,
Jan Djärv <=