Mercurial > emacs
view oldXMenu/Recomp.c @ 62943:11d53dd5abd9
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 77-78)
- Update from CVS
2005-05-31 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (article-display-x-face): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
* lisp/gnus/gnus-group.el: Bind gnus-cache-active-hashtb when compiling.
* lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
set-process-query-on-exit-flag or process-kill-without-query.
* lisp/gnus/html2text.el (html2text-fix-paragraphs): Use `while - re-search'
loop instead of replace-regexp.
* lisp/gnus/imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
instead of process-kill-without-query if it is available.
* lisp/gnus/mm-util.el (mm-insert-file-contents): Bind find-file-hook
instead of find-file-hooks if it is available.
* lisp/gnus/mml1991.el: Bind pgg-default-user-id when compiling.
* lisp/gnus/mml2015.el: Bind pgg-default-user-id when compiling.
* lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Use
write-contents-functions instead of write-contents-hooks if it is
available.
* lisp/gnus/nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
instead of find-file-hooks if it is available.
* lisp/gnus/nntp.el (nntp-open-connection): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
(nntp-open-ssl-stream): Ditto.
(nntp-open-tls-stream): Ditto.
* lisp/gnus/pgg.el: Don't bind itimer vars; don't autoload itimer functions.
(pgg-run-at-time-1): New macro.
(pgg-run-at-time): Use it.
* lisp/gnus/starttls.el (starttls-set-process-query-on-exit-flag): Alias to
set-process-query-on-exit-flag or process-kill-without-query.
(starttls-open-stream-gnutls): Use it instead of
process-kill-without-query.
(starttls-open-stream): Ditto.
2005-05-31 Simon Josefsson <jas@extundo.com>
* lisp/gnus/imap.el (imap-ssl-open): Use imap-process-connection-type,
instead of hard coding to nil.
2005-05-31 Kevin Greiner <kgreiner@xpediantsolutions.com>
* lisp/gnus/gnus-group.el (): Require gnus-sum and autoload functions to
resolve warnings when gnus-group.el compiled alone.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 01 Jun 2005 05:07:06 +0000 |
parents | e8824c4f5f7e |
children | 3861ff8f4bf1 8e5779acd195 |
line wrap: on
line source
#include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuRecompute - Recompute XMenu object dependencies. * * Author: Tony Della Fera, DEC * September, 1985 * */ #include "XMenuInt.h" int XMenuRecompute(display, menu) Display *display; register XMenu *menu; /* Menu object to be recomputed. */ { register XMPane *p_ptr; /* Pane pointer. */ register XMSelect *s_ptr; /* Selection pointer. */ register int p_num; /* Pane serial number. */ register int s_num; /* Selection serial number. */ /* * If there are no panes in the menu then return failure * because the menu is not initialized. */ if (menu->p_count == 0) { _XMErrorCode = XME_NOT_INIT; return(XM_FAILURE); } /* * Recompute menu wide global values: pane window size, * selection size and maximum selection count. */ _XMRecomputeGlobals(display, menu); /* * For each pane in the menu... */ p_num = 0; for ( p_ptr = menu->p_list->next; p_ptr != menu->p_list; p_ptr = p_ptr->next ){ /* * Recompute pane dependencies. */ if (_XMRecomputePane(display, menu, p_ptr, p_num) == _FAILURE) { return(XM_FAILURE); } p_num++; /* * For each selection in the pane... */ s_num = 0; for ( s_ptr = p_ptr->s_list->next; s_ptr != p_ptr->s_list; s_ptr = s_ptr->next ) { /* * Recompute selection dependencies. */ if (_XMRecomputeSelection(display, menu, s_ptr, s_num) == _FAILURE) { return(XM_FAILURE); } s_num++; } } /* * Recompute menu size. */ if (menu->menu_style == CENTER) { menu->width = menu->p_width + (menu->p_bdr_width << 1); } else { menu->width = menu->p_width + (menu->p_bdr_width << 1) + ((menu->p_count - 1) * menu->p_x_off); } menu->height = menu->p_height + (menu->p_bdr_width << 1) + ((menu->p_count - 1) * menu->p_y_off); /* * Reset the recompute flag. */ menu->recompute = 0; /* * Return successfully. */ _XMErrorCode = XME_NO_ERROR; return(XM_SUCCESS); } /* arch-tag: 1fe99b82-3873-4aab-b2b3-f277c93e00d9 (do not change this comment) */