diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
| commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
| tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /src/callint.c | |
| parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
| parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
| download | emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz | |
Merge from trunk; add Bug#.
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callint.c b/src/callint.c index e09210f1bb6..c70082e8ae0 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; @@ -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 |