2 files changed, 9 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5583e1a7b69..f0f437d9cdd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-11  Glenn Morris  <rgm@gnu.org>
+
+        * nsfns.m (ns_display_info_for_name, Fx_open_connection):
+        Replace refs to "OpenStep" in messages.
+
 2014-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Avoid "." at end of error diagnostics.
diff --git a/src/nsfns.m b/src/nsfns.m
index 1dad651c7ae..8a3a8c9307a 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -183,13 +183,13 @@ ns_display_info_for_name (Lisp_Object name)
     if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name)))
       return dpyinfo;
 
-  error ("Emacs for OpenStep does not yet support multi-display");
+  error ("Emacs for Nextstep does not yet support multi-display.");
 
   Fx_open_connection (name, Qnil, Qnil);
   dpyinfo = x_display_list;
 
   if (dpyinfo == 0)
-    error ("OpenStep on %s not responding.\n", SDATA (name));
+    error ("Display on %s not responding.\n", SDATA (name));
 
   return dpyinfo;
 }
@@ -1817,10 +1817,10 @@ terminate Emacs if we can't open the connection.
   if (dpyinfo == 0)
     {
       if (!NILP (must_succeed))
-        fatal ("OpenStep on %s not responding.\n",
+        fatal ("Display on %s not responding.\n",
                SSDATA (display));
       else
-        error ("OpenStep on %s not responding.\n",
+        error ("Display on %s not responding.\n",
                SSDATA (display));
     }