2 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c1b7c0a9de2..c096c0a8870 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-03  Gerd Moellmann  <gerd@gnu.org>
+
+        * xfaces.c (syms_of_xfaces): Change Sface_color_gray_p to
+        Scolor_gray_p, Sface_color_supported_p to Scolor_supported_p.
+
+        * s/hpux9.h (NO_EDITRES): Define even if HAVE_LIBXMU.
+
 2000-01-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * xdisp.c (handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index e2423afd055..d73d3b7ce8d 100644
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -50,10 +50,12 @@
 /* HP-UX doesn't supply Xmu.  */
 #define LIBXMU
 
-/* Unfortunately without libXmu we cannot support EditRes.  */
-#define NO_EDITRES
 #endif
 
+/* Assar Westerlund <assar@sics.se> says this is necessary for
+   HP-UX 10.20, and that it works for HP-UX 0 as well.  */
+#define NO_EDITRES
+
 /* zoo@armadillo.com says we don't need -lXext in HPUX 9.  */
 #undef LIBX11_SYSTEM