aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-13 13:50:12 +0200
committerJuanma Barranquero2011-04-13 13:50:12 +0200
commit7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31 (patch)
treee131fa1805a8201a25261336aa8846a57c321cfe /doc
parent300f9fca551d3aa024ff24b85e6ab7f0ae49ae03 (diff)
downloademacs-7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31.tar.gz
emacs-7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31.zip
Fix typos.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/mini.texi2
-rw-r--r--doc/emacs/screen.texi2
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/windows.texi2
5 files changed, 12 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index edd66bddfdf..4923316c4db 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12011-04-13 Juanma Barranquero <lekktu@gmail.com>
2
3 * mini.texi (Minibuffer Edit):
4 * screen.texi (Mode Line): Fix typo.
5
12011-03-26 Chong Yidong <cyd@stupidchicken.com> 62011-03-26 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion. 8 * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion.
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index bf7e4469dd9..b7bda61e238 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -165,7 +165,7 @@ however: for instance, you cannot split it. @xref{Windows}.
165@vindex resize-mini-windows 165@vindex resize-mini-windows
166 Normally, the minibuffer window occupies a single screen line. 166 Normally, the minibuffer window occupies a single screen line.
167However, if you add two or more lines' worth of text into the 167However, if you add two or more lines' worth of text into the
168minibuffer, it expands automatically to accomodate the text. The 168minibuffer, it expands automatically to accommodate the text. The
169variable @code{resize-mini-windows} controls the resizing of the 169variable @code{resize-mini-windows} controls the resizing of the
170minibuffer. The default value is @code{grow-only}, which means the 170minibuffer. The default value is @code{grow-only}, which means the
171behavior we have just described. If the value is @code{t}, the 171behavior we have just described. If the value is @code{t}, the
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index c3b2e178278..f12c03e1abf 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -260,7 +260,7 @@ the buffer. Minor modes are optional editing modes that provide
260additional features on top of the major mode. @xref{Minor Modes}. 260additional features on top of the major mode. @xref{Minor Modes}.
261 261
262 Some features are listed together with the minor modes whenever they 262 Some features are listed together with the minor modes whenever they
263are turned on, even through they are not really minor modes. 263are turned on, even though they are not really minor modes.
264@samp{Narrow} means that the buffer being displayed has editing 264@samp{Narrow} means that the buffer being displayed has editing
265restricted to only a portion of its text (@pxref{Narrowing}). 265restricted to only a portion of its text (@pxref{Narrowing}).
266@samp{Def} means that a keyboard macro is currently being defined 266@samp{Def} means that a keyboard macro is currently being defined
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 035fee67f8d..fc57e20e612 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12011-04-13 Juanma Barranquero <lekktu@gmail.com>
2
3 * windows.texi (Choosing Window): Fix typo.
4
12011-04-10 Chong Yidong <cyd@stupidchicken.com> 52011-04-10 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * frames.texi (Layout Parameters): Note the difference between 7 * frames.texi (Layout Parameters): Note the difference between
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 77fd44fb162..f17fc3c718b 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1015,7 +1015,7 @@ a window only if the space taken up by that window can accommodate two
1015windows one above the other that are both at least 1015windows one above the other that are both at least
1016@code{window-min-height} lines tall. Moreover, if the window that shall 1016@code{window-min-height} lines tall. Moreover, if the window that shall
1017be split has a mode line, @code{split-window-sensibly} does not split 1017be split has a mode line, @code{split-window-sensibly} does not split
1018the window unless the new window can accomodate a mode line too. 1018the window unless the new window can accommodate a mode line too.
1019@end defopt 1019@end defopt
1020 1020
1021@defopt split-width-threshold 1021@defopt split-width-threshold