aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2006-03-29 09:50:10 +0000
committerJuanma Barranquero2006-03-29 09:50:10 +0000
commit267ee78f8433afef256b77c91096aef41183eebb (patch)
treef40a0d9679ecf87b2ecbc9137a7576190d0c52ba /src
parent9c8c4d5b9a0b5a1992f4d6b18f3771a363194e28 (diff)
downloademacs-267ee78f8433afef256b77c91096aef41183eebb.tar.gz
emacs-267ee78f8433afef256b77c91096aef41183eebb.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cce64d4572d..d2ed5ea7e7d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-03-29 Juanma Barranquero <lekktu@gmail.com>
2
3 * keyboard.c (process_tool_bar_item): Reorder dummy args.
4
12006-03-29 Stefan Monnier <monnier@iro.umontreal.ca> 52006-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keyboard.c (tool_bar_items): Use map_keymap. 7 * keyboard.c (tool_bar_items): Use map_keymap.
@@ -1830,7 +1834,7 @@
18302005-11-11 David Reitter <david.reitter@gmail.com> 18342005-11-11 David Reitter <david.reitter@gmail.com>
1831 1835
1832 * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey, 1836 * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
1833 macMetaKey, macAltKey. Introduce Qctrl, Qmeta, 1837 macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
1834 Vmac_control_modifier / mac-control-modifier, 1838 Vmac_control_modifier / mac-control-modifier,
1835 Vmac_option_modifier / mac-option-modifier, 1839 Vmac_option_modifier / mac-option-modifier,
1836 Vmac_command_modifier / mac-command-modifier. 1840 Vmac_command_modifier / mac-command-modifier.