From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Peter Dyballa Newsgroups: gmane.emacs.bugs Subject: bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o Date: Mon, 16 Aug 2010 16:33:09 +0200 Message-ID: <96AA5306-E58D-4E91-929D-BFE9CCD63928@Freenet.DE> References: <3089FF44-8D9B-47FD-8424-BB07924284B7@Freenet.DE> <4C68DCC2.8000507@swipnet.se> <27B5F678-2614-431D-A860-BA12732260DE@Freenet.DE> <4C68F25F.1090807@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=WINDOWS-1252; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1281969556 10969 80.91.229.12 (16 Aug 2010 14:39:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 16 Aug 2010 14:39:16 +0000 (UTC) Cc: 6863@debbugs.gnu.org To: Jan =?UTF-8?Q?Dj=C3=A4rv?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Aug 16 16:39:13 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1Ol0qF-0006WR-AI for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Aug 2010 16:39:12 +0200 Original-Received: from localhost ([127.0.0.1]:59194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ol0qD-0002k4-O9 for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Aug 2010 10:39:09 -0400 Original-Received: from [140.186.70.92] (port=56283 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ol0py-0002iD-4s for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 10:38:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ol0pt-0006vs-8U for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 10:38:53 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60681) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol0pt-0006vj-5q for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 10:38:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Ol0kH-0000y2-M8; Mon, 16 Aug 2010 10:33:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Peter Dyballa Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Aug 2010 14:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6863 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6863-submit@debbugs.gnu.org id=B6863.12819691373552 (code B ref 6863); Mon, 16 Aug 2010 14:33:01 +0000 Original-Received: (at 6863) by debbugs.gnu.org; 16 Aug 2010 14:32:17 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol0jZ-0000vE-B7 for submit@debbugs.gnu.org; Mon, 16 Aug 2010 10:32:17 -0400 Original-Received: from mout9.freenet.de ([195.4.92.99]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol0jW-0000uk-JQ for 6863@debbugs.gnu.org; Mon, 16 Aug 2010 10:32:15 -0400 Original-Received: from [195.4.92.27] (helo=17.mx.freenet.de) by mout9.freenet.de with esmtpa (ID peter_dyballa@freenet.de) (port 25) (Exim 4.72 #3) id 1Ol0kT-0000BM-CB; Mon, 16 Aug 2010 16:33:13 +0200 Original-Received: from p5b23f51c.dip.t-dialin.net ([91.35.245.28]:63269 helo=[192.168.1.2]) by 17.mx.freenet.de with esmtpsa (ID peter_dyballa@freenet.de) (TLSv1:AES128-SHA:128) (port 587) (Exim 4.72 #3) id 1Ol0kS-000799-7m; Mon, 16 Aug 2010 16:33:13 +0200 In-Reply-To: <4C68F25F.1090807@swipnet.se> X-Mailer: Apple Mail (2.936) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 16 Aug 2010 10:33:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:39538 Archived-At: Am 16.08.2010 um 10:10 schrieb Jan Dj=E4rv: > I checked in a fix. Sorry, I was too fast in reporting! >>>>>>> There are unresolved conflicts in this file <<<<<<< One is: <<<<<<< TREE Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME; =3D=3D=3D=3D=3D=3D=3D Lisp_Object QSECONDARY, QTEXT, QFILE_NAME; >>>>>>> MERGE-SOURCE Is the manual action to remove the "QCLIPBOARD, QPRIMARY, " text? The =20= "first line" should substitute the "second one"? The second case is: <<<<<<< TREE QCLIPBOARD =3D intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); QPRIMARY =3D intern ("PRIMARY"); staticpro (&QPRIMARY); =3D=3D=3D=3D=3D=3D=3D >>>>>>> MERGE-SOURCE QSECONDARY =3D intern ("SECONDARY"); staticpro (&QSECONDARY); QTEXT =3D intern ("TEXT"); staticpro (&QTEXT); QFILE_NAME =3D intern ("FILE_NAME"); staticpro (&QFILE_NAME); The manual action is to remove two lines? Or adding them? -- Greetings Pete There's no place like ~ =96 (UNIX Guru)