diff options
| author | Juanma Barranquero | 2011-09-28 02:59:28 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-09-28 02:59:28 +0200 |
| commit | a239d4e9c0e6fe9fab01e24212fb1dbb158c0a53 (patch) | |
| tree | 4681de90248ac2638553a48df80ef5d2f24200d7 | |
| parent | 806b00cb5f5034343709319bc217059fa382df19 (diff) | |
| download | emacs-a239d4e9c0e6fe9fab01e24212fb1dbb158c0a53.tar.gz emacs-a239d4e9c0e6fe9fab01e24212fb1dbb158c0a53.zip | |
Fix typos.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 6 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/ChangeLog.13 | 2 | ||||
| -rw-r--r-- | lisp/net/quickurl.el | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/ChangeLog.11 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.9 | 2 | ||||
| -rw-r--r-- | src/lread.c | 2 |
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 @@ | |||
| 1 | 2011-09-28 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * windows.texi (Splitting Windows): Fix typos. | ||
| 4 | |||
| 1 | 2011-09-25 Martin Rudalics <rudalics@gmx.at> | 5 | 2011-09-25 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * windows.texi (Windows and Frames, Display Action Functions) | 7 | * 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 | |||
| 1178 | penultimate configuration from the previous scenario from where we can | 1178 | penultimate configuration from the previous scenario from where we can |
| 1179 | continue as described before. | 1179 | continue as described before. |
| 1180 | 1180 | ||
| 1181 | Another strategy starts with splitting an inital window @code{W6} by | 1181 | Another strategy starts with splitting an initial window @code{W6} by |
| 1182 | evaluating @code{(split-window W6 nil nil t)} with the following result: | 1182 | evaluating @code{(split-window W6 nil nil t)} with the following result: |
| 1183 | @smallexample | 1183 | @smallexample |
| 1184 | @group | 1184 | @group |
| @@ -1259,11 +1259,11 @@ configuration. | |||
| 1259 | @defopt window-splits | 1259 | @defopt window-splits |
| 1260 | If this variable is nil, the function @code{split-window} can split a | 1260 | If this variable is nil, the function @code{split-window} can split a |
| 1261 | window if and only if that window's screen estate is sufficiently large | 1261 | window if and only if that window's screen estate is sufficiently large |
| 1262 | to accomodate both--itself and the new window. | 1262 | to accommodate both--itself and the new window. |
| 1263 | 1263 | ||
| 1264 | If this variable is non-@code{nil}, @code{split-window} tries to resize | 1264 | If this variable is non-@code{nil}, @code{split-window} tries to resize |
| 1265 | all windows that are part of the same combination as the old window to | 1265 | all windows that are part of the same combination as the old window to |
| 1266 | accomodate the new window. Hence, the new window can be also created if | 1266 | accommodate the new window. Hence, the new window can be also created if |
| 1267 | the old window is of fixed size or too small to split (@pxref{Window | 1267 | the old window is of fixed size or too small to split (@pxref{Window |
| 1268 | Sizes}). | 1268 | Sizes}). |
| 1269 | 1269 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bdf4522c4f5..4d1f762dd26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-09-28 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * subr.el (with-output-to-temp-buffer): | ||
| 4 | * net/quickurl.el (quickurl, quickurl-browse-url): | ||
| 5 | Fix typos in docstrings. | ||
| 6 | |||
| 1 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> | 7 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * minibuffer.el (completion-styles) | 9 | * 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 @@ | |||
| 1743 | auto-composition-function to it. | 1743 | auto-composition-function to it. |
| 1744 | (toggle-auto-composition): New function. | 1744 | (toggle-auto-composition): New function. |
| 1745 | 1745 | ||
| 1746 | * international/characters.el: Make all chararacters in the | 1746 | * international/characters.el: Make all characters in the |
| 1747 | charset tibetan to tibetan script. | 1747 | charset tibetan to tibetan script. |
| 1748 | 1748 | ||
| 1749 | * international/mule-conf.el (tibetan): Fix :code-space property. | 1749 | * 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." | |||
| 307 | "Insert a URL based on LOOKUP. | 307 | "Insert a URL based on LOOKUP. |
| 308 | 308 | ||
| 309 | If not supplied LOOKUP is taken to be the word at point in the current | 309 | If not supplied LOOKUP is taken to be the word at point in the current |
| 310 | buffer, this default action can be modifed via | 310 | buffer, this default action can be modified via |
| 311 | `quickurl-grab-lookup-function'." | 311 | `quickurl-grab-lookup-function'." |
| 312 | (interactive) | 312 | (interactive) |
| 313 | (when (or lookup | 313 | (when (or lookup |
| @@ -402,7 +402,7 @@ is decided." | |||
| 402 | "Browse the URL associated with LOOKUP. | 402 | "Browse the URL associated with LOOKUP. |
| 403 | 403 | ||
| 404 | If not supplied LOOKUP is taken to be the word at point in the | 404 | If not supplied LOOKUP is taken to be the word at point in the |
| 405 | current buffer, this default action can be modifed via | 405 | current buffer, this default action can be modified via |
| 406 | `quickurl-grab-lookup-function'." | 406 | `quickurl-grab-lookup-function'." |
| 407 | (interactive) | 407 | (interactive) |
| 408 | (when (or lookup | 408 | (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 | |||
| 3002 | generated with `prin1' and similar functions in BODY goes into | 3002 | generated with `prin1' and similar functions in BODY goes into |
| 3003 | the buffer. | 3003 | the buffer. |
| 3004 | 3004 | ||
| 3005 | At the end of BODY, this marks buffer BUFNAME unmodifed and displays | 3005 | At the end of BODY, this marks buffer BUFNAME unmodified and displays |
| 3006 | it in a window, but does not select it. The normal way to do this is | 3006 | it in a window, but does not select it. The normal way to do this is |
| 3007 | by calling `display-buffer', then running `temp-buffer-show-hook'. | 3007 | by calling `display-buffer', then running `temp-buffer-show-hook'. |
| 3008 | However, if `temp-buffer-show-function' is non-nil, it calls that | 3008 | 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 @@ | |||
| 1 | 2011-09-28 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * lread.c (Fread_from_string): Fix typo in docstring. | ||
| 4 | |||
| 1 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (handle_invisible_prop): If invisible text ends on a | 7 | * 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 @@ | |||
| 4547 | 4547 | ||
| 4548 | * composite.c (composition_compute_stop_pos): In forward search, | 4548 | * composite.c (composition_compute_stop_pos): In forward search, |
| 4549 | pay attention to the possibility that some character after ENDPOS | 4549 | pay attention to the possibility that some character after ENDPOS |
| 4550 | will be composed with charactrs before ENDPOS. | 4550 | will be composed with characters before ENDPOS. |
| 4551 | 4551 | ||
| 4552 | 2010-08-24 Chong Yidong <cyd@stupidchicken.com> | 4552 | 2010-08-24 Chong Yidong <cyd@stupidchicken.com> |
| 4553 | 4553 | ||
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 @@ | |||
| 10460 | (Fkey_description): Likewise. | 10460 | (Fkey_description): Likewise. |
| 10461 | 10461 | ||
| 10462 | * lread.c (read1): On reading multibyte string, be sure to make | 10462 | * lread.c (read1): On reading multibyte string, be sure to make |
| 10463 | all 8-bit chararacters in valid multibyte form. | 10463 | all 8-bit characters in valid multibyte form. |
| 10464 | (readchar): Use FETCH_STRING_CHAR_ADVANCE unconditionally. | 10464 | (readchar): Use FETCH_STRING_CHAR_ADVANCE unconditionally. |
| 10465 | 10465 | ||
| 10466 | * print.c (print_object): Use FETCH_STRING_CHAR_ADVANCE | 10466 | * 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, | |||
| 1966 | doc: /* Read one Lisp expression which is represented as text by STRING. | 1966 | doc: /* Read one Lisp expression which is represented as text by STRING. |
| 1967 | Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). | 1967 | Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). |
| 1968 | FINAL-STRING-INDEX is an integer giving the position of the next | 1968 | FINAL-STRING-INDEX is an integer giving the position of the next |
| 1969 | remaining chararacter in STRING. | 1969 | remaining character in STRING. |
| 1970 | START and END optionally delimit a substring of STRING from which to read; | 1970 | START and END optionally delimit a substring of STRING from which to read; |
| 1971 | they default to 0 and (length STRING) respectively. */) | 1971 | they default to 0 and (length STRING) respectively. */) |
| 1972 | (Lisp_Object string, Lisp_Object start, Lisp_Object end) | 1972 | (Lisp_Object string, Lisp_Object start, Lisp_Object end) |