diff options
| author | Paul Eggert | 2011-04-01 13:19:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-01 13:19:36 -0700 |
| commit | 6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893 (patch) | |
| tree | 1b704b34e4f2f2bd4a6f13e4d1dd058c61c8a6ff /src/fns.c | |
| parent | 0b918413f336dbfa9a9c266ae857bce103556c57 (diff) | |
| parent | 034086489cff2a23cb4d9f8c536e18456be617ef (diff) | |
| download | emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.tar.gz emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.zip | |
Merge from mainline.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -510,7 +510,7 @@ concat (size_t nargs, Lisp_Object *args, | |||
| 510 | Lisp_Object ch; | 510 | Lisp_Object ch; |
| 511 | EMACS_INT this_len_byte; | 511 | EMACS_INT this_len_byte; |
| 512 | 512 | ||
| 513 | if (VECTORP (this)) | 513 | if (VECTORP (this) || COMPILEDP (this)) |
| 514 | for (i = 0; i < len; i++) | 514 | for (i = 0; i < len; i++) |
| 515 | { | 515 | { |
| 516 | ch = AREF (this, i); | 516 | ch = AREF (this, i); |
| @@ -2297,7 +2297,7 @@ mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq) | |||
| 2297 | 1) lists are not relocated and 2) the list is marked via `seq' so will not | 2297 | 1) lists are not relocated and 2) the list is marked via `seq' so will not |
| 2298 | be freed */ | 2298 | be freed */ |
| 2299 | 2299 | ||
| 2300 | if (VECTORP (seq)) | 2300 | if (VECTORP (seq) || COMPILEDP (seq)) |
| 2301 | { | 2301 | { |
| 2302 | for (i = 0; i < leni; i++) | 2302 | for (i = 0; i < leni; i++) |
| 2303 | { | 2303 | { |