summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-09-28 02:59:28 +0200
committerJuanma Barranquero <lekktu@gmail.com>2011-09-28 02:59:28 +0200
commita239d4e9c0e6fe9fab01e24212fb1dbb158c0a53 (patch)
tree4681de90248ac2638553a48df80ef5d2f24200d7
parent806b00cb5f5034343709319bc217059fa382df19 (diff)
downloademacs-a239d4e9c0e6fe9fab01e24212fb1dbb158c0a53.tar.gz
Fix typos.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/windows.texi6
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/ChangeLog.132
-rw-r--r--lisp/net/quickurl.el4
-rw-r--r--lisp/subr.el2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.92
-rw-r--r--src/lread.c2
10 files changed, 24 insertions, 10 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 423e052068b..afd32ad4ebe 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-28 Juanma Barranquero <lekktu@gmail.com>
+
+ * windows.texi (Splitting Windows): Fix typos.
+
2011-09-25 Martin Rudalics <rudalics@gmx.at>
* windows.texi (Windows and Frames, Display Action Functions)
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 96d489d1203..6a7206f459d 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1178,7 +1178,7 @@ equivalently, @code{(split-window W3 -8 'left)} should now produce the
penultimate configuration from the previous scenario from where we can
continue as described before.
- Another strategy starts with splitting an inital window @code{W6} by
+ Another strategy starts with splitting an initial window @code{W6} by
evaluating @code{(split-window W6 nil nil t)} with the following result:
@smallexample
@group
@@ -1259,11 +1259,11 @@ configuration.
@defopt window-splits
If this variable is nil, the function @code{split-window} can split a
window if and only if that window's screen estate is sufficiently large
-to accomodate both--itself and the new window.
+to accommodate both--itself and the new window.
If this variable is non-@code{nil}, @code{split-window} tries to resize
all windows that are part of the same combination as the old window to
-accomodate the new window. Hence, the new window can be also created if
+accommodate the new window. Hence, the new window can be also created if
the old window is of fixed size or too small to split (@pxref{Window
Sizes}).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdf4522c4f5..4d1f762dd26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28 Juanma Barranquero <lekktu@gmail.com>
+
+ * subr.el (with-output-to-temp-buffer):
+ * net/quickurl.el (quickurl, quickurl-browse-url):
+ Fix typos in docstrings.
+
2011-09-27 Eli Zaretskii <eliz@gnu.org>
* minibuffer.el (completion-styles)
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 8cbe1ad5776..993c51163cb 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -1743,7 +1743,7 @@
auto-composition-function to it.
(toggle-auto-composition): New function.
- * international/characters.el: Make all chararacters in the
+ * international/characters.el: Make all characters in the
charset tibetan to tibetan script.
* international/mule-conf.el (tibetan): Fix :code-space property.
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 712f0b0c924..3f1437f0799 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -307,7 +307,7 @@ Also display a `message' saying what the URL was unless SILENT is non-nil."
"Insert a URL based on LOOKUP.
If not supplied LOOKUP is taken to be the word at point in the current
-buffer, this default action can be modifed via
+buffer, this default action can be modified via
`quickurl-grab-lookup-function'."
(interactive)
(when (or lookup
@@ -402,7 +402,7 @@ is decided."
"Browse the URL associated with LOOKUP.
If not supplied LOOKUP is taken to be the word at point in the
-current buffer, this default action can be modifed via
+current buffer, this default action can be modified via
`quickurl-grab-lookup-function'."
(interactive)
(when (or lookup
diff --git a/lisp/subr.el b/lisp/subr.el
index 1aa714fa883..4946f3eef7a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3002,7 +3002,7 @@ Instead it binds `standard-output' to that buffer, so that output
generated with `prin1' and similar functions in BODY goes into
the buffer.
-At the end of BODY, this marks buffer BUFNAME unmodifed and displays
+At the end of BODY, this marks buffer BUFNAME unmodified and displays
it in a window, but does not select it. The normal way to do this is
by calling `display-buffer', then running `temp-buffer-show-hook'.
However, if `temp-buffer-show-function' is non-nil, it calls that
diff --git a/src/ChangeLog b/src/ChangeLog
index dd2e7256476..c6a321de2dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-28 Juanma Barranquero <lekktu@gmail.com>
+
+ * lread.c (Fread_from_string): Fix typo in docstring.
+
2011-09-27 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (handle_invisible_prop): If invisible text ends on a
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index b64736459c8..0a9df7d1aee 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4547,7 +4547,7 @@
* composite.c (composition_compute_stop_pos): In forward search,
pay attention to the possibility that some character after ENDPOS
- will be composed with charactrs before ENDPOS.
+ will be composed with characters before ENDPOS.
2010-08-24 Chong Yidong <cyd@stupidchicken.com>
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index f25434087c1..ceec5da3296 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -10460,7 +10460,7 @@
(Fkey_description): Likewise.
* lread.c (read1): On reading multibyte string, be sure to make
- all 8-bit chararacters in valid multibyte form.
+ all 8-bit characters in valid multibyte form.
(readchar): Use FETCH_STRING_CHAR_ADVANCE unconditionally.
* print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE
diff --git a/src/lread.c b/src/lread.c
index 241b1e41c94..af737d27070 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1966,7 +1966,7 @@ DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
doc: /* Read one Lisp expression which is represented as text by STRING.
Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).
FINAL-STRING-INDEX is an integer giving the position of the next
- remaining chararacter in STRING.
+ remaining character in STRING.
START and END optionally delimit a substring of STRING from which to read;
they default to 0 and (length STRING) respectively. */)
(Lisp_Object string, Lisp_Object start, Lisp_Object end)