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
@@ -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. */
 
-    XMSelect *select;          /* Newly created selection. */
+    XMSelect *sel;             /* Newly created selection. */
 
     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.
      */
-    select = (XMSelect *)calloc(1, sizeof(XMSelect));
-    if (select == NULL) {
+    sel = (XMSelect *)calloc(1, sizeof(XMSelect));
+    if (sel == NULL) {
        _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, "---"))
       {
-       select->type = SEPARATOR;
-       select->active = 0;
+       sel->type = SEPARATOR;
+       sel->active = 0;
       }
     else
       {
-       select->type = SELECTION;
-       select->active = active;
+       sel->type = SELECTION;
+       sel->active = active;
       }
 
-    select->active = active;
-    select->serial = -1;
-    select->label = label;
-    select->label_width = label_width;
-    select->label_length = label_length;
-    select->data = data;
-    select->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.
      */
-    emacs_insque(select, s_ptr);
+    emacs_insque(sel, s_ptr);
 
     /*
      * 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);
 }
-