From b4d3bc10dc84f6b01a2b6b215d0e489555aa6edd Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 9 Apr 2012 20:36:01 +0800 Subject: Remove defining user variables via * in docstring. * lisp/apropos.el (apropos-variable): * lisp/files-x.el (read-file-local-variable): * lisp/simple.el (set-variable): * lisp/woman.el (woman-mini-help): * lisp/emacs-lisp/byte-opt.el (side-effect-free-fns): Callers changed. * lisp/custom.el (custom-variable-p): Return nil for non-symbol arguments instead of signaling an error. (user-variable-p): Obsolete alias for custom-variable-p. * lisp/erc/erc.el (erc-cmd-SET): Call custom-variable-p instead of user-variable-p. * src/callint.c (Finteractive, Fcall_interactively): * src/minibuf.c (Fread_variable): Callers changed. * src/eval.c (Fuser_variable_p, user_variable_p_eh) (lisp_indirect_variable): Functions deleted. (Fdefvar): Caller changed. * doc/lispref/commands.texi (Interactive Codes): * doc/lispref/help.texi (Accessing Documentation): * doc/lispref/minibuf.texi (High-Level Completion): Callers changed. * doc/lispref/customize.texi (Variable Definitions): Remove user-variable-p. --- src/callint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/callint.c') diff --git a/src/callint.c b/src/callint.c index e09210f1bb6..96e2e10b9d5 100644 --- a/src/callint.c +++ b/src/callint.c @@ -97,7 +97,7 @@ r -- Region: point and mark as 2 numeric args, smallest first. Does no I/O. s -- Any string. Does not inherit the current input method. S -- Any symbol. U -- Mouse up event discarded by a previous k or K argument. -v -- Variable name: symbol that is user-variable-p. +v -- Variable name: symbol that is `custom-variable-p'. x -- Lisp expression read but not evaluated. X -- Lisp expression read and evaluated. z -- Coding system. @@ -748,7 +748,7 @@ invoke it. If KEYS is omitted or nil, the return value of break; case 'v': /* Variable name: symbol that is - user-variable-p. */ + custom-variable-p. */ args[i] = Fread_variable (callint_message, Qnil); visargs[i] = last_minibuf_string; break; -- cgit v1.2.1 From fb7ada5f94a71d73bf6cfad5cc87fe7fb26125a5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 9 Apr 2012 21:05:48 +0800 Subject: Remove * characters from the front of variable docstrings. --- src/callint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/callint.c') diff --git a/src/callint.c b/src/callint.c index 96e2e10b9d5..c70082e8ae0 100644 --- a/src/callint.c +++ b/src/callint.c @@ -945,7 +945,7 @@ may be set by the debugger as a reminder for itself. */); Vcommand_debug_status = Qnil; DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive, - doc: /* *Non-nil means you can use the mark even when inactive. + doc: /* Non-nil means you can use the mark even when inactive. This option makes a difference in Transient Mark mode. When the option is non-nil, deactivation of the mark turns off region highlighting, but commands that use the mark -- cgit v1.2.1