From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Terje Rosten Newsgroups: gmane.emacs.devel Subject: Re: Let's tell we are using GTK+ Date: Mon, 04 Aug 2003 21:33:31 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: main.gmane.org 1060026457 493 80.91.224.253 (4 Aug 2003 19:47:37 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 4 Aug 2003 19:47:37 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Aug 04 21:47:55 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19jlJC-0004Wx-00 for ; Mon, 04 Aug 2003 21:47:54 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19jlNQ-0001qA-00 for ; Mon, 04 Aug 2003 21:52:16 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.20) id 19jlFu-0006jP-OM for emacs-devel@quimby.gnus.org; Mon, 04 Aug 2003 15:44:30 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19jlBc-0005bG-Mk for emacs-devel@gnu.org; Mon, 04 Aug 2003 15:40:04 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19jl5J-0003vt-9N for emacs-devel@gnu.org; Mon, 04 Aug 2003 15:34:04 -0400 Original-Received: from [129.241.48.108] (helo=igor.phys.ntnu.no) by monty-python.gnu.org with esmtp (Exim 4.20) id 19jl5I-0003vU-7o for emacs-devel@gnu.org; Mon, 04 Aug 2003 15:33:32 -0400 Original-Received: from igor.phys.ntnu.no (localhost.localdomain [127.0.0.1]) by igor.phys.ntnu.no (8.12.8/8.12.8) with ESMTP id h74JXVQo019192 for ; Mon, 4 Aug 2003 21:33:31 +0200 Original-Received: (from terjeros@localhost) by igor.phys.ntnu.no (8.12.8/8.12.8/Submit) id h74JXVlD019190; Mon, 4 Aug 2003 21:33:31 +0200 X-Authentication-Warning: igor.phys.ntnu.no: terjeros set sender to terjeros@phys.ntnu.no using -f Original-To: emacs-devel@gnu.org In-Reply-To: User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) X-MIME-Autoconverted: from 8bit to quoted-printable by igor.phys.ntnu.no id h74JXVQo019192 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:15805 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:15805 * Lute Kamstra |=20 | Maybe the GTK version should be mentioned as well. Updated patches with version information and the (annoying?) + sign removed. emacs-version will now display something like this: GNU Emacs 21.3.50.1 (i686-pc-linux-gnu, GTK+ 2.2.1) of 2003-08-04 on=20 myhost.net - Terje Index: src/xfns.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/src/xfns.c,v retrieving revision 1.590 diff -u -r1.590 xfns.c --- src/xfns.c 31 Jul 2003 16:10:53 -0000 1.590 +++ src/xfns.c 4 Aug 2003 19:27:05 -0000 @@ -125,6 +125,14 @@ =20 #endif /* USE_X_TOOLKIT */ =20 +#ifdef USE_GTK + +/* GTK+ version info */ + +static Lisp_Object Vgtk_version_string; + +#endif /* USE_GTK */ + #ifdef HAVE_X11R4 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) #else @@ -10885,6 +10893,19 @@ Vmotif_version_string =3D build_string (XmVERSION_STRING); #endif /* USE_MOTIF */ #endif /* USE_X_TOOLKIT */ + +#ifdef USE_GTK + Fprovide (intern ("gtk-toolkit"), Qnil); + + DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, + doc: /* Version info for GTK+. */); + { + char gtk_version[8]; + sprintf (gtk_version, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSI= ON, + GTK_MICRO_VERSION); + Vgtk_version_string =3D build_string (gtk_version); + } +#endif /* USE_GTK */ =20 /* X window properties. */ defsubr (&Sx_change_window_property); Index: src/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v retrieving revision 1.3331 diff -u -r1.3331 ChangeLog --- src/ChangeLog 31 Jul 2003 16:10:53 -0000 1.3331 +++ src/ChangeLog 4 Aug 2003 19:27:08 -0000 @@ -1,3 +1,7 @@ +2003-08-04 Terje Rosten + + * xfns.c (syms_of_xfns): Add information about GTK+ version. + 2003-07-31 Jan Dj=E4rv =20 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2. Index: lisp/version.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/lisp/version.el,v retrieving revision 2.32 diff -u -r2.32 version.el --- lisp/version.el 4 Feb 2003 12:12:31 -0000 2.32 +++ lisp/version.el 4 Aug 2003 19:26:46 -0000 @@ -62,6 +62,8 @@ (cond ((featurep 'motif) (concat ", " (substring motif-version-string 4))) ((featurep 'x-toolkit) ", X toolkit") + ((featurep 'gtk-toolkit) + (concat ", GTK+ " gtk-version-string)) (t "")) (if (and (boundp 'x-toolkit-scroll-bars) (memq x-toolkit-scroll-bars '(xaw xaw3d))) Index: lisp/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v retrieving revision 1.5325 diff -u -r1.5325 ChangeLog --- lisp/ChangeLog 3 Aug 2003 14:10:33 -0000 1.5325 +++ lisp/ChangeLog 4 Aug 2003 19:26:48 -0000 @@ -1,3 +1,7 @@ +2003-08-04 Terje Rosten + + * version.el (emacs-version): Check for gtk-toolkit. + 2003-08-03 Glenn Morris =20 * calendar/calendar.el (diary-file, diary-file-name-prefix)