Mercurial > emacs
view oldXMenu/ChgPane.c @ 54527:192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it. Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 23 Mar 2004 19:56:42 +0000 |
parents | 695cf19ef79e |
children | f0eb34e60705 e8824c4f5f7e 375f2633d815 |
line wrap: on
line source
#include "copyright.h" /* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgPane.c,v 1.1 1999/10/03 19:34:53 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuChangePane - Change the label of a menu pane. * * Author: Tony Della Fera, DEC * December 19, 1985 * */ #include "XMenuInt.h" int XMenuChangePane(menu, p_num, label) register XMenu *menu; /* Menu object to be modified. */ register int p_num; /* Pane number to be modified. */ char *label; /* Selection label. */ { register XMPane *p_ptr; /* XMPane pointer. */ int label_length; /* Label length in characters. */ int label_width; /* Label width in pixels. */ /* * Check for NULL pointers! */ if (label == NULL) { _XMErrorCode = XME_ARG_BOUNDS; return(XM_FAILURE); } /* * Find the right pane. */ p_ptr = _XMGetPanePtr(menu, p_num); if (p_ptr == NULL) return(XM_FAILURE); /* * Determine label size. */ label_length = strlen(label); label_width = XTextWidth(menu->p_fnt_info, label, label_length); /* * Change the pane data. */ p_ptr->label = label; p_ptr->label_width = label_width; p_ptr->label_length = label_length; /* * Schedule a recompute. */ menu->recompute = 1; /* * Return the pane number just changed. */ _XMErrorCode = XME_NO_ERROR; return(p_num); } /* arch-tag: e267e9de-a3f0-4a0d-8c45-413afa176fd8 (do not change this comment) */