* xterm.c:

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 51c01fbc19967bd952d15bc0ecf6151100266b55..6efec645f78b7212a758c30ed4a76b4db6bd7621 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * 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.

diff --git a/src/xfns.c b/src/xfns.c
index 4fc08925ebb09864a6f4d82aefe9303d7994e06f..b9217617e30e447b91d1b548f65bac89fc6258b5 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -98,13 +98,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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.  */
 

diff --git a/src/xterm.c b/src/xterm.c
index c77136eb64aa956b18a04970fc5c27831ddd0b98..5a004873507b49f4bf6bd9e4c7d26aea7a69bd75 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -113,7 +113,7 @@ extern void free_frame_menubar P_ ((struct frame *));
 #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 */