diff options
| author | Dan Nicolaescu | 2008-07-23 06:23:38 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-23 06:23:38 +0000 |
| commit | 7c799cf5b49d62de96c1dd10583a7504ba6ef848 (patch) | |
| tree | 148a5aa9ed3fbd8b25c01e97747fe77ba12d73b6 /src | |
| parent | 601fb9b822b020e1b9566b0a60874c1de89df0b2 (diff) | |
| download | emacs-7c799cf5b49d62de96c1dd10583a7504ba6ef848.tar.gz emacs-7c799cf5b49d62de96c1dd10583a7504ba6ef848.zip | |
(syms_of_nsterm): Provide ns, not ns-windowing,
similarly to what X does.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
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 @@ | |||
| 1 | 2008-07-23 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * nsterm.m (syms_of_nsterm): Provide ns, not ns-windowing, | ||
| 4 | similarly to what X does. | ||
| 5 | |||
| 1 | 2008-07-22 Adrian Robert <Adrian.B.Robert@gmail.com> | 6 | 2008-07-22 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 2 | 7 | ||
| 3 | * nsfns.m (x-list-fonts): Remove. | 8 | * 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\ | |||
| 6542 | staticpro (&last_mouse_motion_frame); | 6542 | staticpro (&last_mouse_motion_frame); |
| 6543 | last_mouse_motion_frame = Qnil; | 6543 | last_mouse_motion_frame = Qnil; |
| 6544 | 6544 | ||
| 6545 | /*23: now apparently we need to tell emacs what modifiers there are.. */ | 6545 | /*23: now apparently we need to tell emacs what modifiers there are.. */ |
| 6546 | Qmodifier_value = intern ("modifier-value"); | 6546 | Qmodifier_value = intern ("modifier-value"); |
| 6547 | Qalt = intern ("alt"); | 6547 | Qalt = intern ("alt"); |
| 6548 | Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); | 6548 | Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); |
| @@ -6587,7 +6587,7 @@ baseline level. The default value is nil. */); | |||
| 6587 | x_underline_at_descent_line = 0; | 6587 | x_underline_at_descent_line = 0; |
| 6588 | 6588 | ||
| 6589 | /* Tell emacs about this window system. */ | 6589 | /* Tell emacs about this window system. */ |
| 6590 | Fprovide (intern ("ns-windowing"), Qnil); | 6590 | Fprovide (intern ("ns"), Qnil); |
| 6591 | /* PENDING: try to move this back into lisp, ns-win.el loaded too late | 6591 | /* PENDING: try to move this back into lisp, ns-win.el loaded too late |
| 6592 | right now */ | 6592 | right now */ |
| 6593 | { | 6593 | { |