comparison src/doprnt.c @ 4453:29efd169efe7

Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 11 May 2008 11:24:01 +0200
parents cacc942c0d0f
children b5e1d4f6b66f
comparison
equal deleted inserted replaced
4452:82f8351e71c8 4453:29efd169efe7
556 556
557 if (ch == 'S') 557 if (ch == 'S')
558 { 558 {
559 /* For `S', prin1 the argument and then treat like 559 /* For `S', prin1 the argument and then treat like
560 a string. */ 560 a string. */
561 ls = Fprin1_to_string (obj, Qnil); 561 ls = prin1_to_string (obj, 0);
562 } 562 }
563 else if (STRINGP (obj)) 563 else if (STRINGP (obj))
564 ls = obj; 564 ls = obj;
565 else if (SYMBOLP (obj)) 565 else if (SYMBOLP (obj))
566 ls = XSYMBOL (obj)->name; 566 ls = XSYMBOL (obj)->name;
567 else 567 else
568 { 568 {
569 /* convert to string using princ. */ 569 /* convert to string using princ. */
570 ls = Fprin1_to_string (obj, Qt); 570 ls = prin1_to_string (obj, 1);
571 } 571 }
572 string = XSTRING_DATA (ls); 572 string = XSTRING_DATA (ls);
573 string_len = XSTRING_LENGTH (ls); 573 string_len = XSTRING_LENGTH (ls);
574 } 574 }
575 575