diff options
| author | Chong Yidong | 2010-07-10 14:52:53 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-07-10 14:52:53 -0400 |
| commit | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch) | |
| tree | 4837c369ac576fbfd063b1ff046a3daca372f082 /src/alloc.c | |
| parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
| parent | 7c33a0572280bdcf0583c5625cfda32f63fad56d (diff) | |
| download | emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 2a15fd0d63d..36b197e5eac 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -3030,7 +3030,7 @@ usage: (make-byte-code ARGLIST BYTE-CODE CONSTANTS DEPTH &optional DOCSTRING INT | |||
| 3030 | else | 3030 | else |
| 3031 | val = Fmake_vector (len, Qnil); | 3031 | val = Fmake_vector (len, Qnil); |
| 3032 | 3032 | ||
| 3033 | if (STRINGP (args[1]) && STRING_MULTIBYTE (args[1])) | 3033 | if (nargs > 1 && STRINGP (args[1]) && STRING_MULTIBYTE (args[1])) |
| 3034 | /* BYTECODE-STRING must have been produced by Emacs 20.2 or the | 3034 | /* BYTECODE-STRING must have been produced by Emacs 20.2 or the |
| 3035 | earlier because they produced a raw 8-bit string for byte-code | 3035 | earlier because they produced a raw 8-bit string for byte-code |
| 3036 | and now such a byte-code string is loaded as multibyte while | 3036 | and now such a byte-code string is loaded as multibyte while |