diff options
| author | Stefan Kangas | 2022-12-24 06:30:29 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-12-24 06:30:29 +0100 |
| commit | 8fcedd81ab665a89f03d664a3c71308b5980604a (patch) | |
| tree | 499362fda7e7750cb8e408befa0bcdf1a190a3c4 /src | |
| parent | ed0414de60ddfca4f446b29f20fe6a610d130adc (diff) | |
| parent | 9a3b08061feea14d6f37685ca1ab8801758bfd1c (diff) | |
| download | emacs-8fcedd81ab665a89f03d664a3c71308b5980604a.tar.gz emacs-8fcedd81ab665a89f03d664a3c71308b5980604a.zip | |
Merge from origin/emacs-29
9a3b08061fe Fix ruby-mode.el local command injection vulnerability (b...
4b44a395b3c ; * etc/NEWS: Fix typos.
458e1752701 Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...
eccb813a943 Fix "C-h k" in recursive minibuffers
6dda2106ece ; Improve documentation of "C-x @"
a0738e8ad13 ; * etc/NEWS: Announce the new behavior of 'C-h f'. (Bug...
86b11981b0d Update Tramp version (don't merge with master)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 90fa6ac2dfe..cd43919a7d8 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1649,7 +1649,8 @@ check_window_containing (struct window *w, void *user_data) | |||
| 1649 | set *PART to the id of that element. | 1649 | set *PART to the id of that element. |
| 1650 | 1650 | ||
| 1651 | If there is no window under X, Y return nil and leave *PART | 1651 | If there is no window under X, Y return nil and leave *PART |
| 1652 | unmodified. TOOL_BAR_P means detect tool-bar windows. | 1652 | unmodified. TOOL_BAR_P means detect tool-bar windows, and |
| 1653 | TAB_BAR_P means detect tab-bar windows. | ||
| 1653 | 1654 | ||
| 1654 | This function was previously implemented with a loop cycling over | 1655 | This function was previously implemented with a loop cycling over |
| 1655 | windows with Fnext_window, and starting with the frame's selected | 1656 | windows with Fnext_window, and starting with the frame's selected |