aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-02-17 22:35:21 -0800
committerGlenn Morris2010-02-17 22:35:21 -0800
commit2a4f8d3d5707e6b768af02c1b970c4a7a2c3eaae (patch)
tree97dc2cc4136073d70672e11597f7ee00e3914b77
parentd9aa39cc6e22da67a6a0c520e9ea1e620ac55bbd (diff)
downloademacs-2a4f8d3d5707e6b768af02c1b970c4a7a2c3eaae.tar.gz
emacs-2a4f8d3d5707e6b768af02c1b970c4a7a2c3eaae.zip
* callint.c (Finteractive): Doc fix.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/callint.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d06237d7a04..22647f3977d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-02-18 Glenn Morris <rgm@gnu.org>
2
3 * callint.c (Finteractive): Doc fix.
4
12010-02-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) 52010-02-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change)
2 6
3 * coding.c (record_conversion_result): Handle 7 * coding.c (record_conversion_result): Handle
diff --git a/src/callint.c b/src/callint.c
index 2c6ab983de2..a45f8a372b8 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -127,7 +127,7 @@ If the string begins with `@', Emacs searches the key sequence which
127 invoked the command for its first mouse click (or any other event 127 invoked the command for its first mouse click (or any other event
128 which specifies a window). 128 which specifies a window).
129If the string begins with `^' and `shift-select-mode' is non-nil, 129If the string begins with `^' and `shift-select-mode' is non-nil,
130 Emacs first calls the function `handle-shift-select'. 130 Emacs first calls the function `handle-shift-selection'.
131You may use `@', `*', and `^' together. They are processed in the 131You may use `@', `*', and `^' together. They are processed in the
132 order that they appear, before reading any arguments. 132 order that they appear, before reading any arguments.
133usage: (interactive &optional ARGS) */) 133usage: (interactive &optional ARGS) */)