aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2005-05-26 14:56:28 +0000
committerJuanma Barranquero2005-05-26 14:56:28 +0000
commit6e604a9b7863a808d37791730767e080031491d1 (patch)
tree043e56a6fcf197cd8c6fb23d4a83605a4bb8ae2a /src
parentf8ab034e35f9f1acc1ca3f4a2401c67403472b9c (diff)
downloademacs-6e604a9b7863a808d37791730767e080031491d1.tar.gz
emacs-6e604a9b7863a808d37791730767e080031491d1.zip
(Frecursive_edit): Fix typo in docstring.
(Fposn_at_x_y): Make arguments match the docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/keyboard.c6
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5ae649cb301..ab05e235098 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-05-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * keyboard.c (Frecursive_edit): Fix typo in docstring.
4 (Fposn_at_x_y): Make argument name match its use in docstring.
5
12005-05-26 Lute Kamstra <lute@gnu.org> 62005-05-26 Lute Kamstra <lute@gnu.org>
2 7
3 * eval.c (Frun_hooks): Mention run-mode-hooks in docstring. 8 * eval.c (Frun_hooks): Mention run-mode-hooks in docstring.
@@ -30,9 +35,9 @@
30 35
312005-05-23 Masatake YAMATO <jet@gyve.org> 362005-05-23 Masatake YAMATO <jet@gyve.org>
32 37
33 * xdisp.c (note_mode_line_or_margin_highlight): Added code 38 * xdisp.c (note_mode_line_or_margin_highlight): Add code
34 for mouse-face. Change the type of the first argument from `window' 39 for mouse-face. Change the type of the first argument from `window'
35 to `List_Object'. 40 to `Lisp_Object'.
36 (note_mouse_highlight): Call note_mode_line_or_margin_highlight with 41 (note_mouse_highlight): Call note_mode_line_or_margin_highlight with
37 window instead of w. 42 window instead of w.
38 43
diff --git a/src/keyboard.c b/src/keyboard.c
index 22da49907c7..baba3c466d2 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1020,7 +1020,7 @@ DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
1020 doc: /* Invoke the editor command loop recursively. 1020 doc: /* Invoke the editor command loop recursively.
1021To get out of the recursive edit, a command can do `(throw 'exit nil)'; 1021To get out of the recursive edit, a command can do `(throw 'exit nil)';
1022that tells this function to return. 1022that tells this function to return.
1023Alternately, `(throw 'exit t)' makes this function signal an error. 1023Alternatively, `(throw 'exit t)' makes this function signal an error.
1024This function is called by the editor initialization to begin editing. */) 1024This function is called by the editor initialization to begin editing. */)
1025 () 1025 ()
1026{ 1026{
@@ -10548,7 +10548,7 @@ The elements of this list correspond to the arguments of
10548DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0, 10548DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0,
10549 doc: /* Return position information for pixel coordinates X and Y. 10549 doc: /* Return position information for pixel coordinates X and Y.
10550By default, X and Y are relative to text area of the selected window. 10550By default, X and Y are relative to text area of the selected window.
10551Optional third arg FRAME_OR_WINDOW non-nil specifies frame or window. 10551Optional third arg FRAME-OR-WINDOW non-nil specifies frame or window.
10552If optional fourth arg WHOLE is non-nil, X is relative to the left 10552If optional fourth arg WHOLE is non-nil, X is relative to the left
10553edge of the window. 10553edge of the window.
10554 10554
@@ -10848,7 +10848,7 @@ syms_of_keyboard ()
10848 staticpro (&Qdrag_n_drop); 10848 staticpro (&Qdrag_n_drop);
10849 10849
10850 Qsave_session = intern ("save-session"); 10850 Qsave_session = intern ("save-session");
10851 staticpro(&Qsave_session); 10851 staticpro (&Qsave_session);
10852 10852
10853 Qusr1_signal = intern ("usr1-signal"); 10853 Qusr1_signal = intern ("usr1-signal");
10854 staticpro (&Qusr1_signal); 10854 staticpro (&Qusr1_signal);