From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: 23.0.50;(set-language-environment 'Chinese-GB) error Date: Sat, 20 Oct 2007 02:42:48 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1192840986 27977 80.91.229.12 (20 Oct 2007 00:43:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 20 Oct 2007 00:43:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Glenn Morris" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 20 02:43:07 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Ij2Qi-0000uy-94 for ged-emacs-devel@m.gmane.org; Sat, 20 Oct 2007 02:43:04 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ij2Qa-0002cO-NL for ged-emacs-devel@m.gmane.org; Fri, 19 Oct 2007 20:42:56 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ij2QX-0002aN-9n for emacs-devel@gnu.org; Fri, 19 Oct 2007 20:42:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ij2QV-0002ZU-47 for emacs-devel@gnu.org; Fri, 19 Oct 2007 20:42:52 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ij2QU-0002Yx-RQ for emacs-devel@gnu.org; Fri, 19 Oct 2007 20:42:50 -0400 Original-Received: from rv-out-0910.google.com ([209.85.198.191]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ij2QU-0006u9-74 for emacs-devel@gnu.org; Fri, 19 Oct 2007 20:42:50 -0400 Original-Received: by rv-out-0910.google.com with SMTP id c27so538871rvf for ; Fri, 19 Oct 2007 17:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=BOWhoIG8d9BsP4bPHM2tThzC4KdoP16hDOb8RBtaUUA=; b=EnZ2E2pQScJy+vYbhEKkAxiF6FCB4NNOSTd7XK5SV5tgmUF9A/5XGjVE4n+VyOIGgScIEhVERTpLHnMUb6Nb0YkPf8oxXo70tHVaqhuzX+mluKoQ/u7vcpZ4TfYkdNIDN6kZYYM2oZG7fawxWt+vhctv22VA6BObdU+tCgLJ1lg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=efSUM+K4YuhmHBjKub+gu6TRa0iViqqQiLceg7IVCjQgIXZH9sA8PEvraCYZ52UjLid8zhpBk7CacEg6l1v7aGr/+atSYonhQPxkw8kTZa42r9a4ORqtTX7NihY8cbIOoh4Lk1JFfdKv2/I+CSMdtRHf1eMvqZwsdrd8GVnafUA= Original-Received: by 10.115.17.1 with SMTP id u1mr2670072wai.1192840968904; Fri, 19 Oct 2007 17:42:48 -0700 (PDT) Original-Received: by 10.115.72.13 with HTTP; Fri, 19 Oct 2007 17:42:48 -0700 (PDT) In-Reply-To: Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:81273 Archived-At: On 10/19/07, Juanma Barranquero 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). */