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: Wed, 06 Aug 2003 09:56:42 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <87adaqdxqt.fsf@tc-1-100.kawasaki.gol.ne.jp> <200308052304.IAA14982@etlken.m17n.org> 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 1060158738 11499 80.91.224.253 (6 Aug 2003 08:32:18 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 6 Aug 2003 08:32:18 +0000 (UTC) Cc: miles@gnu.org, lektu@terra.es, rms@gnu.org, handa@m17n.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed Aug 06 10:32:37 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 19kJin-0000vc-00 for ; Wed, 06 Aug 2003 10:32:37 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19kJni-0000zC-00 for ; Wed, 06 Aug 2003 10:37:42 +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 19kJgw-000516-D9 for emacs-devel@quimby.gnus.org; Wed, 06 Aug 2003 04:30:42 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19kJgf-0004yy-2G for emacs-devel@gnu.org; Wed, 06 Aug 2003 04:30:25 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19kJg2-0004nQ-4I for emacs-devel@gnu.org; Wed, 06 Aug 2003 04:30:18 -0400 Original-Received: from [129.241.48.108] (helo=igor.phys.ntnu.no) by monty-python.gnu.org with esmtp (Exim 4.20) id 19kJAB-0005FH-8j; Wed, 06 Aug 2003 03:56:51 -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 h767uiQo022333; Wed, 6 Aug 2003 09:56:44 +0200 Original-Received: (from terjeros@localhost) by igor.phys.ntnu.no (8.12.8/8.12.8/Submit) id h767uhj1022331; Wed, 6 Aug 2003 09:56:43 +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: <200308052304.IAA14982@etlken.m17n.org> 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 h767uiQo022333 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:15817 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:15817 * Kenichi Handa |=20 | As "gtk" stands for "Gimp ToolKit", "gtk-toolkit" sounds strange to | me. Agree. Updated patches follows. Please apply. Thanks, - Terje src/ part: 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 -c -r1.590 xfns.c *** src/xfns.c 31 Jul 2003 16:10:53 -0000 1.590 --- src/xfns.c 6 Aug 2003 07:42:47 -0000 *************** *** 125,130 **** --- 125,138 ---- =20 #endif /* USE_X_TOOLKIT */ =20 + #ifdef USE_GTK +=20 + /* GTK+ version info */ +=20 + static Lisp_Object Vgtk_version_string; +=20 + #endif /* USE_GTK */ +=20 #ifdef HAVE_X11R4 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) #else *************** *** 10885,10890 **** --- 10893,10911 ---- Vmotif_version_string =3D build_string (XmVERSION_STRING); #endif /* USE_MOTIF */ #endif /* USE_X_TOOLKIT */ +=20 + #ifdef USE_GTK + Fprovide (intern ("gtk"), Qnil); +=20 + DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, + doc: /* Version info for GTK+. */); + { + char gtk_version[12]; + sprintf (gtk_version, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERS= ION, + 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 -c -r1.3331 ChangeLog *** src/ChangeLog 31 Jul 2003 16:10:53 -0000 1.3331 --- src/ChangeLog 6 Aug 2003 07:42:48 -0000 *************** *** 1,3 **** --- 1,8 ---- + 2003-08-06 Terje Rosten +=20 + * xfns.c (Vgtk_version_string): New variable. + (syms_of_xfns): DEFVAR_LISP it. Provide gtk. +=20 2003-07-31 Jan Dj=E4rv =20 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2. lisp/ part: 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 -c -r2.32 version.el *** lisp/version.el 4 Feb 2003 12:12:31 -0000 2.32 --- lisp/version.el 6 Aug 2003 07:42:27 -0000 *************** *** 62,67 **** --- 62,69 ---- (cond ((featurep 'motif) (concat ", " (substring motif-version-string 4))) ((featurep 'x-toolkit) ", X toolkit") + ((featurep 'gtk) + (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.5328 diff -c -r1.5328 ChangeLog *** lisp/ChangeLog 6 Aug 2003 01:11:11 -0000 1.5328 --- lisp/ChangeLog 6 Aug 2003 07:42:32 -0000 *************** *** 1,3 **** --- 1,7 ---- + 2003-08-06 Terje Rosten +=20 + * version.el (emacs-version): Check for gtk. Include gtk version info. +=20 2003-08-05 Richard M. Stallman =20 * emacs-lisp/testcover.el (noreturn): Report error if does return.