[Emacs-diffs] Changes to emacs/src/xsmfns.c

[Ken Raeburn]

Index: emacs/src/xsmfns.c
diff -c emacs/src/xsmfns.c:1.4 emacs/src/xsmfns.c:1.5
*** emacs/src/xsmfns.c:1.4      Thu Jun 13 10:59:14 2002
--- emacs/src/xsmfns.c  Sun Jul 14 20:00:41 2002
***************
*** 216,223 ****
    props[props_idx]->type = SmARRAY8;
    props[props_idx]->num_vals = 1;
    props[props_idx]->vals = &values[val_idx++];
!   props[props_idx]->vals[0].length = strlen (XSTRING 
(Vinvocation_name)->data);
!   props[props_idx]->vals[0].value = XSTRING (Vinvocation_name)->data;
    ++props_idx;
    
    /* How to restart Emacs (i.e.: /path/to/emacs --smid=xxxx). */
--- 216,223 ----
    props[props_idx]->type = SmARRAY8;
    props[props_idx]->num_vals = 1;
    props[props_idx]->vals = &values[val_idx++];
!   props[props_idx]->vals[0].length = strlen (SDATA (Vinvocation_name));
!   props[props_idx]->vals[0].value = SDATA (Vinvocation_name);
    ++props_idx;
    
    /* How to restart Emacs (i.e.: /path/to/emacs --smid=xxxx). */
***************
*** 244,251 ****
    props[props_idx]->type = SmARRAY8;
    props[props_idx]->num_vals = 1;
    props[props_idx]->vals = &values[val_idx++];
!   props[props_idx]->vals[0].length = strlen (XSTRING 
(Vuser_login_name)->data);
!   props[props_idx]->vals[0].value = XSTRING (Vuser_login_name)->data;
    ++props_idx;
  
    /* The current directory property, not mandatory */
--- 244,251 ----
    props[props_idx]->type = SmARRAY8;
    props[props_idx]->num_vals = 1;
    props[props_idx]->vals = &values[val_idx++];
!   props[props_idx]->vals[0].length = strlen (SDATA (Vuser_login_name));
!   props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
    ++props_idx;
  
    /* The current directory property, not mandatory */
***************
*** 407,418 ****
    /* Check if we where started by the session manager.  If so, we will
       have a previous id. */
    if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
!     previous_id = XSTRING (Vx_session_previous_id)->data;
  
    /* Construct the path to the Emacs program. */
    if (! EQ (Vinvocation_directory, Qnil))
!     name_len += strlen (XSTRING (Vinvocation_directory)->data);
!   name_len += strlen (XSTRING (Vinvocation_name)->data);
  
    /* This malloc will not be freed, but it is only done once, and hopefully
       not very large  */
--- 407,418 ----
    /* Check if we where started by the session manager.  If so, we will
       have a previous id. */
    if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
!     previous_id = SDATA (Vx_session_previous_id);
  
    /* Construct the path to the Emacs program. */
    if (! EQ (Vinvocation_directory, Qnil))
!     name_len += strlen (SDATA (Vinvocation_directory));
!   name_len += strlen (SDATA (Vinvocation_name));
  
    /* This malloc will not be freed, but it is only done once, and hopefully
       not very large  */
***************
*** 420,427 ****
    emacs_program[0] = '\0';
  
    if (! EQ (Vinvocation_directory, Qnil))
!     strcpy (emacs_program, XSTRING (Vinvocation_directory)->data);
!   strcat (emacs_program, XSTRING (Vinvocation_name)->data);
    
    /* The SM protocol says all callbacks are mandatory, so set up all
       here and in the mask passed to SmcOpenConnection */
--- 420,427 ----
    emacs_program[0] = '\0';
  
    if (! EQ (Vinvocation_directory, Qnil))
!     strcpy (emacs_program, SDATA (Vinvocation_directory));
!   strcat (emacs_program, SDATA (Vinvocation_name));
    
    /* The SM protocol says all callbacks are mandatory, so set up all
       here and in the mask passed to SmcOpenConnection */