From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: fgallina@gnu.org (=?utf-8?Q?Fabi=C3=A1n?= Ezequiel Gallina)
Newsgroups: gmane.emacs.devel
Subject: Merge from emacs-24 up to a5f38fa
Date: Sat, 27 Dec 2014 15:52:20 -0300
Message-ID: <87fvc1ylgb.fsf@gnu.org>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Trace: ger.gmane.org 1419706363 18972 80.91.229.3 (27 Dec 2014 18:52:43 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Sat, 27 Dec 2014 18:52:43 +0000 (UTC)
Cc: Glenn Morris <rgm@gnu.org>, Eli Zaretskii <eliz@gnu.org>,
	=?utf-8?Q?Jan_Dj=C3=A4rv?= <jan.h.d@swipnet.se>
To: emacs-devel <emacs-devel@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 27 19:52:36 2014
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Y4wTb-0002Sd-Ss
	for ged-emacs-devel@m.gmane.org; Sat, 27 Dec 2014 19:52:36 +0100
Original-Received: from localhost ([::1]:56689 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Y4wTb-00073l-Ff
	for ged-emacs-devel@m.gmane.org; Sat, 27 Dec 2014 13:52:35 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37938)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fgallina@gnu.org>) id 1Y4wTY-00072o-34
	for emacs-devel@gnu.org; Sat, 27 Dec 2014 13:52:32 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <fgallina@gnu.org>) id 1Y4wTT-0000Ku-B8
	for emacs-devel@gnu.org; Sat, 27 Dec 2014 13:52:32 -0500
Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:32827)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fgallina@gnu.org>) id 1Y4wTT-0000Kq-7i
	for emacs-devel@gnu.org; Sat, 27 Dec 2014 13:52:27 -0500
Original-Received: from [190.246.172.180] (port=41350 helo=localhost)
	by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <fgallina@gnu.org>)
	id 1Y4wTP-0004Y5-4u; Sat, 27 Dec 2014 13:52:23 -0500
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2001:4830:134:3::e
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:180717
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/180717>

So this is my first incursion merging the `emacs-24` branch into
`master`.  I have used `gitmerge.el` and everything looks well from
here; this the complete list of conflicts in case you want to take a
look:

    ChangeLog
    doc/emacs/ChangeLog
    doc/lispref/ChangeLog
    doc/lispref/control.texi
    doc/lispref/functions.texi
    etc/ChangeLog
    lisp/ChangeLog
    src/ChangeLog
    src/xterm.c
    test/ChangeLog

I think I managed to do the right thing handling them, but I'd
appreciate if you could take a second look.  Specially to
`doc/lispref/control.texi`, `doc/lispref/functions.texi`, and
`src/xterm.c`.



Thanks,
Fabi=C3=A1n