diff options
| author | Eli Zaretskii | 2017-10-30 20:47:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-10-30 20:47:06 +0200 |
| commit | ee493663ba6571a5cb47c51e68aae679d94ee1f0 (patch) | |
| tree | 7cde323dd70be16de99d98cbddb01918e490dc52 /src | |
| parent | ca5eb0d0b77579d10be160a6e2c7a0dce2e4fbbd (diff) | |
| parent | d10c9479ca4d873a8bd09bb63ae865b4a953d5c8 (diff) | |
| download | emacs-ee493663ba6571a5cb47c51e68aae679d94ee1f0.tar.gz emacs-ee493663ba6571a5cb47c51e68aae679d94ee1f0.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index f08979e1320..9bb2c43a698 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5832,7 +5832,7 @@ by this function. This happens in an interactive call. */) | |||
| 5832 | } | 5832 | } |
| 5833 | 5833 | ||
| 5834 | DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, | 5834 | DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, |
| 5835 | doc: /* Return the window which was selected when entering the minibuffer. | 5835 | doc: /* Return window selected just before minibuffer window was selected. |
| 5836 | Return nil if the selected window is not a minibuffer window. */) | 5836 | Return nil if the selected window is not a minibuffer window. */) |
| 5837 | (void) | 5837 | (void) |
| 5838 | { | 5838 | { |