comparison src/energize.c @ 80:1ce6082ce73f r20-0b90

Import from CVS: tag r20-0b90
author cvs
date Mon, 13 Aug 2007 09:06:37 +0200
parents 131b0175ea99
children 6a378aca36af
comparison
equal deleted inserted replaced
79:5b0a5bbffab6 80:1ce6082ce73f
720 720
721 if (SYMBOLP (type)) 721 if (SYMBOLP (type))
722 XSETSTRING (type, XSYMBOL (type)->name); 722 XSETSTRING (type, XSYMBOL (type)->name);
723 723
724 if (STRINGP (type)) 724 if (STRINGP (type))
725 type_string = (char *)XSTRING_DATA (type); 725 type_string = (char *) XSTRING_DATA (type);
726 726
727 type_string = copy_string (type_string); 727 type_string = copy_string (type_string);
728 728
729 if (!type_string) return Qnil; 729 if (!type_string) return Qnil;
730 730
1663 1663
1664 /* set buffer name */ 1664 /* set buffer name */
1665 if (!NILP (buffer_name)) 1665 if (!NILP (buffer_name))
1666 { 1666 {
1667 if (modifying_p 1667 if (modifying_p
1668 && strcmp ((char*)XSTRING_DATA (buffer_name), 1668 && strcmp ((char*) XSTRING_DATA (buffer_name),
1669 (char*) 1669 (char*) xSTRING_DATA (XBUFFER (binfo->emacs_buffer)->name))))
1670 string_data (XSTRING (XBUFFER (binfo->emacs_buffer)->name))))
1671 rename_the_buffer (buffer_name); 1670 rename_the_buffer (buffer_name);
1672 } 1671 }
1673 1672
1674 if (modifying_p) 1673 if (modifying_p)
1675 { 1674 {
2133 { 2132 {
2134 Lisp_Object string = make_string_from_buffer (current_buffer, 2133 Lisp_Object string = make_string_from_buffer (current_buffer,
2135 BUF_BEG (current_buffer), 2134 BUF_BEG (current_buffer),
2136 BUF_Z (current_buffer)); 2135 BUF_Z (current_buffer));
2137 CNeedOutputSize (conn, XSTRING_LENGTH (string) + 9); 2136 CNeedOutputSize (conn, XSTRING_LENGTH (string) + 9);
2138 CWriteVstringLen (conn, XSTRING_DATA (string), 2137 CWriteVstringLen (conn, XSTRING_DATA (string), XSTRING_LENGTH (string));
2139 XSTRING_LENGTH (string));
2140 } 2138 }
2141 2139
2142 /* write the extents */ 2140 /* write the extents */
2143 bane.binfo = binfo; 2141 bane.binfo = binfo;
2144 bane.n_extents = 0; 2142 bane.n_extents = 0;
2526 if (vector_length (v) != 4) 2524 if (vector_length (v) != 4)
2527 error ("Bad menu item to energize-execute-menu-item"); 2525 error ("Bad menu item to energize-execute-menu-item");
2528 2526
2529 /* ignore the flags for now */ 2527 /* ignore the flags for now */
2530 execute_energize_menu (buffer, extent_to_data (extent_obj), 2528 execute_energize_menu (buffer, extent_to_data (extent_obj),
2531 (char*)XSTRING_DATA (v->contents [0]), 2529 (char*) XSTRING_DATA (v->contents [0]),
2532 lisp_to_word (v->contents [1]), 2530 lisp_to_word (v->contents [1]),
2533 XINT (v->contents [3]), 2531 XINT (v->contents [3]),
2534 selection, 2532 selection,
2535 no_confirm); 2533 no_confirm);
2536 2534