aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2006-09-25 15:28:58 +0000
committerChong Yidong2006-09-25 15:28:58 +0000
commit2a95a27c8e3ae638e23b0c84a4fff9b490345575 (patch)
tree3ad232e0c0d7c05d0c343100d277d289da91e16e /src
parent84c67c0fb145f9d627820b65d6f5d4fb51456703 (diff)
downloademacs-2a95a27c8e3ae638e23b0c84a4fff9b490345575.tar.gz
emacs-2a95a27c8e3ae638e23b0c84a4fff9b490345575.zip
* callint.c (Fcall_interactively): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/callint.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b4e290044f7..5ba3aa07a65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-09-25 Chong Yidong <cyd@stupidchicken.com>
2
3 * callint.c (Fcall_interactively): Doc fix.
4
12006-09-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52006-09-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * macterm.c (x_underline_at_descent_line): New variable. 7 * macterm.c (x_underline_at_descent_line): New variable.
diff --git a/src/callint.c b/src/callint.c
index 4c8a5718cd9..392b6f00eec 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -257,9 +257,11 @@ See `interactive'.
257Optional second arg RECORD-FLAG non-nil 257Optional second arg RECORD-FLAG non-nil
258means unconditionally put this command in the command-history. 258means unconditionally put this command in the command-history.
259Otherwise, this is done only if an arg is read using the minibuffer. 259Otherwise, this is done only if an arg is read using the minibuffer.
260
260Optional third arg KEYS, if given, specifies the sequence of events to 261Optional third arg KEYS, if given, specifies the sequence of events to
261supply if the command inquires which events were used to invoke it. 262supply, as a vector, if the command inquires which events were used to
262If KEYS is omitted or nil, the return value of `this-command-keys' is used. */) 263invoke it. If KEYS is omitted or nil, the return value of
264`this-command-keys-vector' is used. */)
263 (function, record_flag, keys) 265 (function, record_flag, keys)
264 Lisp_Object function, record_flag, keys; 266 Lisp_Object function, record_flag, keys;
265{ 267{