X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdoc.c;h=d683fba7b874864b45d865c1f2fe4c1190d4b17a;hb=d8c9e39b7a138bbc5e888b8e9f908c5e575365e1;hp=8174a0282faeec2807d3744253c1c1162147e405;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git-

diff --git a/src/doc.c b/src/doc.c
index 8174a02..d683fba 100644
--- 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,7 +284,7 @@ string is passed through `substitute-command-keys'.
   else if (COMPILED_FUNCTIONP (fun))
     {
       Lisp_Object tem;
-      struct Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+      Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
       if (! (f->flags.documentationp))
         return Qnil;
       tem = compiled_function_documentation (f);
@@ -392,7 +392,7 @@ translation.
 }
 
 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",
@@ -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 *f =
-			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
@@ -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,7 +683,7 @@ verify_doc_mapper (Lisp_Object sym, void *arg)
 	}
       else if (COMPILED_FUNCTIONP (fun))
 	{
-          struct Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+          Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
           if (! (f->flags.documentationp))
             doc = -1;
           else
@@ -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_;