aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2009-10-20 13:48:37 +0000
committerStefan Monnier2009-10-20 13:48:37 +0000
commite9c1637d1c85e421c4e0c96e690dea815838190c (patch)
tree6b715ee9bfdd5766a4ca5ba8aa154658fb105c8e /src
parentab04798fc8b755a12e99871fbb7cd72b8c3546dc (diff)
downloademacs-e9c1637d1c85e421c4e0c96e690dea815838190c.tar.gz
emacs-e9c1637d1c85e421c4e0c96e690dea815838190c.zip
(char_resolve_modifier_mask): Don't resolve meta to the
8th bit, since that only made since in the ASCII world (bug#4751).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/character.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 378a2db0653..2046c04e872 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * character.c (char_resolve_modifier_mask): Don't resolve meta to the
4 8th bit, since that only made since in the ASCII world (bug#4751).
5
12009-10-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62009-10-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * xterm.c (XTread_socket) [!USE_GTK && HAVE_X_I18N]: Don't quit 8 * xterm.c (XTread_socket) [!USE_GTK && HAVE_X_I18N]: Don't quit
diff --git a/src/character.c b/src/character.c
index bfe99766bc8..33d6969be89 100644
--- a/src/character.c
+++ b/src/character.c
@@ -127,11 +127,13 @@ char_resolve_modifier_mask (c)
127 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137) 127 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137)
128 c &= (037 | (~0177 & ~CHAR_CTL)); 128 c &= (037 | (~0177 & ~CHAR_CTL));
129 } 129 }
130#if 0 /* This is outside the scope of this function. (bug#4751) */
130 if (c & CHAR_META) 131 if (c & CHAR_META)
131 { 132 {
132 /* Move the meta bit to the right place for a string. */ 133 /* Move the meta bit to the right place for a string. */
133 c = (c & ~CHAR_META) | 0x80; 134 c = (c & ~CHAR_META) | 0x80;
134 } 135 }
136#endif
135 137
136 return c; 138 return c;
137} 139}