Mercurial > emacs

comparison src/ChangeLog @ 110931:2316b868d5be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 12 Oct 2010 01:57:49 +0200
parents 1ccdcdef34fc b6cf32bb07a1
children 815b78211543
comparison
equal deleted inserted replaced
110918:236342431786 110931:2316b868d5be
1 2010-10-12 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (Qleft): Declare.
4 (ns_right_alternate_modifier): New variable
5 (NSRightAlternateKeyMask): New define.
6 (EV_MODIFIERS): Parse NSRightAlternateKeyMask if
7 ns_right_alternate_modifier isn't Qleft.
8 (keyDown): If ns_right_alternate_modifier isn't Qleft, use it
9 as emacs modifier for NSRightAlternateKeyMask.
10 (syms_of_nsterm): DEFVAR_LISP ns-right-alternate-modifier.
11
1 2010-10-10 Lars Magne Ingebrigtsen <larsi@gnus.org> 12 2010-10-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 13
3 * gnutls.c (emacs_gnutls_write): If we're trying to write before 14 * gnutls.c (emacs_gnutls_write): If we're trying to write before
4 gnutls is ready, return EAGAIN as the errno. 15 gnutls is ready, return EAGAIN as the errno.
5 16