comparison src/symbols.c @ 5292:e4305eb6fb8c

Merge some permissions corrections to trunk.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 18 Oct 2010 23:21:23 +0900
parents d804e621add0
children 8608eadee6ba 308d34e9f07d
comparison
equal deleted inserted replaced
5291:85bd42a1e544 5292:e4305eb6fb8c
196 { 196 {
197 return intern_istring ((Ibyte *) str); 197 return intern_istring ((Ibyte *) str);
198 } 198 }
199 199
200 Lisp_Object 200 Lisp_Object
201 intern_converting_underscores_to_dashes (const CIbyte *str) 201 intern_massaging_name (const CIbyte *str)
202 { 202 {
203 Bytecount len = strlen (str); 203 Bytecount len = strlen (str);
204 CIbyte *tmp = alloca_extbytes (len + 1); 204 CIbyte *tmp = alloca_extbytes (len + 1);
205 Bytecount i; 205 Bytecount i;
206 strcpy (tmp, str); 206 strcpy (tmp, str);
207 for (i = 0; i < len; i++) 207 for (i = 0; i < len; i++)
208 if (tmp[i] == '_') 208 {
209 tmp[i] = '-'; 209 if (tmp[i] == '_')
210 {
211 tmp[i] = '-';
212 }
213 else if (tmp[i] == 'X')
214 {
215 tmp[i] = '*';
216 }
217 }
210 return intern_istring ((Ibyte *) tmp); 218 return intern_istring ((Ibyte *) tmp);
211 } 219 }
212 220
213 DEFUN ("intern", Fintern, 1, 2, 0, /* 221 DEFUN ("intern", Fintern, 1, 2, 0, /*
214 Return the canonical symbol whose name is STRING. 222 Return the canonical symbol whose name is STRING.
3528 { 3536 {
3529 OBJECT_HAS_METHOD (symbol, getprop); 3537 OBJECT_HAS_METHOD (symbol, getprop);
3530 OBJECT_HAS_METHOD (symbol, putprop); 3538 OBJECT_HAS_METHOD (symbol, putprop);
3531 OBJECT_HAS_METHOD (symbol, remprop); 3539 OBJECT_HAS_METHOD (symbol, remprop);
3532 OBJECT_HAS_NAMED_METHOD (symbol, plist, Fsymbol_plist); 3540 OBJECT_HAS_NAMED_METHOD (symbol, plist, Fsymbol_plist);
3541 OBJECT_HAS_NAMED_METHOD (symbol, setplist, Fsetplist);
3533 } 3542 }
3534 3543
3535 void 3544 void
3536 init_symbols_once_early (void) 3545 init_symbols_once_early (void)
3537 { 3546 {