aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2005-11-16 18:39:00 +0000
committerStefan Monnier2005-11-16 18:39:00 +0000
commitc01f0ed30392fb924078c0bb01319493a813a641 (patch)
tree50a8ea73aab8ff2ee56d5713f7985296860138dc /src
parent16b4c38b1dd7f65d0d5f54863bf950810a419708 (diff)
downloademacs-c01f0ed30392fb924078c0bb01319493a813a641.tar.gz
emacs-c01f0ed30392fb924078c0bb01319493a813a641.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 513d9d0ff92..900db33db3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,13 @@
12005-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * lread.c (readevalloop): Add missing GCPROs.
4
12005-11-16 Chong Yidong <cyd@stupidchicken.com> 52005-11-16 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * xfns.c (xg_set_icon_from_xpm_data): New function. 7 * xfns.c (xg_set_icon_from_xpm_data): New function.
4 8
5 * gnu.h (gnu_xpm_bits): Renamed from gnu_bits. 9 * gnu.h (gnu_xpm_bits): Rename from gnu_bits.
6 (gnu_xbm_bits): Renamed from gnu_bits (xbm version). 10 (gnu_xbm_bits): Rename from gnu_bits (xbm version).
7 11
8 * xterm.c (x_bitmap_icon): Use the xpm if available. 12 * xterm.c (x_bitmap_icon): Use the xpm if available.
9 13
@@ -71,12 +75,11 @@
71 Vmac_option_modifier / mac-option-modifier, 75 Vmac_option_modifier / mac-option-modifier,
72 Vmac_command_modifier / mac-command-modifier. 76 Vmac_command_modifier / mac-command-modifier.
73 (mac_to_emacs_modifiers): Use the new style modifier 77 (mac_to_emacs_modifiers): Use the new style modifier
74 variables. Return UInt32 (modifiers are longs now.) 78 variables. Return UInt32 (modifiers are longs now.)
75 (backtranslate_modified_keycode): new function (refactoring) 79 (backtranslate_modified_keycode): New function (refactoring).
76 (XTread_socket): use new modifier variables and refactored 80 (XTread_socket): Use new modifier variables and refactored function.
77 function 81 (mac_determine_quit_char_modifiers): Remove macMetaKey (there is
78 (mac_determine_quit_char_modifiers): remove macMetaKey (there is 82 no dedicated meta key. Not in use anyway.)
79 no dedicated meta key. Not in use anyway.)
80 (convert_fn_keycode): Map Fn-keys to their original keycode 83 (convert_fn_keycode): Map Fn-keys to their original keycode
81 using a table (english keyboard only). 84 using a table (english keyboard only).
82 85