mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 05:52:32 -08:00
Code Issues Projects Releases Wiki Activity

2002-12-02 Andrew Choi <akochoi@shaw.ca>

Browse source 
* macmenu.c (add_menu_item, fill_menubar): Truncate menu item
        names to 255 characters.

        * macterm.c (XTread_socket): If all frames have been collapsed,
        expand the first one before handling drag-and-drop events.

        * s/darwin.h (GETPGRP_NO_ARG): Delete.  Replaced by GETPGRP_VOID,
        which is detected by autoconf.
This commit is contained in:
Andrew Choi 2002-12-02 17:13:46 +00:00
parent 4b5e69bd44
commit 72742a999a
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ChangeLog
View file

@ -1,3 +1,14 @@
2002-12-02 Andrew Choi <akochoi@shaw.ca>
* macmenu.c (add_menu_item, fill_menubar): Truncate menu item
names to 255 characters.
* macterm.c (XTread_socket): If all frames have been collapsed,
expand the first one before handling drag-and-drop events.
* s/darwin.h (GETPGRP_NO_ARG): Delete. Replaced by GETPGRP_VOID,
which is detected by autoconf.
2002-12-01 Steven Tamm <steventamm@mac.com>
* unexmacosx.c (copy_twolevelhints, dump_it): Now corrects the

12
src/macmenu.c
View file

@ -2226,13 +2226,14 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu, int indent,
strcpy (item_name, "");
for (i = 0; i < indent; i++)
strcat (item_name, " ");
strcat (item_name, wv->name);
strncat (item_name, " ", 255);
strncat (item_name, wv->name, 255);
if (wv->key != NULL)
{
strcat (item_name, " ");
strcat (item_name, wv->key);
strncat (item_name, " ", 255);
strncat (item_name, wv->key, 255);
}
item_name[255] = 0;
c2pstr (item_name);
SetMenuItemText (menu, pos, item_name);
@ -2316,7 +2317,8 @@ fill_menubar (widget_value *wv)
MenuHandle menu;
Str255 title;
strcpy (title, wv->name);
strncpy (title, wv->name, 255);
title[255] = 0;
c2pstr (title);
menu = NewMenu (id, title);

8
src/macterm.c
View file

@ -13046,6 +13046,14 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
Lisp_Object frame;
wp = FrontNonFloatingWindow ();
if (!wp)
{
struct frame *f = XFRAME (XCAR (Vframe_list));
CollapseWindow (FRAME_MAC_WINDOW (f), false);
wp = FrontNonFloatingWindow ();
}
if (wp && is_emacs_window(wp))
f = ((mac_output *) GetWRefCon (wp))->mFP;

3
src/s/darwin.h
View file

@ -209,9 +209,6 @@ Boston, MA 02111-1307, USA. */
/* Used in dispnew.c. Copied from freebsd.h. */
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
/* Darwin provides POSIX-style getpgrp. */
#define GETPGRP_NO_ARG
/* System uses OXTABS instead of the expected TAB3. (Copied from
bsd386.h.) */
#define TAB3 OXTABS