HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
[bpt/emacs.git]
/
oldXMenu
/
InsSel.c
diff --git
a/oldXMenu/InsSel.c
b/oldXMenu/InsSel.c
index
be0e43e
..
66f4968
100644
(file)
--- a/
oldXMenu/InsSel.c
+++ b/
oldXMenu/InsSel.c
@@
-13,7
+13,6
@@
*
*/
*
*/
-#include <config.h>
#include "XMenuInt.h"
int
#include "XMenuInt.h"
int
@@
-28,7
+27,7
@@
XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_nu
register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */
register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */
- XMSelect *sel
ect;
/* Newly created selection. */
+ XMSelect *sel
;
/* Newly created selection. */
int label_length; /* Label length in characters. */
int label_width; /* Label width in pixels. */
int label_length; /* Label length in characters. */
int label_width; /* Label width in pixels. */
@@
-57,8
+56,8
@@
XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_nu
/*
* Calloc the XMSelect structure.
*/
/*
* Calloc the XMSelect structure.
*/
- sel
ect
= (XMSelect *)calloc(1, sizeof(XMSelect));
- if (sel
ect
== NULL) {
+ sel = (XMSelect *)calloc(1, sizeof(XMSelect));
+ if (sel == NULL) {
_XMErrorCode = XME_CALLOC;
return(XM_FAILURE);
}
_XMErrorCode = XME_CALLOC;
return(XM_FAILURE);
}
@@
-75,28
+74,28
@@
XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_nu
*/
if (!strcmp (label, "--") || !strcmp (label, "---"))
{
*/
if (!strcmp (label, "--") || !strcmp (label, "---"))
{
- sel
ect
->type = SEPARATOR;
- sel
ect
->active = 0;
+ sel->type = SEPARATOR;
+ sel->active = 0;
}
else
{
}
else
{
- sel
ect
->type = SELECTION;
- sel
ect
->active = active;
+ sel->type = SELECTION;
+ sel->active = active;
}
}
- sel
ect
->active = active;
- sel
ect
->serial = -1;
- sel
ect
->label = label;
- sel
ect
->label_width = label_width;
- sel
ect
->label_length = label_length;
- sel
ect
->data = data;
- sel
ect
->parent_p = p_ptr;
+ sel->active = active;
+ sel->serial = -1;
+ sel->label = label;
+ sel->label_width = label_width;
+ sel->label_length = label_length;
+ sel->data = data;
+ sel->parent_p = p_ptr;
/*
* Insert the selection after the selection with the selection
* number one less than the desired number for the new selection.
*/
/*
* Insert the selection after the selection with the selection
* number one less than the desired number for the new selection.
*/
- emacs_insque(sel
ect
, s_ptr);
+ emacs_insque(sel, s_ptr);
/*
* Update the selection count.
/*
* Update the selection count.
@@
-114,4
+113,3
@@
XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_nu
_XMErrorCode = XME_NO_ERROR;
return(s_num);
}
_XMErrorCode = XME_NO_ERROR;
return(s_num);
}
-