From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Masatake YAMATO Newsgroups: gmane.emacs.devel Subject: x_find_image_file Date: Fri, 12 Mar 2004 14:12:23 +0900 (JST) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20040312.141223.95842688.jet@gyve.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1079178374 32534 80.91.224.253 (13 Mar 2004 11:46:14 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 13 Mar 2004 11:46:14 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat Mar 13 12:46:06 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B27ag-0002uO-00 for ; Sat, 13 Mar 2004 12:46:06 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B27af-0004ZD-00 for ; Sat, 13 Mar 2004 12:46:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B26MA-0007oz-K4 for emacs-devel@quimby.gnus.org; Sat, 13 Mar 2004 05:27:02 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B23FS-0001dh-ON for emacs-devel@gnu.org; Sat, 13 Mar 2004 02:07:54 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B1eyD-00022s-1l for emacs-devel@gnu.org; Fri, 12 Mar 2004 00:13:01 -0500 Original-Received: from [210.130.136.40] (helo=r-maa.spacetown.ne.jp) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B1eyC-00022V-D5 for emacs-devel@gnu.org; Fri, 12 Mar 2004 00:12:28 -0500 Original-Received: from localhost (nat-pool.jp.redhat.com [219.120.63.249]) by r-maa.spacetown.ne.jp (8.11.6) with ESMTP id i2C5CNL26272 for ; Fri, 12 Mar 2004 14:12:23 +0900 (JST) Original-To: emacs-devel@gnu.org X-Mailer: Mew version 4.0.62 on Emacs 21.3.50 / Mule 5.0 (SAKAKI) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 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:20384 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20384 With --with-gtk, make claims that it cannot find x_find_image_file. I've removed static modifiers but I'm not sure this is true fix or not. Masatake YAMATO Index: src/xfns.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/xfns.c,v retrieving revision 1.607 diff -u -r1.607 xfns.c --- src/xfns.c 11 Mar 2004 00:25:38 -0000 1.607 +++ src/xfns.c 12 Mar 2004 05:08:24 -0000 @@ -761,7 +761,7 @@ #ifdef USE_GTK -static Lisp_Object x_find_image_file P_ ((Lisp_Object file)); +extern Lisp_Object x_find_image_file P_ ((Lisp_Object file)); /* Set icon from FILE for frame F. By using GTK functions the icon may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */ Index: src/image.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/image.c,v retrieving revision 1.4 diff -u -r1.4 image.c --- src/image.c 11 Mar 2004 22:43:06 -0000 1.4 +++ src/image.c 12 Mar 2004 05:08:24 -0000 @@ -1998,7 +1998,7 @@ File Handling ***********************************************************************/ -static Lisp_Object x_find_image_file P_ ((Lisp_Object)); +Lisp_Object x_find_image_file P_ ((Lisp_Object)); static unsigned char *slurp_file P_ ((char *, int *)); @@ -2006,7 +2006,7 @@ x-bitmap-file-path. Value is the full name of the file found, or nil if not found. */ -static Lisp_Object +Lisp_Object x_find_image_file (file) Lisp_Object file; { Index: src/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v retrieving revision 1.3580 diff -u -r1.3580 ChangeLog --- src/ChangeLog 11 Mar 2004 22:48:33 -0000 1.3580 +++ src/ChangeLog 12 Mar 2004 05:08:26 -0000 @@ -1,3 +1,9 @@ +2004-03-12 Masatake YAMATO + + * xfns.c(x_find_image_file): Add extern. + + * image.c(x_find_image_file): Make it global. + 2004-03-12 Kim F. Storm Fix image support on MAC. From YAMAMOTO Mitsuharu.