From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.emacs.devel Subject: Re: Building emacs with and without X -- packaging question. Date: Thu, 19 Sep 2002 23:18:20 -0500 Sender: emacs-devel-admin@gnu.org Message-ID: <87r8fp8far.fsf@raven.i.defaultvalue.org> References: <87adppy67u.fsf@raven.i.defaultvalue.org> <3405-Fri21Jun2002183331+0300-eliz@is.elta.co.il> <871yaz2tf8.fsf@raven.i.defaultvalue.org> <87k7nbacm7.fsf@raven.i.defaultvalue.org> <200208020611.g726BkU01069@aztec.santafe.edu> <877kj96z74.fsf@raven.i.defaultvalue.org> <200208040252.g742qam02724@aztec.santafe.edu> <873cscw9uq.fsf@raven.i.defaultvalue.org> <87lm60iqd7.fsf@raven.i.defaultvalue.org> NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1032495588 11935 127.0.0.1 (20 Sep 2002 04:19:48 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 20 Sep 2002 04:19:48 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 17sFGd-00036M-00 for ; Fri, 20 Sep 2002 06:19:47 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 17sFvj-0000TC-00 for ; Fri, 20 Sep 2002 07:02:16 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10) id 17sFGx-0000Y9-00; Fri, 20 Sep 2002 00:20:07 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10) id 17sFFI-0000WG-00 for emacs-devel@gnu.org; Fri, 20 Sep 2002 00:18:24 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10) id 17sFFG-0000W4-00 for emacs-devel@gnu.org; Fri, 20 Sep 2002 00:18:23 -0400 Original-Received: from n66644228.ipcdsl.net ([66.64.4.228] helo=defaultvalue.org) by monty-python.gnu.org with esmtp (Exim 4.10) id 17sFFF-0000Vv-00 for emacs-devel@gnu.org; Fri, 20 Sep 2002 00:18:21 -0400 Original-Received: from raven.i.defaultvalue.org (raven.i.defaultvalue.org [192.168.1.7]) by defaultvalue.org (Postfix) with ESMTP id EDDA58D3 for ; Thu, 19 Sep 2002 23:18:20 -0500 (CDT) Original-Received: by raven.i.defaultvalue.org (Postfix, from userid 1000) id 8A7ED2DEF; Thu, 19 Sep 2002 23:18:20 -0500 (CDT) Original-To: emacs-devel@gnu.org In-Reply-To: <87lm60iqd7.fsf@raven.i.defaultvalue.org> (Rob Browning's message of "Tue, 17 Sep 2002 10:32:20 -0500") Original-Lines: 42 User-Agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.2 (i386-pc-linux-gnu) Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:8038 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:8038 Rob Browning writes: > 2) to fix the problem with gnus-art.el's > gnus-article-x-face-command, I copy-pasted the code that > initializes gnus-article-compface-xbm from gnus-ems.el. Can > anyone see a problem with that as a short-term solution? (The > diff is below.) I've modified the diff a little to try and make it even more defensive. Now gnus-article-x-face-command's defcustom uses gnus-article-compface-xbm's definition if bound, and the copy/pasted initialization from gnus-article-compface-xbm's defvar in gnus-ems.el otherwise. This seems unlikely to cause serious problems, and fixes the cus-dep failure, so unless there are objections, I'm going use this patch in the forthcoming debian emacs21 package. Here's the diff: diff -ru 0/lisp/gnus/gnus-art.el 1/lisp/gnus/gnus-art.el --- 0/lisp/gnus/gnus-art.el 2002-03-22 11:03:55.000000000 -0600 +++ 1/lisp/gnus/gnus-art.el 2002-09-15 16:42:46.000000000 -0500 @@ -207,7 +207,10 @@ (if (and (fboundp 'image-type-available-p) (image-type-available-p 'xbm)) 'gnus-article-display-xface - (if gnus-article-compface-xbm + (if (or (and (boundp 'gnus-article-compface-xbm) + gnus-article-compface-xbm) + (eq 0 (string-match "#define" + (shell-command-to-string "uncompface -X")))) "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -" "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \ display -")) -- Rob Browning rlb @defaultvalue.org, @linuxdevel.com, and @debian.org Previously @cs.utexas.edu GPG=1C58 8B2C FB5E 3F64 EA5C 64AE 78FE E5FE F0CB A0AD