Mercurial > emacs
view oldXMenu/DelSel.c @ 93956:bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.
* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.
* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 07:32:25 +0000 |
parents | fec5e03aaf59 |
children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuDeleteSelection - Deletes a selection from an XMenu object. * * Author: Tony Della Fera, DEC * 20-Nov-85 * */ #include "XMenuInt.h" int XMenuDeleteSelection(display, menu, p_num, s_num) register Display *display; /* Previously opened display. */ register XMenu *menu; /* Menu object to be modified. */ register int p_num; /* Pane number to be deleted. */ register int s_num; /* Selection number to be deleted. */ { register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */ /* * Find the right pane. */ p_ptr = _XMGetPanePtr(menu, p_num); if (p_ptr == NULL) return(XM_FAILURE); /* * Find the right selection. */ s_ptr = _XMGetSelectionPtr(p_ptr, s_num); if (s_ptr == NULL) return(XM_FAILURE); /* * Remove the selection from the association table. */ XDeleteAssoc(display, menu->assoc_tab, s_ptr->window); /* * Remove the selection from the parent pane's selection * list and update the selection count. */ emacs_remque(s_ptr); p_ptr->s_count--; /* * Destroy the selection transparency. */ if (s_ptr->window) XDestroyWindow(display, s_ptr->window); /* * Free the selection's XMSelect structure. */ free(s_ptr); /* * Schedule a recompute. */ menu->recompute = 1; /* * Return the selection number just deleted. */ _XMErrorCode = XME_NO_ERROR; return(s_num); } /* arch-tag: 24ca2bc7-8a37-471a-8095-e6363fc1ed10 (do not change this comment) */