diff options
| author | Juanma Barranquero | 2010-10-12 01:57:49 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-12 01:57:49 +0200 |
| commit | 4c14013dbec3a2f130a38e61e885f1e8cc6c325b (patch) | |
| tree | b74121c8de587c217f0d146752e8893d0874aae7 /src/ChangeLog | |
| parent | f0b7f5a884806112b6a938b9c31607ea005431d3 (diff) | |
| parent | a2e35ef5d52031e0fa184d1863fe7cb7043ef637 (diff) | |
| download | emacs-4c14013dbec3a2f130a38e61e885f1e8cc6c325b.tar.gz emacs-4c14013dbec3a2f130a38e61e885f1e8cc6c325b.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1c75c758498..da1ce968b62 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 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 |