aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2009-05-01 10:55:46 +0000
committerKenichi Handa2009-05-01 10:55:46 +0000
commit56f00ed262dda45c3a4d1d2f5accb750c56384f7 (patch)
tree2c380e5d817f7b3241295da6e3ed46d28a04c49f /src
parent35f5b1280e49d939945bace1e2772939c626a3a3 (diff)
downloademacs-56f00ed262dda45c3a4d1d2f5accb750c56384f7.tar.gz
emacs-56f00ed262dda45c3a4d1d2f5accb750c56384f7.zip
(load_charset): Reformat X==Y==Z to (X==Y)==Z.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/charset.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b83edc5108..16fcbb61aa0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-05-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
2
3 * charset.c (load_charset): Reformat X==Y==Z to (X==Y)==Z.
4
12009-04-30 David Reitter <david.reitter@gmail.com> 52009-04-30 David Reitter <david.reitter@gmail.com>
2 6
3 * nsterm.m (convert_ns_to_X_keysym): Define function keys f16 7 * nsterm.m (convert_ns_to_X_keysym): Define function keys f16
diff --git a/src/charset.c b/src/charset.c
index 15975a4ebf6..107647f3b23 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -646,7 +646,7 @@ load_charset (charset, control_flag)
646 if (inhibit_load_charset_map 646 if (inhibit_load_charset_map
647 && temp_charset_work 647 && temp_charset_work
648 && charset == temp_charset_work->current 648 && charset == temp_charset_work->current
649 && (control_flag == 2 == temp_charset_work->for_encoder)) 649 && ((control_flag == 2) == temp_charset_work->for_encoder))
650 return; 650 return;
651 651
652 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP) 652 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP)