Re: 23.0.50;(set-language-environment 'Chinese-GB) error

["Juanma Barranquero" <lekktu@gmail.com>]

On 10/19/07, Juanma Barranquero <lekktu@gmail.com> wrote:

> Surely the fact that RMS just fixed it must be significant :)

I spoke too soon :(

I still see the bug with my previous test case.

Richard's fix is inside the "else if (CONSP (fun))" part of the
conditional in Fdocumentation, but in my examples is the "else if
(COMPILEDP (fun))" branch the one taken.

Perhaps the intent was to put the new code outside the conditional, as
in the patch below? That seems to work for me.

             Juanma


Index: src/doc.c
===================================================================
RCS file: /sources/emacs/emacs/src/doc.c,v
retrieving revision 1.126
diff -u -2 -r1.126 doc.c
--- src/doc.c	19 Oct 2007 17:23:31 -0000	1.126
+++ src/doc.c	20 Oct 2007 00:38:27 -0000
@@ -435,16 +435,4 @@
 	  else
 	    return Qnil;
-
-	  /* Check for an advised function.  Its doc string
-	     has an `ad-advice-info' text property.  */
-	  if (STRINGP (doc))
-	    {
-	      Lisp_Object innerfunc;
-	      innerfunc = Fget_text_property (make_number (0),
-					      intern ("ad-advice-info"),
-					      doc);
-	      if (! NILP (innerfunc))
-		doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
-	    }
 	}
       else if (EQ (funcar, Qmacro))
@@ -459,4 +447,16 @@
     }

+  /* Check for an advised function.  Its doc string
+     has an `ad-advice-info' text property.  */
+  if (STRINGP (doc))
+    {
+      Lisp_Object innerfunc;
+      innerfunc = Fget_text_property (make_number (0),
+				      intern ("ad-advice-info"),
+				      doc);
+      if (! NILP (innerfunc))
+	doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
+    }
+
   /* If DOC is 0, it's typically because of a dumped file missing
      from the DOC file (bug in src/Makefile.in).  */