aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-07-30 21:53:28 +0800
committerXue Fuqiao2013-07-30 21:53:28 +0800
commit3cd51eaa039f2b954cc3fd5b325d0c2102643f04 (patch)
treef9cb139d82ce1fa3e43c89ff6e24339fc264a4b3
parentbee6a2c7dcc15d14961b2bc164ea91dfa178042d (diff)
downloademacs-3cd51eaa039f2b954cc3fd5b325d0c2102643f04.tar.gz
emacs-3cd51eaa039f2b954cc3fd5b325d0c2102643f04.zip
Doc fix.
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/windows.texi6
-rw-r--r--lisp/ChangeLog8
3 files changed, 9 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7ac907d6b95..38262f05355 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,7 +1,7 @@
12013-07-30 Xue Fuqiao <xfq.free@gmail.com> 12013-07-30 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * windows.texi (Window History): Mention the default value of 3 * windows.texi (Window History): Mention the default value of
4 switch-to-visible-buffer. 4 switch-to-visible-buffer. Add cross-references.
5 5
62013-07-24 Michael Albinus <michael.albinus@gmx.de> 62013-07-24 Michael Albinus <michael.albinus@gmx.de>
7 7
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index a6281bcc4d6..51a52218633 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2244,8 +2244,9 @@ window and defaults to the selected one.
2244 2244
2245Each list element has the form @code{(@var{buffer} @var{window-start} 2245Each list element has the form @code{(@var{buffer} @var{window-start}
2246@var{window-pos})}, where @var{buffer} is a buffer previously shown in 2246@var{window-pos})}, where @var{buffer} is a buffer previously shown in
2247the window, @var{window-start} is the window start position when that 2247the window, @var{window-start} is the window start position
2248buffer was last shown, and @var{window-pos} is the point position when 2248(@pxref{Window Start and End}) when that buffer was last shown, and
2249@var{window-pos} is the point position (@pxref{Window Point}) when
2249that buffer was last shown in @var{window}. 2250that buffer was last shown in @var{window}.
2250 2251
2251The list is ordered so that earlier elements correspond to more 2252The list is ordered so that earlier elements correspond to more
@@ -2363,6 +2364,7 @@ showing another buffer in that frame's only window. The function
2363@code{replace-buffer-in-windows} (@pxref{Buffers and Windows}) which is 2364@code{replace-buffer-in-windows} (@pxref{Buffers and Windows}) which is
2364called when a buffer gets killed, deletes the window in case (1) and 2365called when a buffer gets killed, deletes the window in case (1) and
2365behaves like @code{delete-windows-on} otherwise. 2366behaves like @code{delete-windows-on} otherwise.
2367@c FIXME: Does replace-buffer-in-windows _delete_ a window in case (1)?
2366 2368
2367 When @code{bury-buffer} (@pxref{The Buffer List}) operates on the 2369 When @code{bury-buffer} (@pxref{The Buffer List}) operates on the
2368selected window (which shows the buffer that shall be buried), it 2370selected window (which shows the buffer that shall be buried), it
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 590c3549c62..4f63206212c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,11 +3,11 @@
3 * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'. Use `*vc*' 3 * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'. Use `*vc*'
4 buffer for output. 4 buffer for output.
5 5
6 * vc/vc-hg.el (vc-hg-ignore): Remove `interactive'; do not assume 6 * vc/vc-hg.el (vc-hg-ignore): Remove `interactive'. Do not assume
7 point-min==1; fix search string; fix parentheses missing. 7 point-min==1. Fix search string. Fix parentheses missing.
8 8
9 * vc/vc-git.el (vc-git-ignore): Remove `interactive'; do not 9 * vc/vc-git.el (vc-git-ignore): Remove `interactive'. Do not
10 assume point-min==1; fix search string; fix parentheses missing. 10 assume point-min==1. Fix search string. Fix parentheses missing.
11 11
12 * vc/vc-cvs.el (vc-cvs-ignore): Remove `interactive'. 12 * vc/vc-cvs.el (vc-cvs-ignore): Remove `interactive'.
13 13