comparison src/energize.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 859a2309aef8
children 1ce6082ce73f
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
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*) XSTRING_DATA (XBUFFER (binfo->emacs_buffer)->name))) 1669 (char*)
1670 string_data (XSTRING (XBUFFER (binfo->emacs_buffer)->name))))
1670 rename_the_buffer (buffer_name); 1671 rename_the_buffer (buffer_name);
1671 } 1672 }
1672 1673
1673 if (modifying_p) 1674 if (modifying_p)
1674 { 1675 {
2132 { 2133 {
2133 Lisp_Object string = make_string_from_buffer (current_buffer, 2134 Lisp_Object string = make_string_from_buffer (current_buffer,
2134 BUF_BEG (current_buffer), 2135 BUF_BEG (current_buffer),
2135 BUF_Z (current_buffer)); 2136 BUF_Z (current_buffer));
2136 CNeedOutputSize (conn, XSTRING_LENGTH (string) + 9); 2137 CNeedOutputSize (conn, XSTRING_LENGTH (string) + 9);
2137 CWriteVstringLen (conn, XSTRING_DATA (string), XSTRING_LENGTH (string)); 2138 CWriteVstringLen (conn, XSTRING_DATA (string),
2139 XSTRING_LENGTH (string));
2138 } 2140 }
2139 2141
2140 /* write the extents */ 2142 /* write the extents */
2141 bane.binfo = binfo; 2143 bane.binfo = binfo;
2142 bane.n_extents = 0; 2144 bane.n_extents = 0;
2524 if (vector_length (v) != 4) 2526 if (vector_length (v) != 4)
2525 error ("Bad menu item to energize-execute-menu-item"); 2527 error ("Bad menu item to energize-execute-menu-item");
2526 2528
2527 /* ignore the flags for now */ 2529 /* ignore the flags for now */
2528 execute_energize_menu (buffer, extent_to_data (extent_obj), 2530 execute_energize_menu (buffer, extent_to_data (extent_obj),
2529 (char*) XSTRING_DATA (v->contents [0]), 2531 (char*)XSTRING_DATA (v->contents [0]),
2530 lisp_to_word (v->contents [1]), 2532 lisp_to_word (v->contents [1]),
2531 XINT (v->contents [3]), 2533 XINT (v->contents [3]),
2532 selection, 2534 selection,
2533 no_confirm); 2535 no_confirm);
2534 2536
2551 2553
2552 CHECK_BUFFER (buffer); 2554 CHECK_BUFFER (buffer);
2553 CHECK_STRING (command); 2555 CHECK_STRING (command);
2554 2556
2555 execute_energize_menu (buffer, extent_to_data (extent_obj), 2557 execute_energize_menu (buffer, extent_to_data (extent_obj),
2556 (char*) XSTRING_DATA (command), 0, 0, selection, 2558 (char*)XSTRING_DATA (command), 0, 0, selection,
2557 no_confirm); 2559 no_confirm);
2558 2560
2559 return Qt; 2561 return Qt;
2560 } 2562 }
2561 2563