Commit cb83c00b authored by Adrian Robert's avatar Adrian Robert

* lisp/version.el (emacs-version): Change '*Step' to 'NS' for consistency with...

* lisp/version.el (emacs-version): Change '*Step' to 'NS' for consistency with other documentation.  * src/nsfns.m (ns_appkit_version): New function.  (x-server-version): Use it.  (syms_of_nsfns): Define ns-version-string here, not nsterm.m.  (x-server-vendor): Don't check_ns().  * nsterm.m (syms_of_nsterm): Drop ns-version-string.
parent 20a36054
2008-10-22 Adrian Robert <Adrian.B.Robert@gmail.com>
* version.el (emacs-version): Change '*Step' to 'NS' for consistency
with other documentation.
2008-10-22 Juanma Barranquero <lekktu@gmail.com>
* replace.el (how-many): Fix typo in docstring.
......
......@@ -66,7 +66,7 @@ to the system configuration; look at `system-configuration' instead."
(concat ", GTK+ Version " gtk-version-string))
((featurep 'x-toolkit) ", X toolkit")
((featurep 'ns)
(format ", *Step %s" ns-version-string))
(format ", NS %s" ns-version-string))
(t ""))
(if (and (boundp 'x-toolkit-scroll-bars)
(memq x-toolkit-scroll-bars '(xaw xaw3d)))
......
2008-10-02 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfns.m (ns_appkit_version): New function.
(x-server-version): Use it.
(syms_of_nsfns): Define ns-version-string here, not nsterm.m.
(x-server-vendor): Don't check_ns().
* nsterm.m (syms_of_nsterm): Drop ns-version-string.
2008-10-22 Juanma Barranquero <lekktu@gmail.com>
* w32fns.c (unwind_create_frame) [!GLYPH_DEBUG]: Fix xassert.
......
......@@ -86,7 +86,10 @@ Updated by Christian Limpach (chris@nice.ch)
/* Alist of elements (REGEXP . IMAGE) for images of icons associated
to frames.*/
Lisp_Object Vns_icon_type_alist;
static Lisp_Object Vns_icon_type_alist;
/* Toolkit version support. */
static Lisp_Object Vns_version_string;
EmacsTooltip *ns_tooltip;
......@@ -950,6 +953,25 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
}
#define Str(x) #x
#define Xstr(x) Str(x)
static Lisp_Object
ns_appkit_version ()
{
char tmp[80];
#ifdef NS_IMPL_GNUSTEP
sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION));
#elif defined(NS_IMPL_COCOA)
sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber);
#else
tmp = "ns-unknown";
#endif
return build_string (tmp);
}
static void
x_icon (struct frame *f, Lisp_Object parms)
/* --------------------------------------------------------------------------
......@@ -1019,6 +1041,13 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
};
/* ==========================================================================
Lisp definitions
========================================================================== */
DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
1, 1, 0,
doc: /* Make a new Nextstep window, called a \"frame\" in Emacs terms.
......@@ -1321,12 +1350,6 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
}
/* ==========================================================================
Lisp definitions
========================================================================== */
DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
doc: /* Set the input focus to FRAME.
FRAME nil means use the selected frame. */)
......@@ -1575,7 +1598,6 @@ DISPLAY should be either a frame or a display name (a string).
(display)
Lisp_Object display;
{
check_ns ();
#ifdef NS_IMPL_GNUSTEP
return build_string ("GNU");
#else
......@@ -1592,8 +1614,7 @@ DISPLAY should be either a frame or a display name (a string).
(display)
Lisp_Object display;
{
/* FIXME: return GUI version on GNUstep, ?? on OS X */
return build_string ("1.0");
return ns_appkit_version ();
}
......@@ -2640,6 +2661,10 @@ - (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename
be used as the image of the icon representing the frame. */);
Vns_icon_type_alist = Fcons (Qt, Qnil);
DEFVAR_LISP ("ns-version-string", &Vns_version_string,
doc: /* Toolkit version for NS Windowing. */);
Vns_version_string = ns_appkit_version ();
defsubr (&Sns_read_file_name);
defsubr (&Sns_get_resource);
defsubr (&Sns_set_resource);
......
......@@ -6379,13 +6379,6 @@ or shrunk (negative). Zero (the default) means standard line height.\n\
/* Tell emacs about this window system. */
Fprovide (intern ("ns"), Qnil);
/* TODO: try to move this back into lisp, ns-win.el loaded too late
right now */
{
Lisp_Object args[3] = { intern ("ns-version-string"), build_string ("9.0"),
build_string ("NS Window system port version number.") };
Fdefconst (Flist (3, args));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment