diff options
| author | Dmitry Antipov | 2013-08-07 17:21:59 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-07 17:21:59 +0400 |
| commit | d2a95ffb4eeed87b00c9ac1c8eec7d39b06226e5 (patch) | |
| tree | 5aed90856ab78eaa3ff59d5d42a043ab798fa5ac /src/buffer.c | |
| parent | 998ad848a4f1fd347fdbb1cf181035a0e174eddc (diff) | |
| download | emacs-d2a95ffb4eeed87b00c9ac1c8eec7d39b06226e5.tar.gz emacs-d2a95ffb4eeed87b00c9ac1c8eec7d39b06226e5.zip | |
Prefer selected_window to Fselected_window, likewise for frames.
* buffer.c (Fbuffer_swap_text):
* data.c (Fvariable_binding_locus):
* window.c (run_window_configuration_change_hook): Adjust users.
* w16select.c (Fw16_set_clipboard_data, Fw16_get_clipboard_data):
Use decode_live_frame.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 339175d9078..ce4b44c87c3 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2409,7 +2409,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, | |||
| 2409 | live window points to that window's buffer. So since we | 2409 | live window points to that window's buffer. So since we |
| 2410 | just swapped the markers between the two buffers, we need | 2410 | just swapped the markers between the two buffers, we need |
| 2411 | to undo the effect of this swap for window markers. */ | 2411 | to undo the effect of this swap for window markers. */ |
| 2412 | Lisp_Object w = Fselected_window (), ws = Qnil; | 2412 | Lisp_Object w = selected_window, ws = Qnil; |
| 2413 | Lisp_Object buf1, buf2; | 2413 | Lisp_Object buf1, buf2; |
| 2414 | XSETBUFFER (buf1, current_buffer); XSETBUFFER (buf2, other_buffer); | 2414 | XSETBUFFER (buf1, current_buffer); XSETBUFFER (buf2, other_buffer); |
| 2415 | 2415 | ||