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/data.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/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index ef3a6965779..9f4bd1f1c02 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1975,7 +1975,7 @@ If the current binding is global (the default), the value is nil. */) | |||
| 1975 | { | 1975 | { |
| 1976 | union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); | 1976 | union Lisp_Fwd *valcontents = SYMBOL_FWD (sym); |
| 1977 | if (KBOARD_OBJFWDP (valcontents)) | 1977 | if (KBOARD_OBJFWDP (valcontents)) |
| 1978 | return Fframe_terminal (Fselected_frame ()); | 1978 | return Fframe_terminal (selected_frame); |
| 1979 | else if (!BUFFER_OBJFWDP (valcontents)) | 1979 | else if (!BUFFER_OBJFWDP (valcontents)) |
| 1980 | return Qnil; | 1980 | return Qnil; |
| 1981 | } | 1981 | } |