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: Documentation not clear for the Lisp function set-variable Date: Mon, 27 Jun 2005 17:44:49 +0200 Message-ID: References: <87slz6nr3h.fsf@jurta.org> Reply-To: Juanma Barranquero NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1119887667 32469 80.91.229.2 (27 Jun 2005 15:54:27 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 27 Jun 2005 15:54:27 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 27 17:54:26 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Dmvvj-0003VR-Nt for ged-emacs-devel@m.gmane.org; Mon, 27 Jun 2005 17:53:52 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Dmw3O-0003wB-VM for ged-emacs-devel@m.gmane.org; Mon, 27 Jun 2005 12:01:46 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Dmvy2-0002Hu-Pp for emacs-devel@gnu.org; Mon, 27 Jun 2005 11:56:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Dmvxl-00026z-LC for emacs-devel@gnu.org; Mon, 27 Jun 2005 11:56:03 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Dmvxj-00023w-Qx for emacs-devel@gnu.org; Mon, 27 Jun 2005 11:55:55 -0400 Original-Received: from [64.233.182.198] (helo=nproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DmvrE-0001XM-Ng for emacs-devel@gnu.org; Mon, 27 Jun 2005 11:49:12 -0400 Original-Received: by nproxy.gmail.com with SMTP id i2so177420nfe for ; Mon, 27 Jun 2005 08:44:49 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Q/4fVTratRIOeHyeE3y0ZhVPr/G+8i2nMZqFzlBfBagVp7k7BvF7CrFLKt6wbnqiSUl9TdcqMbgzrTFYB5AQ8TDU03ri5k/kO8OLRlvsTptJEE5ie8+kA5Oo9OiG3sJNJMZRtSyomn4whGlkhg3vMSI8z8XGV/ISs8eXXQTSb+8= Original-Received: by 10.48.4.20 with SMTP id 20mr120688nfd; Mon, 27 Jun 2005 08:44:49 -0700 (PDT) Original-Received: by 10.48.250.5 with HTTP; Mon, 27 Jun 2005 08:44:49 -0700 (PDT) Original-To: Juri Linkov In-Reply-To: Content-Disposition: inline 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:39662 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:39662 On 6/27/05, Juanma Barranquero wrote: > Try this patch, please. It doesn't modify `set-variable' but > `user-variable-p', so it returns t for non-obsolete aliases of user > variables. Well, it is also necessary to detect alias loops. The problem is: what should `user-variable-p' do when passed a variable which is in an alias loop? Throw an error or return nil? I prefer the latter, as `user-variable-p' is almost always used as predicate to completion functions, apropos* or `mapatoms', where throwing an error would be inappropriate. --=20 /L/e/k/t/u Index: src/eval.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/src/eval.c,v retrieving revision 1.245 diff -u -2 -r1.245 eval.c --- src/eval.c=0927 Jun 2005 05:59:23 -0000=091.245 +++ src/eval.c=0927 Jun 2005 15:37:53 -0000 @@ -94,4 +94,5 @@ Lisp_Object Qdebug_on_error; Lisp_Object Qdeclare; +Lisp_Object Qbyte_obsolete_variable; =20 /* This holds either the symbol `run-hooks' or nil. @@ -890,18 +891,35 @@ } =20 +/* Error handler used in Fuser_variable_p. */ +static Lisp_Object +user_variable_p_eh (ignore) + Lisp_Object ignore; +{ + return Qnil; +} + DEFUN ("user-variable-p", Fuser_variable_p, Suser_variable_p, 1, 1, 0, doc: /* Returns t if VARIABLE is intended to be set and modified by users. \(The alternative is a variable used internally in a Lisp program.) Determined by whether the first character of the documentation -for the variable is `*' or if the variable is customizable (has a non-nil -value of `standard-value' or of `custom-autoload' on its property list). = */) +for the variable is `*', the variable is customizable (has a non-nil +value of `standard-value' or of `custom-autoload' on its property list), +or it is a non-obsolete alias for another user variable. */) (variable) Lisp_Object variable; { Lisp_Object documentation; + struct Lisp_Symbol *sym; =20 if (!SYMBOLP (variable)) return Qnil; =20 + sym =3D XSYMBOL (variable); + /* If indirect and there's an alias loop, don't check anything else. */ + if (sym->indirect_variable + && NILP (internal_condition_case_1 (indirect_variable, variable, + Qt, user_variable_p_eh))) + return Qnil; + documentation =3D Fget (variable, Qvariable_documentation); if (INTEGERP (documentation) && XINT (documentation) < 0) @@ -916,8 +934,15 @@ && XINT (XCDR (documentation)) < 0) return Qt; - /* Customizable? See `custom-variable-p'. */ + /* Customizable? See `custom-variable-p'. */ if ((!NILP (Fget (variable, intern ("standard-value")))) || (!NILP (Fget (variable, intern ("custom-autoload"))))) return Qt; + + /* An indirect variable? Let's follow the chain. */ + sym =3D XSYMBOL (variable); + if (sym->indirect_variable + && NILP (Fget (variable, Qbyte_obsolete_variable))) + return Fuser_variable_p (sym->value); + return Qnil; } @@ -3410,4 +3435,7 @@ staticpro (&Qdeclare); =20 + Qbyte_obsolete_variable =3D intern ("byte-obsolete-variable"); + staticpro (&Qbyte_obsolete_variable); + /* Note that the process handling also uses Qexit, but we don't want to staticpro it twice, so we just do it here. */