diff options
| author | Paul Eggert | 2011-06-12 17:36:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-12 17:36:44 -0700 |
| commit | c5958d4cf336fdbc30364e7d701d6565acaf4002 (patch) | |
| tree | 06e4cdd7a45d26c6b09a5aeff282cc1eacca67c7 /src | |
| parent | 13bdea59234b227bf8499a64352da3e5fd9e8c7b (diff) | |
| download | emacs-c5958d4cf336fdbc30364e7d701d6565acaf4002.tar.gz emacs-c5958d4cf336fdbc30364e7d701d6565acaf4002.zip | |
* character.c (char_string): Remove unnecessary casts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/character.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f8a4abd9cce..01068fea0be 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * character.c (char_string): Remove unnecessary casts. | ||
| 3 | 4 | ||
| 4 | Make sure a 64-bit char is never passed to CHAR_STRING. | 5 | Make sure a 64-bit char is never passed to CHAR_STRING. |
| 5 | Otherwise, CHAR_STRING would do the wrong thing on a 64-bit platform, | 6 | Otherwise, CHAR_STRING would do the wrong thing on a 64-bit platform, |
diff --git a/src/character.c b/src/character.c index aae3e3c0de6..70c0637804b 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -123,7 +123,7 @@ char_string (unsigned int c, unsigned char *p) | |||
| 123 | 123 | ||
| 124 | if (c & CHAR_MODIFIER_MASK) | 124 | if (c & CHAR_MODIFIER_MASK) |
| 125 | { | 125 | { |
| 126 | c = (unsigned) char_resolve_modifier_mask ((int) c); | 126 | c = char_resolve_modifier_mask (c); |
| 127 | /* If C still has any modifier bits, just ignore it. */ | 127 | /* If C still has any modifier bits, just ignore it. */ |
| 128 | c &= ~CHAR_MODIFIER_MASK; | 128 | c &= ~CHAR_MODIFIER_MASK; |
| 129 | } | 129 | } |