From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 11 Nov 1995 07:13:56 +0000 (+0000)
Subject: (HACK_EDITRES): Don't define if NO_EDITRES is defined.
X-Git-Tag: emacs-19.34~2352
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b882b1dabcb67f914cb4d5d1bfbf694a87ce0b3;p=emacs.git

(HACK_EDITRES): Don't define if NO_EDITRES is defined.
---

diff --git a/src/xfns.c b/src/xfns.c
index 3c85799e800..e55dc0bec44 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -70,8 +70,9 @@ extern void abort ();
 
 #include "../lwlib/lwlib.h"
 
-/* Do the EDITRES protocol if running X11R5 */
-#if (XtSpecificationRelease >= 5)
+/* 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)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages ();
 #endif /* R5 + Athena */