From: "Jan D." <jan.h.d@swipnet.se>
To: Adrian Robert <adrian.b.robert@gmail.com>
Cc: "emacs-devel@gnu.org Development" <emacs-devel@gnu.org>
Subject: Re: NS compile error after trunk merge r118324
Date: Sun, 9 Nov 2014 11:36:14 +0100 [thread overview]
Message-ID: <E3BCA9F8-C9B6-44D2-906E-84CB7890DA77@swipnet.se> (raw)
In-Reply-To: <39AB655E-CA13-48E3-8E5C-4B322DCB6F3C@gmail.com>
Hi.
The bzr merge did some strange things, fixed now.
Jan D.
> 9 nov 2014 kl. 07:12 skrev Adrian Robert <adrian.b.robert@gmail.com>:
>
> Hi,
>
> I get a compile error from trunk
>
>> nsterm.m:3922:11: error: use of undeclared identifier 'update_p'
>> update_p = YES;
>> ^
>> nsterm.m:3926:7: error: use of undeclared identifier 'update_p'
>> if (update_p)
>>
>
>
> Adding a definition at nsterm.m: 3855:
>
> BOOL update_p = YES;
>
> “fixes" it, but I don’t think it is right since it looks from the changes like ns_set_vertical_scrollbar() and ns_set_horizontal_scrollbar() were seen as one function. I’m not sure if this error was in the original emacs-24 branch or came from the merge to trunk. (Was the ‘horizontal’ method created in trunk? If so there may be a number of other divergences to look at.)
>
> http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00117.html
> http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00120.html
>
> thanks,
> Adrian
next prev parent reply other threads:[~2014-11-09 10:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-09 6:12 NS compile error after trunk merge r118324 Adrian Robert
2014-11-09 10:36 ` Jan D. [this message]
2014-11-09 19:40 ` Glenn Morris
2014-11-09 21:25 ` Jan D.
2014-11-09 22:57 ` Glenn Morris
2014-11-10 6:17 ` Jan Djärv
2014-11-10 7:40 ` Glenn Morris
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=E3BCA9F8-C9B6-44D2-906E-84CB7890DA77@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=adrian.b.robert@gmail.com \
--cc=emacs-devel@gnu.org \
/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.