diff options
| author | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
| commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
| tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /src/print.c | |
| parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.zip | |
Merge from trunk
Diffstat (limited to 'src/print.c')
| -rw-r--r-- | src/print.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/print.c b/src/print.c index d4cbc2ac24a..0f8718877d2 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -1401,7 +1401,7 @@ static void print_check_string_charset_prop (INTERVAL interval, Lisp_Object stri | |||
| 1401 | #define PRINT_STRING_NON_CHARSET_FOUND 1 | 1401 | #define PRINT_STRING_NON_CHARSET_FOUND 1 |
| 1402 | #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 | 1402 | #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 |
| 1403 | 1403 | ||
| 1404 | /* Bitwize or of the abobe macros. */ | 1404 | /* Bitwise or of the above macros. */ |
| 1405 | static int print_check_string_result; | 1405 | static int print_check_string_result; |
| 1406 | 1406 | ||
| 1407 | static void | 1407 | static void |