diff options
| author | Kenichi Handa | 2010-09-16 11:11:13 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-09-16 11:11:13 +0900 |
| commit | 38d50547c2a8195bed0aaeafbbc4c0f277d4e416 (patch) | |
| tree | 388416c9f2cc4746d0d2d9e525a50a6c2f00f3d4 /src/editfns.c | |
| parent | fa3f60399014127e711f3f438004950cba0bddb9 (diff) | |
| parent | 6139f995addcb8fce63deb30c7ed0e6f2b618b02 (diff) | |
| download | emacs-38d50547c2a8195bed0aaeafbbc4c0f277d4e416.tar.gz emacs-38d50547c2a8195bed0aaeafbbc4c0f277d4e416.zip | |
merge trunk
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c index 1bd6682c3b6..add2f37109b 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3517,7 +3517,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3517 | int multibyte = 0; | 3517 | int multibyte = 0; |
| 3518 | /* When we make a multibyte string, we must pay attention to the | 3518 | /* When we make a multibyte string, we must pay attention to the |
| 3519 | byte combining problem, i.e., a byte may be combined with a | 3519 | byte combining problem, i.e., a byte may be combined with a |
| 3520 | multibyte charcter of the previous string. This flag tells if we | 3520 | multibyte character of the previous string. This flag tells if we |
| 3521 | must consider such a situation or not. */ | 3521 | must consider such a situation or not. */ |
| 3522 | int maybe_combine_byte; | 3522 | int maybe_combine_byte; |
| 3523 | unsigned char *this_format; | 3523 | unsigned char *this_format; |