Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

[bpt/emacs.git] / oldXMenu / AddPane.c

diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 6312aa2..2c8dda8 100644 (file)
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -12,18 +12,17 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
-XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active)
-                     
+XMenuAddPane(Display *display, register XMenu *menu, register char const *label, int active)
+
                                /* Menu object to be modified. */
                                /* Selection label. */
                                        /* Make selection active? */
 {
     register XMPane *pane;     /* Newly created pane. */
-    register XMSelect *select; /* 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. */
@@ -44,8 +43,8 @@ XMenuAddPane(Display *display, register XMenu *menu, register char *label, int a
        _XMErrorCode = XME_CALLOC;
        return(XM_FAILURE);
     }
-    select = (XMSelect *)calloc(1, sizeof(XMSelect));
-    if (select == NULL) {
+    sel = (XMSelect *)calloc(1, sizeof(XMSelect));
+    if (sel == NULL) {
        _XMErrorCode = XME_CALLOC;
        return(XM_FAILURE);
     }
@@ -62,11 +61,11 @@ XMenuAddPane(Display *display, register XMenu *menu, register char *label, int a
      * Set up the initial selection.
      * Values not explicitly set are zeroed by calloc.
      */
-    select->next = select;
-    select->prev = select;
-    select->type = SL_HEADER;
-    select->serial = -1;
-    select->parent_p = pane;
+    sel->next = sel;
+    sel->prev = sel;
+    sel->type = SL_HEADER;
+    sel->serial = -1;
+    sel->parent_p = pane;
 
     /*
      * Fill the XMPane structure.
@@ -78,7 +77,7 @@ XMenuAddPane(Display *display, register XMenu *menu, register char *label, int a
     pane->label = label;
     pane->label_width = label_width;
     pane->label_length = label_length;
-    pane->s_list = select;
+    pane->s_list = sel;
 
     /*
      * Insert the pane at the end of the pane list.
@@ -101,6 +100,3 @@ XMenuAddPane(Display *display, register XMenu *menu, register char *label, int a
     _XMErrorCode = XME_NO_ERROR;
     return((menu->p_count - 1));
 }
-
-/* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547
-   (do not change this comment) */