unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Rasmus <rasmus@gmx.us>
To: emacs-devel@gnu.org
Cc: kyle@kyleam.com
Subject: Re: [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10
Date: Tue, 29 Aug 2017 16:54:10 +0200	[thread overview]
Message-ID: <8760d6l90t.fsf@gmx.us> (raw)
In-Reply-To: 87fucaeap8.fsf@kyleam.com

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




      reply	other threads:[~2017-08-29 14:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-29 13:59 [Emacs-diffs] master 3ad8ca4: Update Org to v9.0.10 Kyle Meyer
2017-08-29 14:54 ` Rasmus [this message]

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8760d6l90t.fsf@gmx.us \
    --to=rasmus@gmx.us \
    --cc=emacs-devel@gnu.org \
    --cc=kyle@kyleam.com \
    /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 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).