From: Juanma Barranquero <lekktu@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Documentation not clear for the Lisp function set-variable
Date: Mon, 27 Jun 2005 23:38:52 +0200 [thread overview]
Message-ID: <f7ccd24b050627143848fe593@mail.gmail.com> (raw)
In-Reply-To: <u7jgffxuw.fsf@gnu.org>
> This patch produces the following text:
>
> Determined by whether the first character of the documentation
> 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.
>
> Does anyone else think that this sentence is so confusing in its
> structure as to be almost unparsable? (The old sentence was even less
> clear.)
Unparsable I wouldn't say, but certainly not very good. But anyway,
Richard just said that obsolete aliases should be set-variable too.
> I think this sentence sorely needs rephrasing. For starters, it
> should not use passive tense.
What about this patch? Do you like it a bit more?
--
/L/e/k/t/u
Index: src/eval.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/eval.c,v
retrieving revision 1.245
diff -u -2 -r1.245 eval.c
--- src/eval.c 27 Jun 2005 05:59:23 -0000 1.245
+++ src/eval.c 27 Jun 2005 21:32:36 -0000
@@ -890,10 +890,22 @@
}
+/* 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.
+ doc: /* Return 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). */)
+VARIABLE is considered to be a `user variable' if
+\(1) the first character of its documentation is `*', or
+\(2) it is customizable (its property list contains a non-nil value
+ of `standard-value' or `custom-autoload'), or
+\(3) it is an alias for another user variable.
+Return nil if VARIABLE is an alias and there is a loop in the
+chain of symbols. */)
(variable)
Lisp_Object variable;
@@ -904,21 +916,35 @@
return Qnil;
- documentation = Fget (variable, Qvariable_documentation);
- if (INTEGERP (documentation) && XINT (documentation) < 0)
- return Qt;
- if (STRINGP (documentation)
- && ((unsigned char) SREF (documentation, 0) == '*'))
- return Qt;
- /* If it is (STRING . INTEGER), a negative integer means a user variable. */
- if (CONSP (documentation)
- && STRINGP (XCAR (documentation))
- && INTEGERP (XCDR (documentation))
- && XINT (XCDR (documentation)) < 0)
- return Qt;
- /* Customizable? See `custom-variable-p'. */
- if ((!NILP (Fget (variable, intern ("standard-value"))))
- || (!NILP (Fget (variable, intern ("custom-autoload")))))
- return Qt;
- return Qnil;
+ /* If indirect and there's an alias loop, don't check anything else. */
+ if (XSYMBOL (variable)->indirect_variable
+ && NILP (internal_condition_case_1 (indirect_variable, variable,
+ Qt, user_variable_p_eh)))
+ return Qnil;
+
+ while (1)
+ {
+ documentation = Fget (variable, Qvariable_documentation);
+ if (INTEGERP (documentation) && XINT (documentation) < 0)
+ return Qt;
+ if (STRINGP (documentation)
+ && ((unsigned char) SREF (documentation, 0) == '*'))
+ return Qt;
+ /* If it is (STRING . INTEGER), a negative integer means a user
variable. */
+ if (CONSP (documentation)
+ && STRINGP (XCAR (documentation))
+ && INTEGERP (XCDR (documentation))
+ && XINT (XCDR (documentation)) < 0)
+ return Qt;
+ /* Customizable? See `custom-variable-p'. */
+ if ((!NILP (Fget (variable, intern ("standard-value"))))
+ || (!NILP (Fget (variable, intern ("custom-autoload")))))
+ return Qt;
+
+ if (!XSYMBOL (variable)->indirect_variable)
+ return Qnil;
+
+ /* An indirect variable? Let's follow the chain. */
+ variable = XSYMBOL (variable)->value;
+ }
}
\f
next prev parent reply other threads:[~2005-06-27 21:38 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-19 11:14 Documentation not clear for the Lisp function set-variable Yoni Rabkin
2005-06-20 3:50 ` Richard Stallman
2005-06-20 8:21 ` Yoni Rabkin
2005-06-20 9:07 ` Juanma Barranquero
2005-06-21 2:00 ` Richard Stallman
2005-06-26 23:23 ` Juri Linkov
2005-06-27 13:04 ` Juanma Barranquero
2005-06-27 15:44 ` Juanma Barranquero
2005-06-27 16:09 ` Luc Teirlinck
2005-06-27 18:17 ` Juanma Barranquero
2005-06-27 18:45 ` Luc Teirlinck
2005-06-27 19:30 ` Juanma Barranquero
2005-06-28 18:47 ` Richard M. Stallman
2005-07-04 1:18 ` Luc Teirlinck
2005-07-04 16:48 ` Richard M. Stallman
2005-07-04 17:02 ` David Kastrup
2005-07-05 1:42 ` Luc Teirlinck
2005-07-05 16:12 ` Richard M. Stallman
2005-07-07 1:54 ` Luc Teirlinck
2005-07-07 21:30 ` Richard M. Stallman
2005-06-28 0:07 ` Juri Linkov
2005-06-28 8:32 ` Juanma Barranquero
2005-06-28 23:45 ` Juri Linkov
2005-06-29 9:14 ` Juanma Barranquero
2005-06-29 23:57 ` Juri Linkov
2005-06-30 8:16 ` Juanma Barranquero
2005-06-30 16:55 ` Luc Teirlinck
2005-06-30 19:34 ` Juanma Barranquero
2005-07-01 23:57 ` Juri Linkov
2005-07-02 4:11 ` Luc Teirlinck
2005-06-28 18:47 ` Richard M. Stallman
2005-06-29 2:32 ` Juanma Barranquero
2005-06-29 20:42 ` Richard M. Stallman
2005-06-27 18:39 ` Eli Zaretskii
2005-06-27 18:49 ` Luc Teirlinck
2005-06-27 21:38 ` Juanma Barranquero [this message]
2005-06-28 4:37 ` Eli Zaretskii
2005-06-28 8:33 ` Juanma Barranquero
2005-06-28 4:17 ` Richard M. Stallman
2005-06-28 9:17 ` Juanma Barranquero
2005-06-28 9:26 ` Juanma Barranquero
2005-06-28 16:09 ` Stefan Monnier
2005-06-28 16:19 ` Juanma Barranquero
2005-06-29 3:43 ` Stefan Monnier
2005-06-29 9:18 ` Juanma Barranquero
2005-06-29 3:59 ` Richard M. Stallman
2005-06-27 16:46 ` Richard M. Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7ccd24b050627143848fe593@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).