3 files changed, 5 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f0b532df145..49014c340dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,3 @@
-2012-07-12  Glenn Morris  <rgm@gnu.org>
-
-        * s/gnu-linux.h, s/hpux10-20.h:
-        Do not unconditionally define HAVE_XRMSETDATABASE.
-
 2012-07-12  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in
@@ -19,6 +14,11 @@
 
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+        * s/aix4-2.h, s/hpux10-20.h: Let configure set NO_EDITRES.
+
+        * s/gnu-linux.h, s/hpux10-20.h:
+        Do not unconditionally define HAVE_XRMSETDATABASE.
+
         * s/gnu-linux.h (UNIX98_PTYS): Let configure set it.
 
 2012-07-12  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 49eabfc8466..55000f6f279 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -32,11 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
 #undef sigmask
 
-#ifndef HAVE_LIBXMU
-/* Unfortunately without libXmu we cannot support EditRes.  */
-#define NO_EDITRES
-#endif
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 00b384f1f3c..6115565e9d0 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -26,10 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* 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
-
 /* We have to go this route, rather than hpux9's approach of renaming the
    functions via macros.  The system's stdlib.h has fully prototyped
    declarations, which yields a conflicting definition of srand48; it