summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8bee26ced91..c902bb93ad1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * nsterm.m (syms_of_nsterm): Provide ns, not ns-windowing,
+ similarly to what X does.
+
2008-07-22 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfns.m (x-list-fonts): Remove.
diff --git a/src/nsterm.m b/src/nsterm.m
index 8fd157ebcc4..ecf44894371 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6542,7 +6542,7 @@ or shrunk (negative). Zero (the default) means standard line height.\n\
staticpro (&last_mouse_motion_frame);
last_mouse_motion_frame = Qnil;
-/*23: now apparently we need to tell emacs what modifiers there are.. */
+ /*23: now apparently we need to tell emacs what modifiers there are.. */
Qmodifier_value = intern ("modifier-value");
Qalt = intern ("alt");
Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
@@ -6587,7 +6587,7 @@ baseline level. The default value is nil. */);
x_underline_at_descent_line = 0;
/* Tell emacs about this window system. */
- Fprovide (intern ("ns-windowing"), Qnil);
+ Fprovide (intern ("ns"), Qnil);
/* PENDING: try to move this back into lisp, ns-win.el loaded too late
right now */
{