From: "Jan Djärv" <jan.h.d@swipnet.se>
To: Peter Dyballa <Peter_Dyballa@Freenet.DE>
Cc: 6863@debbugs.gnu.org
Subject: bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
Date: Mon, 16 Aug 2010 17:09:49 +0200 [thread overview]
Message-ID: <4C6954BD.7090805@swipnet.se> (raw)
In-Reply-To: <96AA5306-E58D-4E91-929D-BFE9CCD63928@Freenet.DE>
2010-08-16 16:33, Peter Dyballa skrev:
>
> Am 16.08.2010 um 10:10 schrieb Jan Djärv:
>
>> 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;
> =======
> Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
> >>>>>>> MERGE-SOURCE
>
> Is the manual action to remove the "QCLIPBOARD, QPRIMARY, " text? The
> "first line" should substitute the "second one"?
It looks like you have applied a local patch. QPRIMARY shall be removed here.
If you wan't to keep your patch, keep the TREE line but remove QPRIMARY.
>
> The second case is:
>
> <<<<<<< TREE
> QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
> QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
> =======
> >>>>>>> MERGE-SOURCE
> QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);
> QTEXT = intern ("TEXT"); staticpro (&QTEXT);
> QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME);
>
> The manual action is to remove two lines? Or adding them?
>
Keep MERGE-SOURCE but add the QCLIPBOARD = ... line to it. It is from your
local patch.
Jan D.
next prev parent reply other threads:[~2010-08-16 15:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-15 20:20 bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o Peter Dyballa
2010-08-16 6:37 ` Jan Djärv
2010-08-16 7:39 ` Peter Dyballa
2010-08-16 8:10 ` Jan Djärv
2010-08-16 14:22 ` Peter Dyballa
2010-08-16 15:06 ` Jan Djärv
2010-08-16 14:33 ` Peter Dyballa
2010-08-16 15:09 ` Jan Djärv [this message]
2010-08-16 15:21 ` Peter Dyballa
2010-08-16 15:43 ` Peter Dyballa
2010-08-17 6:06 ` Jan Djärv
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C6954BD.7090805@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=6863@debbugs.gnu.org \
--cc=Peter_Dyballa@Freenet.DE \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.