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

[Kenichi Handa]

Index: emacs/src/charset.c
diff -c emacs/src/charset.c:1.124 emacs/src/charset.c:1.125
*** emacs/src/charset.c:1.124   Tue Dec 18 14:38:18 2001
--- emacs/src/charset.c Wed Feb  6 14:12:14 2002
***************
*** 597,607 ****
    Lisp_Object val;
    int charset;
  
!   return ((SYMBOLP (charset_symbol)
!          && (val = Fget (charset_symbol, Qcharset), VECTORP (val))
!          && (charset = XINT (XVECTOR (val)->contents[CHARSET_ID_IDX]),
!              CHARSET_VALID_P (charset)))
!         ? charset : -1);
  }
  
  /* Return an identification number for a new private charset of
--- 597,611 ----
    Lisp_Object val;
    int charset;
  
!   /* This originally used a ?: operator, but reportedly the HP-UX
!      compiler version HP92453-01 A.10.32.22 miscompiles that.  */
!   if (SYMBOLP (charset_symbol)
!       && VECTORP (val = Fget (charset_symbol, Qcharset))
!       && CHARSET_VALID_P (charset =
!                         XINT (XVECTOR (val)->contents[CHARSET_ID_IDX])))
!     return charset;
!   else
!     return -1;
  }
  
  /* Return an identification number for a new private charset of