From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?windows-1252?Q?Jan_Dj=E4rv?= Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] cairo 6445ee0: Merge branch 'master' into cairo Date: Sat, 23 May 2015 12:49:05 +0200 Message-ID: <55605B21.3060705@swipnet.se> References: <20150517144706.20561.12321@vcs.savannah.gnu.org> <555B4750.4030003@swipnet.se> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1432378184 17435 80.91.229.3 (23 May 2015 10:49:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 23 May 2015 10:49:44 +0000 (UTC) Cc: yashi@atmark-techno.com, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 23 12:49:28 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yw6zd-0006By-Bh for ged-emacs-devel@m.gmane.org; Sat, 23 May 2015 12:49:25 +0200 Original-Received: from localhost ([::1]:37294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yw6zc-0000rV-Eq for ged-emacs-devel@m.gmane.org; Sat, 23 May 2015 06:49:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yw6zV-0000rN-3s for emacs-devel@gnu.org; Sat, 23 May 2015 06:49:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yw6zQ-00032C-P1 for emacs-devel@gnu.org; Sat, 23 May 2015 06:49:17 -0400 Original-Received: from mailfe03.swip.net ([212.247.154.65]:54224 helo=swip.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yw6zQ-00031h-IQ for emacs-devel@gnu.org; Sat, 23 May 2015 06:49:12 -0400 X-T2-Spam-Status: No, hits=0.8 required=5.0 tests=BAYES_50 Original-Received: from hosdjarv.se (account mj138573@tele2.se [46.59.42.57] verified) by mailfe03.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 432075059; Sat, 23 May 2015 12:49:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.247.154.65 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186761 Archived-At: Den 2015-05-19 20:40, Stefan Monnier skrev: >> I can merge anytime. The only things I know about is lacking XBM support >> (not sure it is worth the effort), and the scrolling performance is not >> great. Possible there are some type of images that don't display right. >> But nothing major that prevents a merge. > > Then, if you think it's helpful to merge it, feel free to do so, > Merge done. You must explicitly request cairo with --with-cairo to configure. I think the value of cairo right now is an example for those trying to do something on Wayland or other systems outside of X. The only advantage of using cairo is printing, see x-export-frames and the three Gtk+ only functions x-page-setup-dialog, x-get-page-setup and x-print-frames-dialog Yasushi SHOJI said: > - the current tip of the branch doesn't compile w/ --with-cairo. it > seems like git merge machinery messed some lines up. this should > be easy to fix. > > - x_cr_destroy_surface() is not defined but used outside of USE_CAIRO > ifdef in src/xterm.c::handle_one_xevent(). this is also caused by > a merge commit fb77948660d9, which makes the tree unbuildable w/ > --without-cairo. I fixed these. Jan D.