* Repeated entries in src/Changelog.
@ 2010-04-19 17:17 Jan Djärv
2010-04-19 17:33 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Jan Djärv @ 2010-04-19 17:17 UTC (permalink / raw)
To: emacs-devel
Hi.
Why is this entry in src/Changelog:
2010-04-19 Jan Djärv <jan.h.d@swipnet.se>
* frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
FRAME_LINE_TO_PIXEL_Y.
* xterm.c (x_set_window_size_1): Don't add border_width/height to
pixelwidth/height.
?
That change was made in 2010-04-07 and the same entry appears on that date in
the same Changelog. Did a merge go bad?
Jan D.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Repeated entries in src/Changelog.
2010-04-19 17:17 Repeated entries in src/Changelog Jan Djärv
@ 2010-04-19 17:33 ` Eli Zaretskii
2010-04-20 6:19 ` Jan Djärv
0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2010-04-19 17:33 UTC (permalink / raw)
To: Jan Djärv; +Cc: emacs-devel
> Date: Mon, 19 Apr 2010 19:17:04 +0200
> From: Jan Djärv <jan.h.d@swipnet.se>
>
> Why is this entry in src/Changelog:
>
> 2010-04-19 Jan Djärv <jan.h.d@swipnet.se>
>
> * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
> FRAME_LINE_TO_PIXEL_Y.
>
> * xterm.c (x_set_window_size_1): Don't add border_width/height to
> pixelwidth/height.
>
> ?
>
> That change was made in 2010-04-07 and the same entry appears on that date in
> the same Changelog. Did a merge go bad?
Did you make the change both on the trunk and on emacs-23 branch?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Repeated entries in src/Changelog.
2010-04-19 17:33 ` Eli Zaretskii
@ 2010-04-20 6:19 ` Jan Djärv
0 siblings, 0 replies; 3+ messages in thread
From: Jan Djärv @ 2010-04-20 6:19 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
Eli Zaretskii skrev:
>> Date: Mon, 19 Apr 2010 19:17:04 +0200
>> From: Jan Djärv <jan.h.d@swipnet.se>
>>
>> Why is this entry in src/Changelog:
>>
>> 2010-04-19 Jan Djärv <jan.h.d@swipnet.se>
>>
>> * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
>> FRAME_LINE_TO_PIXEL_Y.
>>
>> * xterm.c (x_set_window_size_1): Don't add border_width/height to
>> pixelwidth/height.
>>
>> ?
>>
>> That change was made in 2010-04-07 and the same entry appears on that date in
>> the same Changelog. Did a merge go bad?
>
> Did you make the change both on the trunk and on emacs-23 branch?
>
Yes, thanks for clearing that up.
Jan D.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-20 6:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-19 17:17 Repeated entries in src/Changelog Jan Djärv
2010-04-19 17:33 ` Eli Zaretskii
2010-04-20 6:19 ` Jan Djärv
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).