From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: bug#7859: syncing Emacs from sources maintained elsewhere Date: Wed, 19 Jan 2011 15:49:20 -0800 Organization: UCLA Computer Science Department Message-ID: <4D377880.2080307@cs.ucla.edu> References: <4D2BA939.5090903@cs.ucla.edu> <4D34A88F.4080400@cs.ucla.edu> <4D35D842.5030003@cs.ucla.edu> <4D367F0B.3040808@cs.ucla.edu> <4D368D16.7020702@swipnet.se> <25y66hjmiu.fsf@fencepost.gnu.org> <4D36BF43.3050007@cs.ucla.edu> <4D370928.1040601@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1295480977 31499 80.91.229.12 (19 Jan 2011 23:49:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 19 Jan 2011 23:49:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?B?SmFuIERqw6Rydg==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 20 00:49:30 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PfhmJ-0002kx-Vm for ged-emacs-devel@m.gmane.org; Thu, 20 Jan 2011 00:49:28 +0100 Original-Received: from localhost ([127.0.0.1]:36450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PfhmJ-0006Y3-Gx for ged-emacs-devel@m.gmane.org; Wed, 19 Jan 2011 18:49:27 -0500 Original-Received: from [140.186.70.92] (port=60970 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PfhmF-0006Xn-2p for emacs-devel@gnu.org; Wed, 19 Jan 2011 18:49:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PfhmD-0005Wo-UR for emacs-devel@gnu.org; Wed, 19 Jan 2011 18:49:22 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:50182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PfhmD-0005Wa-Jn for emacs-devel@gnu.org; Wed, 19 Jan 2011 18:49:21 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id EB00239E80DC; Wed, 19 Jan 2011 15:49:20 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IRF-3EtvhQg5; Wed, 19 Jan 2011 15:49:20 -0800 (PST) Original-Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 4565939E80DB; Wed, 19 Jan 2011 15:49:20 -0800 (PST) User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 In-Reply-To: <4D370928.1040601@swipnet.se> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:134788 Archived-At: One minor thing: the recent change to get trunk builds working on MacOS X unfortunately broke builds under GNU/Linux with X11. I installed this further patch; hope it's OK. Fix X11 compilation failure. * globals.h (struct emacs_globals): Document f_Vselection_alist. * xselect.c (Vselection_alist): Remove declaration, moving its documentation to globals.h. This fixes a compilation failure induced by the earlier change to globals.h today. === modified file 'src/globals.h' --- src/globals.h 2011-01-19 22:11:33 +0000 +++ src/globals.h 2011-01-19 23:28:30 +0000 @@ -1751,6 +1751,19 @@ Lisp_Object f_Vns_sent_selection_hooks; Lisp_Object f_Vns_lost_selection_hooks; + + /* This is an association list whose elements are of the form + ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) + SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. + SELECTION-VALUE is the value that emacs owns for that selection. + It may be any kind of Lisp object. + SELECTION-TIMESTAMP is the time at which emacs began owning this + selection, as a cons of two 16-bit numbers (making a 32 bit time.) + FRAME is the frame for which we made the selection. + If there is an entry in this alist, then it can be assumed that Emacs owns + that selection. + The only (eq) parts of this list that are visible from Lisp are the + selection-values. */ Lisp_Object f_Vselection_alist; Lisp_Object f_Vns_reg_to_script; === modified file 'src/xselect.c' --- src/xselect.c 2011-01-18 20:45:37 +0000 +++ src/xselect.c 2011-01-19 23:28:37 +0000 @@ -127,20 +127,6 @@ /* Defined in keyboard.c. */ extern unsigned long last_event_timestamp; -/* This is an association list whose elements are of the form - ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) - SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. - SELECTION-VALUE is the value that emacs owns for that selection. - It may be any kind of Lisp object. - SELECTION-TIMESTAMP is the time at which emacs began owning this selection, - as a cons of two 16-bit numbers (making a 32 bit time.) - FRAME is the frame for which we made the selection. - If there is an entry in this alist, then it can be assumed that Emacs owns - that selection. - The only (eq) parts of this list that are visible from Lisp are the - selection-values. */ -static Lisp_Object Vselection_alist; - /* Define a queue to save up SELECTION_REQUEST_EVENT events for later