diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:21:17 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:21:17 -0300 |
| commit | 411c1c65313aa4e22730ba9762e073881f4e299a (patch) | |
| tree | 14833e398a5ce64db5124afafe992d47e51b70e8 /doc/lispref/windows.texi | |
| parent | c3c51ec274f423cf8044cd5b9bc0bbc5bda1f6aa (diff) | |
| parent | 216c6aadf22bfb9d209b6ce9a469499fd6e1b78f (diff) | |
| download | emacs-411c1c65313aa4e22730ba9762e073881f4e299a.tar.gz | |
Merge from origin/emacs-24
216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623
Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/functions.texi
lisp/ChangeLog
src/ChangeLog
src/xterm.c
test/ChangeLog
Diffstat (limited to 'doc/lispref/windows.texi')
| -rw-r--r-- | doc/lispref/windows.texi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 7c8d0b084b5..a172a4a4d87 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1252,6 +1252,8 @@ are the opposite of what they are in those other functions. @node Recombining Windows @section Recombining Windows +@cindex recombining windows +@cindex windows, recombining When deleting the last sibling of a window @var{W}, its parent window is deleted too, with @var{W} replacing it in the window tree. This |