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

[Ken Raeburn]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.332 emacs/src/editfns.c:1.333
*** emacs/src/editfns.c:1.332   Sun Jul 14 20:00:36 2002
--- emacs/src/editfns.c Tue Jul 16 12:58:04 2002
***************
*** 194,208 ****
       register Lisp_Object string;
  {
    register Lisp_Object val;
-   register struct Lisp_String *p;
    CHECK_STRING (string);
!   p = XSTRING (string);
!   if (p->size)
      {
        if (STRING_MULTIBYTE (string))
!       XSETFASTINT (val, STRING_CHAR (p->data, STRING_BYTES (p)));
        else
!       XSETFASTINT (val, p->data[0]);
      }
    else
      XSETFASTINT (val, 0);
--- 194,206 ----
       register Lisp_Object string;
  {
    register Lisp_Object val;
    CHECK_STRING (string);
!   if (SCHARS (string))
      {
        if (STRING_MULTIBYTE (string))
!       XSETFASTINT (val, STRING_CHAR (SDATA (string), SBYTES (string)));
        else
!       XSETFASTINT (val, SREF (string, 0));
      }
    else
      XSETFASTINT (val, 0);