diff options
| author | Paul Eggert | 2013-08-15 22:15:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-08-15 22:15:51 -0700 |
| commit | 526e5233cc0e2375798bdc79329a893302fdfb4b (patch) | |
| tree | a4c1d95440225335cd6864a23e6fa1f6c5d6b28b | |
| parent | c8068af56770f8b0be93218e76dd17ea508f3365 (diff) | |
| download | emacs-526e5233cc0e2375798bdc79329a893302fdfb4b.tar.gz emacs-526e5233cc0e2375798bdc79329a893302fdfb4b.zip | |
Spelling fixes.
| -rw-r--r-- | doc/lispref/display.texi | 2 | ||||
| -rw-r--r-- | doc/misc/eieio.texi | 2 | ||||
| -rw-r--r-- | doc/misc/todo-mode.texi | 22 | ||||
| -rw-r--r-- | etc/refcards/Makefile | 2 | ||||
| -rw-r--r-- | lisp/desktop.el | 6 | ||||
| -rw-r--r-- | lisp/frameset.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 12 | ||||
| -rw-r--r-- | src/decompress.c | 2 | ||||
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
10 files changed, 27 insertions, 27 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 0f296bf31c5..ff9d98170d1 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -4667,7 +4667,7 @@ the aspect ratio. | |||
| 4667 | @item :format | 4667 | @item :format |
| 4668 | ImageMagick tries to auto-detect the image type, but it isn't always | 4668 | ImageMagick tries to auto-detect the image type, but it isn't always |
| 4669 | able to. By using @code{:format-type}, we can give ImageMagick a hint | 4669 | able to. By using @code{:format-type}, we can give ImageMagick a hint |
| 4670 | to try to help it. It's used in conjuction with the | 4670 | to try to help it. It's used in conjunction with the |
| 4671 | @code{image-format-suffixes} variable, which provides a mapping from | 4671 | @code{image-format-suffixes} variable, which provides a mapping from |
| 4672 | content types to file name suffixes. This is then given to | 4672 | content types to file name suffixes. This is then given to |
| 4673 | ImageMagick as a file name hint. | 4673 | ImageMagick as a file name hint. |
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index c8e8fb6d2e2..e199417aa9d 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi | |||
| @@ -256,7 +256,7 @@ concepts. Therefore, it is highly recommended to learn these from a | |||
| 256 | textbook or tutorial first, especially if you only know OOP from | 256 | textbook or tutorial first, especially if you only know OOP from |
| 257 | languages like C++ or Java. If on the other hand you are already | 257 | languages like C++ or Java. If on the other hand you are already |
| 258 | familiar with CLOS, you should be aware that @eieio{} does not implement | 258 | familiar with CLOS, you should be aware that @eieio{} does not implement |
| 259 | the full CLOS specificiation and also differs in some other aspects | 259 | the full CLOS specification and also differs in some other aspects |
| 260 | (@xref{Introduction}, and @ref{CLOS compatibility}). | 260 | (@xref{Introduction}, and @ref{CLOS compatibility}). |
| 261 | 261 | ||
| 262 | A @dfn{class} is a definition for organizing data and methods | 262 | A @dfn{class} is a definition for organizing data and methods |
diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi index 27ec68cdf05..a622298ba12 100644 --- a/doc/misc/todo-mode.texi +++ b/doc/misc/todo-mode.texi | |||
| @@ -433,7 +433,7 @@ visiting any of these files, the command also rename them accordingly. | |||
| 433 | 433 | ||
| 434 | @item F k | 434 | @item F k |
| 435 | Delete the current todo file (@code{todo-delete-file}).@footnote{The key | 435 | Delete the current todo file (@code{todo-delete-file}).@footnote{The key |
| 436 | binding of this command is mnenomic for ``kill'' to parallel the binding | 436 | binding of this command is mnemonic for ``kill'' to parallel the binding |
| 437 | @kbd{k} for item deletion, since @kbd{d} is bound to another item | 437 | @kbd{k} for item deletion, since @kbd{d} is bound to another item |
| 438 | editing command (@pxref{Done Items}).} If the todo file has an archive | 438 | editing command (@pxref{Done Items}).} If the todo file has an archive |
| 439 | (@pxref{Todo Archive Mode}), prompt whether to delete that as well. | 439 | (@pxref{Todo Archive Mode}), prompt whether to delete that as well. |
| @@ -496,7 +496,7 @@ and adds the category. | |||
| 496 | 496 | ||
| 497 | @item C k | 497 | @item C k |
| 498 | Delete the current category (@code{todo-delete-category}).@footnote{This | 498 | Delete the current category (@code{todo-delete-category}).@footnote{This |
| 499 | binding is mnenomic for ``kill'' to parallel the binding @kbd{k} for | 499 | binding is mnemonic for ``kill'' to parallel the binding @kbd{k} for |
| 500 | item deletion, since @kbd{d} is bound to another item editing command | 500 | item deletion, since @kbd{d} is bound to another item editing command |
| 501 | (@pxref{Done Items}).} To delete a category that contains items, you | 501 | (@pxref{Done Items}).} To delete a category that contains items, you |
| 502 | have to confirm your intent; if the category is empty, deletion is | 502 | have to confirm your intent; if the category is empty, deletion is |
| @@ -595,7 +595,7 @@ concerning the item header, and one each concerning its priority and its | |||
| 595 | text. Each unique combination of these parameters produces a different | 595 | text. Each unique combination of these parameters produces a different |
| 596 | insertion command. The command @kbd{i i} realizes one of these | 596 | insertion command. The command @kbd{i i} realizes one of these |
| 597 | combinations. For the commands that realize the remaining combinations | 597 | combinations. For the commands that realize the remaining combinations |
| 598 | it is convenient to associate each parameter with a mnenomically chosen | 598 | it is convenient to associate each parameter with a mnemonically chosen |
| 599 | key. Then by typing certain sequences of these keys, you complete the | 599 | key. Then by typing certain sequences of these keys, you complete the |
| 600 | insertion command invocation that realizes the specified combination. | 600 | insertion command invocation that realizes the specified combination. |
| 601 | As with @kbd{i i}, the effect of many of these commands also depends on | 601 | As with @kbd{i i}, the effect of many of these commands also depends on |
| @@ -610,7 +610,7 @@ occur in a category listing): | |||
| 610 | @enumerate | 610 | @enumerate |
| 611 | 611 | ||
| 612 | @item | 612 | @item |
| 613 | @kbd{y} for diary (non)inclusion; | 613 | @kbd{y} for diary (non)inclusion; |
| 614 | @item | 614 | @item |
| 615 | @kbd{k} for adding or omitting `diary-nonmarking-symbol'; | 615 | @kbd{k} for adding or omitting `diary-nonmarking-symbol'; |
| 616 | @item | 616 | @item |
| @@ -882,7 +882,7 @@ You delete an item, thereby permanently removing it: | |||
| 882 | 882 | ||
| 883 | @item k | 883 | @item k |
| 884 | Delete the todo item at point (@code{todo-delete-item}; the binding is | 884 | Delete the todo item at point (@code{todo-delete-item}; the binding is |
| 885 | mnenomic for ``kill'', since @kbd{d} is used for marking items as done | 885 | mnemonic for ``kill'', since @kbd{d} is used for marking items as done |
| 886 | (@pxref{Done Items}); but note that @kbd{k} does not put the item into | 886 | (@pxref{Done Items}); but note that @kbd{k} does not put the item into |
| 887 | the kill ring). This command requires confirmation that you want to | 887 | the kill ring). This command requires confirmation that you want to |
| 888 | delete the item, since you cannot undo the deletion in Todo mode. (You | 888 | delete the item, since you cannot undo the deletion in Todo mode. (You |
| @@ -1170,7 +1170,7 @@ listed consecutively en bloc. | |||
| 1170 | 1170 | ||
| 1171 | You can mark both todo and done items, but note that only @kbd{m} can apply | 1171 | You can mark both todo and done items, but note that only @kbd{m} can apply |
| 1172 | to both; other commands only affect either marked todo or marked done | 1172 | to both; other commands only affect either marked todo or marked done |
| 1173 | items, so if both types of items are marked, invoking these commmands | 1173 | items, so if both types of items are marked, invoking these commands |
| 1174 | has no effect and informs you of your erroneous attempt. | 1174 | has no effect and informs you of your erroneous attempt. |
| 1175 | 1175 | ||
| 1176 | @node Todo Categories Mode, Searching for Items, Marked Items, Top | 1176 | @node Todo Categories Mode, Searching for Items, Marked Items, Top |
| @@ -1214,7 +1214,7 @@ to visit another todo file). To do this customize the option | |||
| 1214 | @node Table of Item Counts, Reordering Categories, , Todo Categories Mode | 1214 | @node Table of Item Counts, Reordering Categories, , Todo Categories Mode |
| 1215 | @section Table of Item Counts | 1215 | @section Table of Item Counts |
| 1216 | 1216 | ||
| 1217 | Above each column of the table is a labelled button you can press by | 1217 | Above each column of the table is a labeled button you can press by |
| 1218 | clicking with the mouse or by typing @key{RET} on it. Pressing an item | 1218 | clicking with the mouse or by typing @key{RET} on it. Pressing an item |
| 1219 | count button sorts the table alternately in ascending or descending | 1219 | count button sorts the table alternately in ascending or descending |
| 1220 | order according to the type of count. Pressing the category button | 1220 | order according to the type of count. Pressing the category button |
| @@ -1375,7 +1375,7 @@ filter come in pairs, one for filtering just the current todo file and | |||
| 1375 | one for filtering a user-specified list of todo files. Thus, there | 1375 | one for filtering a user-specified list of todo files. Thus, there |
| 1376 | are six item filtering commands:@footnote{The use of @kbd{F} in the key | 1376 | are six item filtering commands:@footnote{The use of @kbd{F} in the key |
| 1377 | sequences of these commands naturally recalls ``filter'', but is also | 1377 | sequences of these commands naturally recalls ``filter'', but is also |
| 1378 | consistent with the Todo mode mnenomic key binding convention, since the | 1378 | consistent with the Todo mode mnemonic key binding convention, since the |
| 1379 | commands involve one or more whole files.} | 1379 | commands involve one or more whole files.} |
| 1380 | 1380 | ||
| 1381 | @itemize @bullet | 1381 | @itemize @bullet |
| @@ -1533,7 +1533,7 @@ completion (@code{todo-find-filtered-items-file}). | |||
| 1533 | @end table | 1533 | @end table |
| 1534 | 1534 | ||
| 1535 | @itemize @bullet | 1535 | @itemize @bullet |
| 1536 | @item | 1536 | @item |
| 1537 | As with tables of categories, by customizing @code{todo-show-first} you | 1537 | As with tables of categories, by customizing @code{todo-show-first} you |
| 1538 | can have the first invocation of @code{todo-show} for a given todo file | 1538 | can have the first invocation of @code{todo-show} for a given todo file |
| 1539 | display the corresponding saved file of filtered items. If there is | 1539 | display the corresponding saved file of filtered items. If there is |
| @@ -1548,7 +1548,7 @@ Filtered Items mode. It deletes the current filtered items file. | |||
| 1548 | @node Todo Display Features, Printing Todo Buffers, Todo Filtered Items Mode, Top | 1548 | @node Todo Display Features, Printing Todo Buffers, Todo Filtered Items Mode, Top |
| 1549 | @chapter Todo Display Features | 1549 | @chapter Todo Display Features |
| 1550 | 1550 | ||
| 1551 | You can change the appearance of Todo mode buffers in a variety of ways. | 1551 | You can change the appearance of Todo mode buffers in a variety of ways. |
| 1552 | 1552 | ||
| 1553 | @menu | 1553 | @menu |
| 1554 | * Faces:: | 1554 | * Faces:: |
| @@ -1567,7 +1567,7 @@ the date and time of a Todo diary item (i.e., an item lacking | |||
| 1567 | @code{todo-nondiary-marker}) is earlier than the current date and time, | 1567 | @code{todo-nondiary-marker}) is earlier than the current date and time, |
| 1568 | they are displayed in a different face. In this way, you can readily | 1568 | they are displayed in a different face. In this way, you can readily |
| 1569 | recognize diary items that have ``expired'' and act accordingly (e.g., | 1569 | recognize diary items that have ``expired'' and act accordingly (e.g., |
| 1570 | by tagging them as done or by updating the deadlines). | 1570 | by tagging them as done or by updating the deadlines). |
| 1571 | 1571 | ||
| 1572 | Another example of an informational face is the face used to distinguish | 1572 | Another example of an informational face is the face used to distinguish |
| 1573 | top priority items. A third case is the face used in Todo Categories | 1573 | top priority items. A third case is the face used in Todo Categories |
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile index 5f7aedf7993..36abf67d594 100644 --- a/etc/refcards/Makefile +++ b/etc/refcards/Makefile | |||
| @@ -152,7 +152,7 @@ make_cs=if pdfcsplain --version > /dev/null 2> /dev/null; then \ | |||
| 152 | ## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard | 152 | ## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard |
| 153 | ## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard | 153 | ## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard |
| 154 | ## Letter, landscape: calccard, refcard | 154 | ## Letter, landscape: calccard, refcard |
| 155 | ## Letter, portrait (suffix rule): diref-ref, gnus-*, survival, vip* | 155 | ## Letter, portrait (suffix rule): dired-ref, gnus-*, survival, vip* |
| 156 | 156 | ||
| 157 | calccard_deps = calccard.tex emacsver.tex pdflayout.sty | 157 | calccard_deps = calccard.tex emacsver.tex pdflayout.sty |
| 158 | calccard.pdf: $(calccard_deps) | 158 | calccard.pdf: $(calccard_deps) |
diff --git a/lisp/desktop.el b/lisp/desktop.el index 91635218228..1bbc33cb244 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -390,7 +390,7 @@ If `delete', frames on other displays are deleted instead of restored." | |||
| 390 | 390 | ||
| 391 | (defcustom desktop-restore-forces-onscreen t | 391 | (defcustom desktop-restore-forces-onscreen t |
| 392 | "If t, offscreen frames are restored onscreen instead. | 392 | "If t, offscreen frames are restored onscreen instead. |
| 393 | If `:all', frames that are partially offscreen are also forced onscren. | 393 | If `:all', frames that are partially offscreen are also forced onscreen. |
| 394 | NOTE: Checking of frame boundaries is only approximate and can fail | 394 | NOTE: Checking of frame boundaries is only approximate and can fail |
| 395 | to reliably detect frames whose onscreen/offscreen state depends on a | 395 | to reliably detect frames whose onscreen/offscreen state depends on a |
| 396 | few pixels, especially near the right / bottom borders of the screen." | 396 | few pixels, especially near the right / bottom borders of the screen." |
| @@ -670,7 +670,7 @@ if different)." | |||
| 670 | ;; which already takes care of frame restoration and deletion. | 670 | ;; which already takes care of frame restoration and deletion. |
| 671 | (called-interactively-p 'any)) | 671 | (called-interactively-p 'any)) |
| 672 | (let* ((this (selected-frame)) | 672 | (let* ((this (selected-frame)) |
| 673 | (mini (window-frame (minibuffer-window this)))) ; in case they difer | 673 | (mini (window-frame (minibuffer-window this)))) ; in case they differ |
| 674 | (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p)) | 674 | (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p)) |
| 675 | (condition-case err | 675 | (condition-case err |
| 676 | (unless (or (eq frame this) | 676 | (unless (or (eq frame this) |
| @@ -1032,7 +1032,7 @@ being set (usually, by reading it from the desktop)." | |||
| 1032 | :force-onscreen desktop-restore-forces-onscreen))) | 1032 | :force-onscreen desktop-restore-forces-onscreen))) |
| 1033 | 1033 | ||
| 1034 | ;; Just to silence the byte compiler. | 1034 | ;; Just to silence the byte compiler. |
| 1035 | ;; Dynamicaly bound in `desktop-read'. | 1035 | ;; Dynamically bound in `desktop-read'. |
| 1036 | (defvar desktop-first-buffer) | 1036 | (defvar desktop-first-buffer) |
| 1037 | (defvar desktop-buffer-ok-count) | 1037 | (defvar desktop-buffer-ok-count) |
| 1038 | (defvar desktop-buffer-fail-count) | 1038 | (defvar desktop-buffer-fail-count) |
diff --git a/lisp/frameset.el b/lisp/frameset.el index 7cdab7e3fcc..53ab0a5f081 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el | |||
| @@ -182,7 +182,7 @@ Properties can be set with | |||
| 182 | ;; Let's say that Emacs' frame parameters were never designed as a tool to | 182 | ;; Let's say that Emacs' frame parameters were never designed as a tool to |
| 183 | ;; precisely record (or restore) a frame's state. They grew organically, | 183 | ;; precisely record (or restore) a frame's state. They grew organically, |
| 184 | ;; and their uses and behaviors reflect their history. In using them to | 184 | ;; and their uses and behaviors reflect their history. In using them to |
| 185 | ;; implement framesets, the unwary implementor, or the prospective package | 185 | ;; implement framesets, the unwary implementer, or the prospective package |
| 186 | ;; writer willing to use framesets in their code, might fall victim of some | 186 | ;; writer willing to use framesets in their code, might fall victim of some |
| 187 | ;; unexpected... oddities. | 187 | ;; unexpected... oddities. |
| 188 | ;; | 188 | ;; |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 70c2e5dec53..01833ffd70b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3080,14 +3080,14 @@ not be passed explicitly unless you know what you are doing." | |||
| 3080 | min-indent | 3080 | min-indent |
| 3081 | indent | 3081 | indent |
| 3082 | (if (<= indent children-indent-limit) | 3082 | (if (<= indent children-indent-limit) |
| 3083 | ;; This lays within the children indent offset range, | 3083 | ;; This lies within the children indent offset range, |
| 3084 | ;; so it's a normal children of its parent (i.e., not | 3084 | ;; so it's a normal child of its parent (i.e., not |
| 3085 | ;; a children of a children). | 3085 | ;; a child of a child). |
| 3086 | (cons (cons label pos) tree) | 3086 | (cons (cons label pos) tree) |
| 3087 | ;; Oh noes, a children of a children?!. Fear not, we | 3087 | ;; Oh no, a child of a child?! Fear not, we |
| 3088 | ;; know how to roll. We recursely parse these by | 3088 | ;; know how to roll. We recursively parse these by |
| 3089 | ;; swapping prev-indent and min-indent plus adding this | 3089 | ;; swapping prev-indent and min-indent plus adding this |
| 3090 | ;; newly found item to a fresh subtree. This works, I | 3090 | ;; newly found item to a fresh subtree. This works, I |
| 3091 | ;; promise. | 3091 | ;; promise. |
| 3092 | (cons | 3092 | (cons |
| 3093 | (python-imenu--build-tree | 3093 | (python-imenu--build-tree |
diff --git a/src/decompress.c b/src/decompress.c index b4e122c3ba8..0212354fc8f 100644 --- a/src/decompress.c +++ b/src/decompress.c | |||
| @@ -164,7 +164,7 @@ This function can be called only in unibyte buffers. */) | |||
| 164 | stream.avail_in = 0; | 164 | stream.avail_in = 0; |
| 165 | stream.next_in = Z_NULL; | 165 | stream.next_in = Z_NULL; |
| 166 | 166 | ||
| 167 | /* The magic number 32 apparently means "autodect both the gzip and | 167 | /* The magic number 32 apparently means "autodetect both the gzip and |
| 168 | zlib formats" according to zlib.h. */ | 168 | zlib formats" according to zlib.h. */ |
| 169 | if (fn_inflateInit2 (&stream, MAX_WBITS + 32) != Z_OK) | 169 | if (fn_inflateInit2 (&stream, MAX_WBITS + 32) != Z_OK) |
| 170 | return Qnil; | 170 | return Qnil; |
diff --git a/src/image.c b/src/image.c index 41c991f09c6..6dc997aa4d0 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7934,7 +7934,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino) | |||
| 7934 | return NULL; | 7934 | return NULL; |
| 7935 | } | 7935 | } |
| 7936 | 7936 | ||
| 7937 | /* The sub-image may not start at origo, so move the destination | 7937 | /* The sub-image may not start at origin, so move the destination |
| 7938 | iterator to where the sub-image should start. */ | 7938 | iterator to where the sub-image should start. */ |
| 7939 | if (source_top > 0) | 7939 | if (source_top > 0) |
| 7940 | { | 7940 | { |
diff --git a/src/process.c b/src/process.c index 892a5aa86c5..64cb401c06a 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1893,7 +1893,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) | |||
| 1893 | #ifndef WINDOWSNT | 1893 | #ifndef WINDOWSNT |
| 1894 | /* Wait for child_setup to complete in case that vfork is | 1894 | /* Wait for child_setup to complete in case that vfork is |
| 1895 | actually defined as fork. The descriptor | 1895 | actually defined as fork. The descriptor |
| 1896 | XPROCESS (proc)->open_fd[EXEC_MOINTOR_OUTPUT] | 1896 | XPROCESS (proc)->open_fd[EXEC_MONITOR_OUTPUT] |
| 1897 | of a pipe is closed at the child side either by close-on-exec | 1897 | of a pipe is closed at the child side either by close-on-exec |
| 1898 | on successful execve or the _exit call in child_setup. */ | 1898 | on successful execve or the _exit call in child_setup. */ |
| 1899 | { | 1899 | { |