diff options
| -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. @item :format ImageMagick tries to auto-detect the image type, but it isn't always able to. By using @code{:format-type}, we can give ImageMagick a hint -to try to help it. It's used in conjuction with the +to try to help it. It's used in conjunction with the @code{image-format-suffixes} variable, which provides a mapping from content types to file name suffixes. This is then given to 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 textbook or tutorial first, especially if you only know OOP from languages like C++ or Java. If on the other hand you are already familiar with CLOS, you should be aware that @eieio{} does not implement -the full CLOS specificiation and also differs in some other aspects +the full CLOS specification and also differs in some other aspects (@xref{Introduction}, and @ref{CLOS compatibility}). 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. @item F k Delete the current todo file (@code{todo-delete-file}).@footnote{The key -binding of this command is mnenomic for ``kill'' to parallel the binding +binding of this command is mnemonic for ``kill'' to parallel the binding @kbd{k} for item deletion, since @kbd{d} is bound to another item editing command (@pxref{Done Items}).} If the todo file has an archive (@pxref{Todo Archive Mode}), prompt whether to delete that as well. @@ -496,7 +496,7 @@ and adds the category. @item C k Delete the current category (@code{todo-delete-category}).@footnote{This -binding is mnenomic for ``kill'' to parallel the binding @kbd{k} for +binding is mnemonic for ``kill'' to parallel the binding @kbd{k} for item deletion, since @kbd{d} is bound to another item editing command (@pxref{Done Items}).} To delete a category that contains items, you 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 text. Each unique combination of these parameters produces a different insertion command. The command @kbd{i i} realizes one of these combinations. For the commands that realize the remaining combinations -it is convenient to associate each parameter with a mnenomically chosen +it is convenient to associate each parameter with a mnemonically chosen key. Then by typing certain sequences of these keys, you complete the insertion command invocation that realizes the specified combination. As with @kbd{i i}, the effect of many of these commands also depends on @@ -610,7 +610,7 @@ occur in a category listing): @enumerate @item -@kbd{y} for diary (non)inclusion; +@kbd{y} for diary (non)inclusion; @item @kbd{k} for adding or omitting `diary-nonmarking-symbol'; @item @@ -882,7 +882,7 @@ You delete an item, thereby permanently removing it: @item k Delete the todo item at point (@code{todo-delete-item}; the binding is -mnenomic for ``kill'', since @kbd{d} is used for marking items as done +mnemonic for ``kill'', since @kbd{d} is used for marking items as done (@pxref{Done Items}); but note that @kbd{k} does not put the item into the kill ring). This command requires confirmation that you want to delete the item, since you cannot undo the deletion in Todo mode. (You @@ -1170,7 +1170,7 @@ listed consecutively en bloc. You can mark both todo and done items, but note that only @kbd{m} can apply to both; other commands only affect either marked todo or marked done -items, so if both types of items are marked, invoking these commmands +items, so if both types of items are marked, invoking these commands has no effect and informs you of your erroneous attempt. @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 @node Table of Item Counts, Reordering Categories, , Todo Categories Mode @section Table of Item Counts -Above each column of the table is a labelled button you can press by +Above each column of the table is a labeled button you can press by clicking with the mouse or by typing @key{RET} on it. Pressing an item count button sorts the table alternately in ascending or descending 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 one for filtering a user-specified list of todo files. Thus, there are six item filtering commands:@footnote{The use of @kbd{F} in the key sequences of these commands naturally recalls ``filter'', but is also -consistent with the Todo mode mnenomic key binding convention, since the +consistent with the Todo mode mnemonic key binding convention, since the commands involve one or more whole files.} @itemize @bullet @@ -1533,7 +1533,7 @@ completion (@code{todo-find-filtered-items-file}). @end table @itemize @bullet -@item +@item As with tables of categories, by customizing @code{todo-show-first} you can have the first invocation of @code{todo-show} for a given todo file 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. @node Todo Display Features, Printing Todo Buffers, Todo Filtered Items Mode, Top @chapter Todo Display Features -You can change the appearance of Todo mode buffers in a variety of ways. +You can change the appearance of Todo mode buffers in a variety of ways. @menu * Faces:: @@ -1567,7 +1567,7 @@ the date and time of a Todo diary item (i.e., an item lacking @code{todo-nondiary-marker}) is earlier than the current date and time, they are displayed in a different face. In this way, you can readily recognize diary items that have ``expired'' and act accordingly (e.g., -by tagging them as done or by updating the deadlines). +by tagging them as done or by updating the deadlines). Another example of an informational face is the face used to distinguish 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 \ ## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard ## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard ## Letter, landscape: calccard, refcard -## Letter, portrait (suffix rule): diref-ref, gnus-*, survival, vip* +## Letter, portrait (suffix rule): dired-ref, gnus-*, survival, vip* calccard_deps = calccard.tex emacsver.tex pdflayout.sty 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." (defcustom desktop-restore-forces-onscreen t "If t, offscreen frames are restored onscreen instead. -If `:all', frames that are partially offscreen are also forced onscren. +If `:all', frames that are partially offscreen are also forced onscreen. NOTE: Checking of frame boundaries is only approximate and can fail to reliably detect frames whose onscreen/offscreen state depends on a few pixels, especially near the right / bottom borders of the screen." @@ -670,7 +670,7 @@ if different)." ;; which already takes care of frame restoration and deletion. (called-interactively-p 'any)) (let* ((this (selected-frame)) - (mini (window-frame (minibuffer-window this)))) ; in case they difer + (mini (window-frame (minibuffer-window this)))) ; in case they differ (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p)) (condition-case err (unless (or (eq frame this) @@ -1032,7 +1032,7 @@ being set (usually, by reading it from the desktop)." :force-onscreen desktop-restore-forces-onscreen))) ;; Just to silence the byte compiler. -;; Dynamicaly bound in `desktop-read'. +;; Dynamically bound in `desktop-read'. (defvar desktop-first-buffer) (defvar desktop-buffer-ok-count) (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 ;; Let's say that Emacs' frame parameters were never designed as a tool to ;; precisely record (or restore) a frame's state. They grew organically, ;; and their uses and behaviors reflect their history. In using them to -;; implement framesets, the unwary implementor, or the prospective package +;; implement framesets, the unwary implementer, or the prospective package ;; writer willing to use framesets in their code, might fall victim of some ;; unexpected... oddities. ;; 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." min-indent indent (if (<= indent children-indent-limit) - ;; This lays within the children indent offset range, - ;; so it's a normal children of its parent (i.e., not - ;; a children of a children). + ;; This lies within the children indent offset range, + ;; so it's a normal child of its parent (i.e., not + ;; a child of a child). (cons (cons label pos) tree) - ;; Oh noes, a children of a children?!. Fear not, we - ;; know how to roll. We recursely parse these by + ;; Oh no, a child of a child?! Fear not, we + ;; know how to roll. We recursively parse these by ;; swapping prev-indent and min-indent plus adding this - ;; newly found item to a fresh subtree. This works, I + ;; newly found item to a fresh subtree. This works, I ;; promise. (cons (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. */) stream.avail_in = 0; stream.next_in = Z_NULL; - /* The magic number 32 apparently means "autodect both the gzip and + /* The magic number 32 apparently means "autodetect both the gzip and zlib formats" according to zlib.h. */ if (fn_inflateInit2 (&stream, MAX_WBITS + 32) != Z_OK) 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) return NULL; } - /* The sub-image may not start at origo, so move the destination + /* The sub-image may not start at origin, so move the destination iterator to where the sub-image should start. */ if (source_top > 0) { 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) #ifndef WINDOWSNT /* Wait for child_setup to complete in case that vfork is actually defined as fork. The descriptor - XPROCESS (proc)->open_fd[EXEC_MOINTOR_OUTPUT] + XPROCESS (proc)->open_fd[EXEC_MONITOR_OUTPUT] of a pipe is closed at the child side either by close-on-exec on successful execve or the _exit call in child_setup. */ { |