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: Let's tell we are using GTK+ Date: Sun, 03 Aug 2003 17:14:43 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: 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 1059924435 17459 80.91.224.253 (3 Aug 2003 15:27:15 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sun, 3 Aug 2003 15:27:15 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sun Aug 03 17:27:30 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 19jKle-0003O2-00 for ; Sun, 03 Aug 2003 17:27:30 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19jKpJ-0000G5-00 for ; Sun, 03 Aug 2003 17:31:18 +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 19jKdy-0005IL-2v for emacs-devel@quimby.gnus.org; Sun, 03 Aug 2003 11:19:34 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19jKZz-0004Sz-8o for emacs-devel@gnu.org; Sun, 03 Aug 2003 11:15:27 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19jKZJ-0004OP-Si for emacs-devel@gnu.org; Sun, 03 Aug 2003 11:15:17 -0400 Original-Received: from [129.241.48.108] (helo=igor.phys.ntnu.no) by monty-python.gnu.org with esmtp (Exim 4.20) id 19jKZJ-0004Ns-6x for emacs-devel@gnu.org; Sun, 03 Aug 2003 11:14:45 -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 h73FEhQo013707 for ; Sun, 3 Aug 2003 17:14:43 +0200 Original-Received: (from terjeros@localhost) by igor.phys.ntnu.no (8.12.8/8.12.8/Submit) id h73FEhbC013705; Sun, 3 Aug 2003 17:14: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 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 h73FEhQo013707 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:15794 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:15794 Here are two patches which together let the lisp function emacs-version tell about the presence of GTK+ support. Please apply. Thanks, - 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 -c -r1.590 xfns.c *** src/xfns.c 31 Jul 2003 16:10:53 -0000 1.590 --- src/xfns.c 3 Aug 2003 14:52:35 -0000 *************** *** 10886,10891 **** --- 10886,10895 ---- #endif /* USE_MOTIF */ #endif /* USE_X_TOOLKIT */ =20 + #ifdef USE_GTK + Fprovide (intern ("gtk+-toolkit"), Qnil); + #endif /* USE_GTK */ +=20 /* X window properties. */ defsubr (&Sx_change_window_property); defsubr (&Sx_delete_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 3 Aug 2003 14:52:37 -0000 *************** *** 1,3 **** --- 1,7 ---- + 2003-08-03 Terje Rosten +=20 + * xfns.c (syms_of_xfns): Let's tell we are using GTK+. +=20 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 -c -r2.32 version.el *** lisp/version.el 4 Feb 2003 12:12:31 -0000 2.32 --- lisp/version.el 3 Aug 2003 14:53:36 -0000 *************** *** 62,67 **** --- 62,68 ---- (cond ((featurep 'motif) (concat ", " (substring motif-version-string 4))) ((featurep 'x-toolkit) ", X toolkit") + ((featurep 'gtk+-toolkit) ", GTK+ toolkit") (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.5321 diff -c -r1.5321 ChangeLog *** lisp/ChangeLog 2 Aug 2003 20:36:51 -0000 1.5321 --- lisp/ChangeLog 3 Aug 2003 14:53:39 -0000 *************** *** 1,3 **** --- 1,7 ---- + 2003-08-03 Terje Rosten +=20 + * version.el (emacs-version): Check for gtk+-toolkit. +=20 2003-08-02 Andreas Schwab =20 * apropos.el (apropos-words-to-regexp): Only add `wild' if `words'