(add_emchar_rune): Use `ASCII_TO_CHARC', `CHAR_TO_CHARC' and

[chise/xemacs-chise.git-] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index bfa9b12..d683fba 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -138,7 +138,7 @@ unparesseuxify_doc_string (int fd, EMACS_INT position,
     }
 
   /* #### mrb: following STILL completely broken */
-  return_me = make_ext_string ((Bufbyte *) buffer, to - buffer, FORMAT_BINARY);
+  return_me = make_ext_string ((Bufbyte *) buffer, to - buffer, Qbinary);
 
  done:
   if (buffer != buf) /* We must have allocated buffer above */
@@ -284,10 +284,10 @@ string is passed through `substitute-command-keys'.
   else if (COMPILED_FUNCTIONP (fun))
     {
       Lisp_Object tem;
-      struct Lisp_Compiled_Function *b = XCOMPILED_FUNCTION (fun);
-      if (! (b->flags.documentationp))
+      Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+      if (! (f->flags.documentationp))
         return Qnil;
-      tem = compiled_function_documentation (b);
+      tem = compiled_function_documentation (f);
       if (STRINGP (tem))
        doc = tem;
       else if (NATNUMP (tem) || CONSP (tem))
@@ -338,7 +338,7 @@ string is passed through `substitute-command-keys'.
 #ifdef I18N3
       Lisp_Object domain = Qnil;
       if (COMPILED_FUNCTIONP (fun))
-       domain = Fcompiled_function_domain (fun);
+       domain = compiled_function_domain (XCOMPILED_FUNCTION (fun));
       if (NILP (domain))
        doc = Fgettext (doc);
       else
@@ -392,7 +392,7 @@ translation.
 }
 \f
 static void
-weird_doc (Lisp_Object sym, CONST char *weirdness, CONST char *type, int pos)
+weird_doc (Lisp_Object sym, const char *weirdness, const char *type, int pos)
 {
   if (!strcmp (weirdness, GETTEXT ("duplicate"))) return;
   message ("Note: Strange doc (%s) for %s %s @ %d",
@@ -550,7 +550,7 @@ when doc strings are referred to in the dumped Emacs.
                            {
                              weird_doc (sym, GETTEXT ("!CONSP(tem)"),
                                         GETTEXT ("function"), pos);
-                         goto cont;
+                             goto cont;
                            }
                           else
                            {
@@ -573,8 +573,7 @@ when doc strings are referred to in the dumped Emacs.
                    {
                       /* Compiled-Function objects sometimes have
                          slots for it.  */
-                      struct Lisp_Compiled_Function *b =
-                       XCOMPILED_FUNCTION (fun);
+                      Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
 
                      /* This compiled-function object must have a
                         slot for the docstring, since we've found a
@@ -583,7 +582,7 @@ when doc strings are referred to in the dumped Emacs.
                         have any doc, which is a legal if slightly
                         bogus situation, so don't blow up. */
 
-                      if (! (b->flags.documentationp))
+                      if (! (f->flags.documentationp))
                        {
                          weird_doc (sym, GETTEXT ("no doc slot"),
                                     GETTEXT ("bytecode"), pos);
@@ -592,7 +591,7 @@ when doc strings are referred to in the dumped Emacs.
                      else
                        {
                          Lisp_Object old =
-                           compiled_function_documentation (b);
+                           compiled_function_documentation (f);
                          if (!ZEROP (old))
                            {
                              weird_doc (sym, GETTEXT ("duplicate"),
@@ -603,7 +602,7 @@ when doc strings are referred to in the dumped Emacs.
                              if (!INTP (old))
                                goto weird;
                            }
-                         set_compiled_function_documentation (b, offset);
+                         set_compiled_function_documentation (f, offset);
                        }
                     }
                   else
@@ -640,7 +639,7 @@ static int
 kludgily_ignore_lost_doc_p (Lisp_Object sym)
 {
 # define kludge_prefix "ad-Orig-"
-  struct Lisp_String *name = XSYMBOL (sym)->name;
+  Lisp_String *name = XSYMBOL (sym)->name;
   return (string_length (name) > (Bytecount) (sizeof (kludge_prefix)) &&
          !strncmp ((char *) string_data (name), kludge_prefix,
                    sizeof (kludge_prefix) - 1));
@@ -684,12 +683,12 @@ verify_doc_mapper (Lisp_Object sym, void *arg)
        }
       else if (COMPILED_FUNCTIONP (fun))
        {
-          struct Lisp_Compiled_Function *b = XCOMPILED_FUNCTION (fun);
-          if (! (b->flags.documentationp))
+          Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+          if (! (f->flags.documentationp))
             doc = -1;
           else
             {
-              Lisp_Object tem = compiled_function_documentation (b);
+              Lisp_Object tem = compiled_function_documentation (f);
               if (INTP (tem))
                 doc = XINT (tem);
             }
@@ -886,7 +885,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
        case '{':
        case '<':
          {
-           /* ### jump to label `subst_string|subst' crosses
+           /* #### jump to label `subst_string|subst' crosses
                initialization of `buffer|_buf' */
            Lisp_Object buffer;
            struct buffer *buf_;