aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.10
diff options
context:
space:
mode:
authorStefan Monnier2010-09-30 01:28:20 +0200
committerStefan Monnier2010-09-30 01:28:20 +0200
commita01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch)
tree94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /src/ChangeLog.10
parentcc390e46c7ba95b76ea133d98fd386214cd01709 (diff)
parent6b0f7311f16646e0de2045b2410e20921901c616 (diff)
downloademacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz
emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip
Merge from trunk
Diffstat (limited to 'src/ChangeLog.10')
-rw-r--r--src/ChangeLog.104
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index dd847f8a64e..393c7bdf8dc 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -6914,7 +6914,7 @@
6914 6914
6915 * search.c (search_buffer): Give up BM search on case-fold-search 6915 * search.c (search_buffer): Give up BM search on case-fold-search
6916 if one of a target character has a case-equivalence of different 6916 if one of a target character has a case-equivalence of different
6917 charset even if that target charcter is an ASCII. 6917 charset even if that target character is an ASCII.
6918 6918
6919 * casefiddle.c (casify_object): Fix for the case that case 6919 * casefiddle.c (casify_object): Fix for the case that case
6920 conversion change the byte length. 6920 conversion change the byte length.
@@ -21089,7 +21089,7 @@
21089 21089
21090 * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token) 21090 * w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token)
21091 (g_b_init_get_token_information, g_b_init_lookup_account_sid) 21091 (g_b_init_get_token_information, g_b_init_lookup_account_sid)
21092 (g_b_init_get_sid_identifier_authority ): Add several static 21092 (g_b_init_get_sid_identifier_authority): Add several static
21093 global variables. 21093 global variables.
21094 21094
21095 * w32.c (globals_of_w32): New function. Used to initialize those 21095 * w32.c (globals_of_w32): New function. Used to initialize those