Mercurial > emacs

comparison src/lread.c @ 109302:60516122d066

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 10 Jul 2010 14:52:53 -0400
parents 8cfee7d2955f de58fd0baac5
children e856a274549b
comparison
equal deleted inserted replaced
109190:8afa85da3f2d 109302:60516122d066
2314 tmp = CDR_SAFE (tmp); 2314 tmp = CDR_SAFE (tmp);
2315 2315
2316 /* This is repetitive but fast and simple. */ 2316 /* This is repetitive but fast and simple. */
2317 params[param_count] = QCsize; 2317 params[param_count] = QCsize;
2318 params[param_count+1] = Fplist_get (tmp, Qsize); 2318 params[param_count+1] = Fplist_get (tmp, Qsize);
2319 if (!NILP (params[param_count+1])) 2319 if (!NILP (params[param_count + 1]))
2320 param_count+=2; 2320 param_count += 2;
2321 2321
2322 params[param_count] = QCtest; 2322 params[param_count] = QCtest;
2323 params[param_count+1] = Fplist_get (tmp, Qtest); 2323 params[param_count+1] = Fplist_get (tmp, Qtest);
2324 if (!NILP (params[param_count+1])) 2324 if (!NILP (params[param_count + 1]))
2325 param_count+=2; 2325 param_count += 2;
2326 2326
2327 params[param_count] = QCweakness; 2327 params[param_count] = QCweakness;
2328 params[param_count+1] = Fplist_get (tmp, Qweakness); 2328 params[param_count+1] = Fplist_get (tmp, Qweakness);
2329 if (!NILP (params[param_count+1])) 2329 if (!NILP (params[param_count + 1]))
2330 param_count+=2; 2330 param_count += 2;
2331 2331
2332 params[param_count] = QCrehash_size; 2332 params[param_count] = QCrehash_size;
2333 params[param_count+1] = Fplist_get (tmp, Qrehash_size); 2333 params[param_count+1] = Fplist_get (tmp, Qrehash_size);
2334 if (!NILP (params[param_count+1])) 2334 if (!NILP (params[param_count + 1]))
2335 param_count+=2; 2335 param_count += 2;
2336 2336
2337 params[param_count] = QCrehash_threshold; 2337 params[param_count] = QCrehash_threshold;
2338 params[param_count+1] = Fplist_get (tmp, Qrehash_threshold); 2338 params[param_count+1] = Fplist_get (tmp, Qrehash_threshold);
2339 if (!NILP (params[param_count+1])) 2339 if (!NILP (params[param_count + 1]))
2340 param_count+=2; 2340 param_count += 2;
2341 2341
2342 /* This is the hashtable data. */ 2342 /* This is the hashtable data. */
2343 data = Fplist_get (tmp, Qdata); 2343 data = Fplist_get (tmp, Qdata);
2344 2344
2345 /* Now use params to make a new hashtable and fill it. */ 2345 /* Now use params to make a new hashtable and fill it. */
2356 Fputhash (key, val, ht); 2356 Fputhash (key, val, ht);
2357 } 2357 }
2358 2358
2359 return ht; 2359 return ht;
2360 } 2360 }
2361 UNREAD (c);
2362 invalid_syntax ("#", 1);
2361 } 2363 }
2362 if (c == '^') 2364 if (c == '^')
2363 { 2365 {
2364 c = READCHAR; 2366 c = READCHAR;
2365 if (c == '[') 2367 if (c == '[')