unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10
@ 2017-08-29 13:59 Kyle Meyer
  2017-08-29 14:54 ` Rasmus
  0 siblings, 1 reply; 2+ messages in thread
From: Kyle Meyer @ 2017-08-29 13:59 UTC (permalink / raw)
  To: emacs-devel

> diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
> index 0170a18..1c4f450 100644
> --- a/etc/refcards/orgcard.tex
> +++ b/etc/refcards/orgcard.tex
> @@ -1,7 +1,7 @@
>  % Reference Card for Org Mode
> -\def\orgversionnumber{9.0.9}
> +\def\orgversionnumber{9.0.10}
>  \def\versionyear{2017}          % latest update
> -\input emacsver.tex
> +\def\year{2017}                 % latest copyright year

Sorry, I unintentionally dropped "\input emacsver.tex".  We have a
branch in the Org repo that includes Emacs-specific adjustments like
this so that they don't get dropped, but I mishandled a merge conflict
and failed to catch my mistake when I reviewed the sync changes.

I've fixed this in the Org repo and notified Rasmus, so this should be
fixed in the Emacs repo soon.

Sorry again.

-- 
Kyle



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10
  2017-08-29 13:59 [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10 Kyle Meyer
@ 2017-08-29 14:54 ` Rasmus
  0 siblings, 0 replies; 2+ messages in thread
From: Rasmus @ 2017-08-29 14:54 UTC (permalink / raw)
  To: emacs-devel; +Cc: kyle

Kyle Meyer <kyle@kyleam.com> writes:

>> diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
>> index 0170a18..1c4f450 100644
>
>> --- a/etc/refcards/orgcard.tex
>> +++ b/etc/refcards/orgcard.tex
>> @@ -1,7 +1,7 @@
>>  % Reference Card for Org Mode
>> -\def\orgversionnumber{9.0.9}
>> +\def\orgversionnumber{9.0.10}
>>  \def\versionyear{2017}          % latest update
>> -\input emacsver.tex
>> +\def\year{2017}                 % latest copyright year
>
> Sorry, I unintentionally dropped "\input emacsver.tex".  We have a
> branch in the Org repo that includes Emacs-specific adjustments like
> this so that they don't get dropped, but I mishandled a merge conflict
> and failed to catch my mistake when I reviewed the sync changes.
>
> I've fixed this in the Org repo and notified Rasmus, so this should be
> fixed in the Emacs repo soon.

I’ve pushed that change.  Thanks for noticing!

Rasmus

-- 
A clever person solves a problem. A wise person avoids it




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-08-29 14:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-29 13:59 [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10 Kyle Meyer
2017-08-29 14:54 ` Rasmus

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).