unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Miles Bader <miles@gnu.org>
Cc: jasonr@gnu.org, mituharu@math.s.chiba-u.ac.jp, emacs-devel@gnu.org
Subject: Re: rel-22 to trunk merge failures  2008-02-24
Date: Sun, 24 Feb 2008 10:48:44 -0500	[thread overview]
Message-ID: <jwvy79a1hku.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <61y79aveo0.fsf@fencepost.gnu.org> (Miles Bader's message of "Sun, 24 Feb 2008 05:20:47 -0500")

> [Remember, all changes below are _not_ in the trunk, and will not be
>  merged later, so somebody needs to either make the appropriate change to
>  the trunk (including the ChangeLog entry), or confirm that it isn't
>  needed (e.g., the trunk already contains an equivalent change.
>  Thanks,   -Miles]


> M  src/w32term.c
> M  src/macterm.c
> M  lisp/diff-mode.el

I'll take care of the diff-mode.el changes, thanks Miles,


        Stefan




  reply	other threads:[~2008-02-24 15:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-24 10:20 rel-22 to trunk merge failures 2008-02-24 Miles Bader
2008-02-24 15:48 ` Stefan Monnier [this message]
2008-02-24 15:49 ` Jason Rumney
2008-02-24 19:07   ` Miles Bader

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=jwvy79a1hku.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=emacs-devel@gnu.org \
    --cc=jasonr@gnu.org \
    --cc=miles@gnu.org \
    --cc=mituharu@math.s.chiba-u.ac.jp \
    /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).