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 2012-12-20T16:09:05Z!dmantipov@yandex.ru
[bpt/emacs.git]
/
oldXMenu
/
InsPane.c
diff --git
a/oldXMenu/InsPane.c
b/oldXMenu/InsPane.c
index
19ee33c
..
d8470f3
100644
(file)
--- a/
oldXMenu/InsPane.c
+++ b/
oldXMenu/InsPane.c
@@
-14,7
+14,6
@@
*
*/
*
*/
-#include <config.h>
#include "XMenuInt.h"
int
#include "XMenuInt.h"
int
@@
-26,7
+25,7
@@
XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
{
register XMPane *p_ptr; /* XMPane pointer. */
register XMPane *pane; /* Newly created pane. */
{
register XMPane *p_ptr; /* XMPane pointer. */
register XMPane *pane; /* Newly created pane. */
- register XMSelect *sel
ect;
/* Initial selection for the new pane. */
+ register XMSelect *sel
;
/* Initial selection for the new pane. */
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. */
@@
-54,8
+53,8
@@
XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
_XMErrorCode = XME_CALLOC;
return(XM_FAILURE);
}
_XMErrorCode = XME_CALLOC;
return(XM_FAILURE);
}
- 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);
}
@@
-70,11
+69,11
@@
XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
* Set up the initial selection.
* Values not explicitly set are zeroed by calloc.
*/
* Set up the initial selection.
* Values not explicitly set are zeroed by calloc.
*/
- sel
ect->next = select
;
- sel
ect->prev = select
;
- sel
ect
->type = SL_HEADER;
- sel
ect
->serial = -1;
- sel
ect
->parent_p = pane;
+ sel
->next = sel
;
+ sel
->prev = sel
;
+ sel->type = SL_HEADER;
+ sel->serial = -1;
+ sel->parent_p = pane;
/*
* Fill the XMPane structure.
/*
* Fill the XMPane structure.
@@
-85,7
+84,7
@@
XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
pane->label = label;
pane->label_width = label_width;
pane->label_length = label_length;
pane->label = label;
pane->label_width = label_width;
pane->label_length = label_length;
- pane->s_list = sel
ect
;
+ pane->s_list = sel;
/*
* Insert the pane after the pane with the pane
/*
* Insert the pane after the pane with the pane
@@
-110,6
+109,3
@@
XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
_XMErrorCode = XME_NO_ERROR;
return(p_num);
}
_XMErrorCode = XME_NO_ERROR;
return(p_num);
}
-
-/* arch-tag: ab94d53d-f05b-4273-82d3-f1b01eb9dc9e
- (do not change this comment) */