[Emacs-diffs] emacs/src ChangeLog xfns.c xterm.c

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/10/19 05:11:08

Modified files:
        src            : ChangeLog xfns.c xterm.c 

Log message:
        * xterm.c:
        * xfns.c: Remove always true condition: XtSpecificationRelease >= 5.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7799&r2=1.7800
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.745&r2=1.746
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1044&r2=1.1045

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7799
retrieving revision 1.7800
diff -u -b -r1.7799 -r1.7800
--- ChangeLog   19 Oct 2009 04:27:10 -0000      1.7799
+++ ChangeLog   19 Oct 2009 05:11:07 -0000      1.7800
@@ -1,5 +1,8 @@
 2009-10-19  Dan Nicolaescu  <address@hidden>
 
+       * xterm.c:
+       * xfns.c: Remove always true condition: XtSpecificationRelease >= 5.
+
        * alloc.c: Do not define struct catchtag.
        * eval.c: Move struct catchtag definition ...
        * lisp.h: ... here.

Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -b -r1.745 -r1.746
--- xfns.c      19 Oct 2009 04:27:22 -0000      1.745
+++ xfns.c      19 Oct 2009 05:11:08 -0000      1.746
@@ -98,13 +98,10 @@
 #include <Xm/FileSB.h>
 #endif
 
-/* Do the EDITRES protocol if running X11R5
-   Exception: HP-UX (at least version A.09.05) has X11R5 without EditRes */
-
-#if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES)
+#if !defined(NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages ();
-#endif /* R5 + Athena */
+#endif /* not defined NO_EDITRES */
 
 /* Unique id counter for widgets created by the Lucid Widget Library.  */
 

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1044
retrieving revision 1.1045
diff -u -b -r1.1044 -r1.1045
--- xterm.c     19 Oct 2009 04:27:23 -0000      1.1044
+++ xterm.c     19 Oct 2009 05:11:08 -0000      1.1045
@@ -113,7 +113,7 @@
 #endif
 
 #ifdef USE_X_TOOLKIT
-#if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES)
+#if !defined(NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages ();
 #endif /* not NO_EDITRES */