aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorChong Yidong2010-07-10 15:01:01 -0400
committerChong Yidong2010-07-10 15:01:01 -0400
commit7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0 (patch)
tree301c219611060db34a983f5b7dba58cf1fa93b69 /src/alloc.c
parent481044622937b001ee07a6f8c3f81c1e73ef9eaf (diff)
parent2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (diff)
downloademacs-7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0.tar.gz
emacs-7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c2
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