From b70413668a72cbc36fba7d505131a71a847d602b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 6 Nov 2011 20:42:14 +0100 Subject: * src/keyboard.c (interrupt_signal): Don't call kill-emacs while in GC. --- src/keyboard.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/keyboard.c') diff --git a/src/keyboard.c b/src/keyboard.c index 95604550c80..11c37d14f64 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -10856,8 +10856,12 @@ interrupt_signal (int signalnum) /* If we don't have an argument, some */ if (!terminal) { /* If there are no frames there, let's pretend that we are a - well-behaving UN*X program and quit. */ - Fkill_emacs (Qnil); + well-behaving UN*X program and quit. We cannot do that while + GC is in progress, though. */ + if (!gc_in_progress) + Fkill_emacs (Qnil); + else + Vquit_flag = Qt; } else { -- cgit v1.2.3 From dbdb703130b27983c3848d2a10aa44bc5aa6526e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 11 Nov 2011 02:04:08 -0800 Subject: Spelling fixes. --- doc/emacs/ack.texi | 4 ++-- etc/NEWS.20 | 2 +- lisp/cedet/cedet.el | 2 +- lisp/cedet/ede/proj-elisp.el | 2 +- lisp/cedet/semantic/edit.el | 2 +- lisp/cedet/srecode/extract.el | 2 +- lisp/dframe.el | 2 +- lisp/font-lock.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/idlwave.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/ses.el | 2 +- src/keyboard.c | 2 +- src/w32font.c | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/keyboard.c') diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 1cfb3d9ffe9..c2242c444dd 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -99,7 +99,7 @@ ERC distribution). @item Scott Bender, Michael Brouwer, Christophe de Dinechin, Carl Edman, -Christian Limpach and Adrian Robert developed and maintained the +Christian Limpach and Adrian Robert developed and maintained the NeXTstep port of Emacs. @item @@ -576,7 +576,7 @@ Emacs. @item Karel Klí@v{c} contributed SELinux support, for preserving the -Security-Enchanced Linux context of files on backup and copy. +Security-Enhanced Linux context of files on backup and copy. @item Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal diff --git a/etc/NEWS.20 b/etc/NEWS.20 index c76ddb2485e..f4cfb14de62 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -2047,7 +2047,7 @@ standard fontset are created automatically. If you specify a default ASCII font with the `Font' resource or `-fn' argument, a fontset is generated from it. This works by replacing the -FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name +FOUNDRY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name with `*' then using this to specify a fontset. This fontset's short name is `fontset-startup'. diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el index d2fb066515b..d7645bc97ed 100644 --- a/lisp/cedet/cedet.el +++ b/lisp/cedet/cedet.el @@ -75,7 +75,7 @@ This is used by `semantic-mode' and `global-ede-mode'.") (defun cedet-version () - "Display all active versions of CEDET and Dependant packages. + "Display all active versions of CEDET and Dependent packages. The PACKAGE column is the name of a given package from CEDET. diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el index 42a20cc4a1a..66c71063363 100644 --- a/lisp/cedet/ede/proj-elisp.el +++ b/lisp/cedet/ede/proj-elisp.el @@ -217,7 +217,7 @@ is found, such as a `-version' variable, or the standard header." (save-excursion (if (file-symlink-p ec) (progn - ;; Desymlinkafy + ;; Desymlinkify (rename-file ec (concat ec ".tmp")) (copy-file (concat ec ".tmp") ec) (delete-file (concat ec ".tmp")))) diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 7f7e82a95c2..307071e743c 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -427,7 +427,7 @@ See `semantic-edits-change-leaf-tag' for details on parents." ;; which must have a value by now. ;; Loop over the search list to find the preceding CDR. - ;; Fortunatly, (car overlapped-tags) happens to be + ;; Fortunately, (car overlapped-tags) happens to be ;; the first tag positionally. (let ((tokstart (semantic-tag-start (car overlapped-tags)))) (while (and list-to-search diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index dba4b876edb..80e6f9d8d1c 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -66,7 +66,7 @@ (defmethod srecode-extract-state-extract ((st srecode-extract-state) endpoint) - "Perform an extraction on the extract state ST with ENDPOITNT. + "Perform an extraction on the extract state ST with ENDPOINT. If there was no waiting inserter, do nothing." (when (oref st lastinserter) (save-match-data diff --git a/lisp/dframe.el b/lisp/dframe.el index 02eeef064fe..93d9e7948cf 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -523,7 +523,7 @@ LOCATION can be one of 'random, 'left-right, or 'top-bottom." (funcall f 'default frame))))) (defun dframe-detach (frame-var cache-var buffer-var) - "Detatch the frame in symbol FRAME-VAR. + "Detach the frame in symbol FRAME-VAR. CACHE-VAR and BUFFER-VAR are symbols as in `dframe-frame-mode'" (with-current-buffer (symbol-value buffer-var) (rename-buffer (buffer-name) t) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 2f4b7413dcc..d410b8eb51a 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1742,7 +1742,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for keyword))) (defun font-lock-eval-keywords (keywords) - "Evalulate KEYWORDS if a function (funcall) or variable (eval) name." + "Evaluate KEYWORDS if a function (funcall) or variable (eval) name." (if (listp keywords) keywords (font-lock-eval-keywords (if (fboundp keywords) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 944a412fb63..543539421fe 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2016,7 +2016,7 @@ extension EXTN. Normally EXTN is given as the regular expression ((looking-at "final") (forward-char 5)) - ;; Move point past a ClassDeclaraction, but save the class + ;; Move point past a ClassDeclaration, but save the class ;; Identifier. ((looking-at "class") (forward-char 5) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index c77ee4b76a9..95f67a6bf66 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -8961,7 +8961,7 @@ This expects NAME TYPE IDLWAVE-TWIN-CLASS to be bound to the right values." (nth 1 source))) (defun idlwave-downcase-safe (string) - "Donwcase if string, else return unchanged." + "Downcase if string, else return unchanged." (if (stringp string) (downcase string) string)) diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 57ed13969b4..67e3c4a18b4 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -227,7 +227,7 @@ will do all lineups." :type '(set :extra-offset 8 (const :tag "Everything" all) (const :tag "Parameter lists" paramlist) - (const :tag "Decalrations" declaration) + (const :tag "Declarations" declaration) (const :tag "Case statements" case)) :group 'pascal) diff --git a/lisp/ses.el b/lisp/ses.el index 9b2048eae83..b1d7d7bfb9e 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -43,7 +43,7 @@ ;; working fine in most cases, however failed in some cases of several path ;; racing together. ;; -;; The current algorithm is based on Dijksta algorithm. The ``cycle length'' is +;; The current algorithm is based on Dijkstra's algorithm. The cycle length is ;; stored in some cell property. In order not to reset in all cells such ;; property at each update, the cycle length is stored in this property along ;; with some update attempt id that is incremented at each update. The current diff --git a/src/keyboard.c b/src/keyboard.c index 11c37d14f64..f8c31af3fbe 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8133,7 +8133,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) Lisp_Object caption; int i, have_label = 0; - /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'. + /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'. Rule out items that aren't lists, don't start with `menu-item' or whose rest following `tool-bar-item' is not a list. */ diff --git a/src/w32font.c b/src/w32font.c index 26bf4207de5..365f8b78a5e 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -2221,7 +2221,7 @@ font_supported_scripts (FONTSIGNATURE * sig) so don't need to mark them separately. */ /* 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B. */ SUBRANGE (4, Qphonetic); - /* 5: Spacing and tone modifiers, 6: Combining Diacriticals. */ + /* 5: Spacing and tone modifiers, 6: Combining Diacritical Marks. */ SUBRANGE (7, Qgreek); SUBRANGE (8, Qcoptic); SUBRANGE (9, Qcyrillic); @@ -2311,7 +2311,7 @@ font_supported_scripts (FONTSIGNATURE * sig) /* 115: Saurashtra, 116: Kayah Li, 117: Rejang. */ SUBRANGE (118, Qcham); /* 119: Ancient symbols, 120: Phaistos Disc. */ - /* 121: Carian, Lycian, Lydian, 122: Dominos, Mah Jong tiles. */ + /* 121: Carian, Lycian, Lydian, 122: Dominoes, Mahjong tiles. */ /* 123-127: Reserved. */ /* There isn't really a main symbol range, so include symbol if any -- cgit v1.2.3 From 09e80d9fb9fe7239d0fa301973920845831366d3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Nov 2011 22:27:12 -0800 Subject: Spelling fixes. --- admin/grammars/c.by | 2 +- doc/emacs/ChangeLog | 2 +- doc/emacs/custom.texi | 8 +++---- doc/emacs/trouble.texi | 2 +- doc/lispintro/emacs-lisp-intro.texi | 47 ++++++++++++++++++------------------- doc/lispref/frames.texi | 3 +-- doc/misc/ert.texi | 2 +- etc/AUTHORS | 2 +- etc/NEWS.1-17 | 2 +- etc/tutorials/TUTORIAL.ja | 5 ++-- leim/quail/ipa.el | 2 +- lisp/ChangeLog.10 | 3 +-- lisp/ChangeLog.7 | 9 ++++--- lisp/ChangeLog.9 | 3 +-- lisp/allout-widgets.el | 2 +- lisp/allout.el | 2 +- lisp/cedet/ede/makefile-edit.el | 2 +- lisp/cedet/ede/proj-misc.el | 2 +- lisp/cedet/semantic/bovine.el | 2 +- lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/imenu.el | 2 +- lisp/cedet/srecode/insert.el | 2 +- lisp/cedet/srecode/srt-mode.el | 2 +- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/smie.el | 2 +- lisp/emacs-lisp/tabulated-list.el | 2 +- lisp/erc/erc-notify.el | 3 +-- lisp/generic-x.el | 2 +- lisp/gnus/gnus-topic.el | 2 +- lisp/image-mode.el | 2 +- lisp/international/mule-diag.el | 2 +- lisp/language/european.el | 8 +++---- lisp/language/romanian.el | 2 +- lisp/ldefs-boot.el | 2 +- lisp/mail/mail-extr.el | 2 +- lisp/mh-e/mh-comp.el | 2 +- lisp/mh-e/mh-e.el | 2 +- lisp/net/browse-url.el | 2 +- lisp/net/secrets.el | 18 +++++++------- lisp/progmodes/cc-vars.el | 6 ++--- lisp/progmodes/ebnf2ps.el | 2 +- lisp/progmodes/fortran.el | 4 ++-- lisp/progmodes/vhdl-mode.el | 2 +- lisp/speedbar.el | 2 +- lisp/startup.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/bibtex.el | 2 +- lisp/textmodes/reftex-global.el | 24 +++++++++---------- lisp/vc/ediff-init.el | 2 +- msdos/README | 4 ++-- oldXMenu/XMenu.h | 2 +- src/ccl.c | 2 +- src/font.c | 2 +- src/fontset.c | 2 +- src/keyboard.c | 2 +- src/nsfns.m | 4 ++-- src/w32term.c | 2 +- src/xdisp.c | 2 +- src/xfns.c | 2 +- 60 files changed, 116 insertions(+), 123 deletions(-) (limited to 'src/keyboard.c') diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 1797827679b..9fbb6592b75 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -734,7 +734,7 @@ builtintype ;; Klaus Berndl: This parses also nonsense like "const volatile int ;; const volatile const const volatile a ..." but IMHO nobody writes -;; such code. Normaly we shoud define a rule like typeformbase-mode +;; such code. Normally we should define a rule like typeformbase-mode ;; which exactly defines the different allowed cases and combinations ;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so ;; we could recognize more invalid code but IMHO this is not worth the diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a808a96b444..84bb7cf30df 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1711,7 +1711,7 @@ (Table of Resources): Document fontBackend resource. * trouble.texi (Quitting): Add other undo bindings to table. - (DEL Does Not Delete): Note that the erasure key is usually labelled + (DEL Does Not Delete): Note that the erasure key is usually labeled "Backspace". Remove discussion of obscure Xmodmap issue. 2009-05-07 Chong Yidong diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index fd680576b4e..5b98216369d 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -82,7 +82,7 @@ under it. It looks like this, in part: @group /- Emacs group: Customization of the One True Editor. -------------\ [State]: visible group members are all at standard values. - + See also [Manual]. [Editing] : Basic text editing facilities. @@ -547,7 +547,7 @@ such collections from one computer to another. To define a Custom theme, use @kbd{M-x customize-create-theme}, which brings up a buffer named @samp{*New Custom Theme*}. At the top of the buffer is an editable field where you can specify the name of -the theme. Click on the button labelled @samp{Insert Variable} to add +the theme. Click on the button labeled @samp{Insert Variable} to add a variable to the theme, and click on @samp{Insert Face} to add a face. You can edit these values in the @samp{*New Custom Theme*} buffer like in an ordinary Customize buffer. To remove an option from @@ -1068,7 +1068,7 @@ other context has no special meaning. well as the major modes; in fact, you can use it more than once, first to set the major mode and then to enable minor modes which are specific to particular buffers. Using @code{mode} for minor modes -is deprecated, though---instead, use @code{eval: (minor-mode 1)}. +is deprecated, though---instead, use @code{eval: (minor-mode 1)}. Often, however, it is a mistake to enable minor modes in file local variables. Most minor modes, like Auto Fill mode, represent individual user @@ -1646,7 +1646,7 @@ ways to use these modifiers; the key labeled @key{Alt} on most keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The standard key bindings in Emacs do not include any characters with these modifiers. However, you can customize Emacs to assign meanings -to them. The modifier bits are labelled as @samp{s-}, @samp{H-} and +to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and @samp{A-} respectively. Even if your keyboard lacks these additional modifier keys, you can diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index ec159af6f84..ae7550d0fae 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -161,7 +161,7 @@ in the Emacs distribution. Type @kbd{C-h C-f} to read the FAQ; type @cindex @key{BACKSPACE} vs @key{DEL} @cindex usual erasure key - Every keyboard has a large key, usually labelled @key{Backspace}, + Every keyboard has a large key, usually labeled @key{Backspace}, which is ordinarily used to erase the last character that you typed. We call this key @dfn{the usual erasure key}. In Emacs, it is supposed to be equivalent to @key{DEL}. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 11ceea19eef..841bf8a0c95 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -357,7 +357,7 @@ every node in every chapter. * Conclusion:: Now you have the basics. * the-the:: An appendix: how to find reduplicated words. * Kill Ring:: An appendix: how the kill ring works. -* Full Graph:: How to create a graph with labelled axes. +* Full Graph:: How to create a graph with labeled axes. * Free Software and Free Manuals:: * GNU Free Documentation License:: * Index:: @@ -793,9 +793,9 @@ The @code{current-kill} Function * Digression concerning error:: How to mislead humans, but not computers. * Determining the Element:: -A Graph with Labelled Axes +A Graph with Labeled Axes -* Labelled Example:: +* Labeled Example:: * print-graph Varlist:: @code{let} expression in @code{print-graph}. * print-Y-axis:: Print a label for the vertical axis. * print-X-axis:: Print a horizontal label. @@ -1023,7 +1023,7 @@ the command in parentheses, like this: @kbd{M-C-\} invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, , Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your @key{META} key, @key{CTRL} key and @key{\} key all at the same time. -(On many modern keyboards the @key{META} key is labelled +(On many modern keyboards the @key{META} key is labeled @key{ALT}.) Sometimes a combination like this is called a keychord, since it is similar to the way you play a chord on a piano. If your keyboard does @@ -1031,7 +1031,7 @@ not have a @key{META} key, the @key{ESC} key prefix is used in place of it. In this case, @kbd{M-C-\} means that you press and release your @key{ESC} key and then type the @key{CTRL} key and the @key{\} key at the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key -along with the key that is labelled @key{ALT} and, at the same time, +along with the key that is labeled @key{ALT} and, at the same time, press the @key{\} key. In addition to typing a lone keychord, you can prefix what you type @@ -4749,7 +4749,7 @@ type in the name of the function whose source code you want to see, such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will switch buffers and display the source code for the function on your screen. To switch back to your current buffer, type @kbd{C-x b -@key{RET}}. (On some keyboards, the @key{META} key is labelled +@key{RET}}. (On some keyboards, the @key{META} key is labeled @key{ALT}.) @c !!! 22.1.1 tags table location in this paragraph @@ -16962,7 +16962,7 @@ For this reason, I have written enhancements to the basic @code{print-graph-body} function that automatically print labels for the horizontal and vertical axes. Since the label printing functions do not contain much new material, I have placed their description in -an appendix. @xref{Full Graph, , A Graph with Labelled Axes}. +an appendix. @xref{Full Graph, , A Graph with Labeled Axes}. @node Line Graph Exercise, , Printed Axes, Readying a Graph @section Exercise @@ -19447,7 +19447,7 @@ whether the kill ring is full or empty. This is an act of exploration. From the human point of view, the act of exploration and discovery is -not necessarily an error, and therefore should not be labelled as one, +not necessarily an error, and therefore should not be labeled as one, even in the bowels of a computer. As it is, the code in Emacs implies that a human who is acting virtuously, by exploring his or her environment, is making an error. This is bad. Even though the computer @@ -19760,25 +19760,25 @@ as @code{kill-ring-yank-pointer} do not use this library, possibly because they were written earlier. @node Full Graph, Free Software and Free Manuals, Kill Ring, Top -@appendix A Graph with Labelled Axes +@appendix A Graph with Labeled Axes Printed axes help you understand a graph. They convey scale. In an earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we wrote the code to print the body of a graph. Here we write the code -for printing and labelling vertical and horizontal axes, along with the +for printing and labeling vertical and horizontal axes, along with the body itself. @menu -* Labelled Example:: +* Labeled Example:: * print-graph Varlist:: @code{let} expression in @code{print-graph}. * print-Y-axis:: Print a label for the vertical axis. * print-X-axis:: Print a horizontal label. * Print Whole Graph:: The function to print a complete graph. @end menu -@node Labelled Example, print-graph Varlist, Full Graph, Full Graph +@node Labeled Example, print-graph Varlist, Full Graph, Full Graph @ifnottex -@unnumberedsec Labelled Example Graph +@unnumberedsec Labeled Example Graph @end ifnottex Since insertions fill a buffer to the right and below point, the new @@ -19821,9 +19821,9 @@ Here is an example of how a finished graph should look: @end smallexample @noindent -In this graph, both the vertical and the horizontal axes are labelled +In this graph, both the vertical and the horizontal axes are labeled with numbers. However, in some graphs, the horizontal axis is time -and would be better labelled with months, like this: +and would be better labeled with months, like this: @smallexample @group @@ -19838,9 +19838,9 @@ and would be better labelled with months, like this: @end smallexample Indeed, with a little thought, we can easily come up with a variety of -vertical and horizontal labelling schemes. Our task could become +vertical and horizontal labeling schemes. Our task could become complicated. But complications breed confusion. Rather than permit -this, it is better choose a simple labelling scheme for our first +this, it is better choose a simple labeling scheme for our first effort, and to modify or replace it later. @need 1200 @@ -19864,7 +19864,7 @@ These considerations suggest the following outline for the We can work on each part of the @code{print-graph} function definition in turn. -@node print-graph Varlist, print-Y-axis, Labelled Example, Full Graph +@node print-graph Varlist, print-Y-axis, Labeled Example, Full Graph @comment node-name, next, previous, up @appendixsec The @code{print-graph} Varlist @cindex @code{print-graph} varlist @@ -20391,7 +20391,7 @@ blank spaces and also separated according to the value of the variable The value of the variable @code{X-axis-label-spacing} should itself be measured in units of @code{symbol-width}, since you may want to change the width of the symbols that you are using to print the body of the -graph without changing the ways the graph is labelled. +graph without changing the ways the graph is labeled. @menu * Similarities differences:: Much like @code{print-Y-axis}, but not exactly. @@ -20722,7 +20722,7 @@ Emacs will print the horizontal axis like this: Now we are nearly ready to print the whole graph. The function to print the graph with the proper labels follows the -outline we created earlier (@pxref{Full Graph, , A Graph with Labelled +outline we created earlier (@pxref{Full Graph, , A Graph with Labeled Axes}), but with additions. @need 1250 @@ -20857,7 +20857,7 @@ Finally, the code for the @code{print-graph} function: ;;; @r{Final version.} (defun print-graph (numbers-list &optional vertical-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -21478,7 +21478,7 @@ each column." @group (defun print-graph (numbers-list &optional vertical-step horizontal-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -21979,7 +21979,7 @@ each column." @group (defun print-graph (numbers-list &optional vertical-step horizontal-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -22275,4 +22275,3 @@ airplane. @c @end iftex @bye - diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index d9399e98a69..d2e86a77112 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -2414,7 +2414,7 @@ This function returns the ``vendor'' that provided the X server software (as a string). Really this means whoever distributes the X server. -When the developers of X labelled software distributors as +When the developers of X labeled software distributors as ``vendors,'' they showed their false assumption that no system could ever be developed and distributed noncommercially. @end defun @@ -2430,4 +2430,3 @@ This variable's value is @code{t} if no X window manager is in use. The functions @code{x-pixel-width} and @code{x-pixel-height} return the width and height of an X Window frame, measured in pixels. @end ignore - diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index d1cecf1347a..d802e4259f5 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -748,7 +748,7 @@ explanation function. Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch} are implemented on top of the lower-level test handling code in the -sections of @file{ert.el} labelled ``Facilities for running a single test'', +sections of @file{ert.el} labeled ``Facilities for running a single test'', ``Test selectors'', and ``Facilities for running a whole set of tests''. If you want to write code that works with ERT tests, you should take a diff --git a/etc/AUTHORS b/etc/AUTHORS index f214d5e5515..f8ab274e136 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -908,7 +908,7 @@ Derek Upham: changed nxml-mode.el Detlev Zundel: wrote re-builder.el -Devon Sean Mccullough: changed comint.el +Devon Sean McCullough: changed comint.el Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c sound.c w32proc.c diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 89856429b1d..e8570cb7c48 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -963,7 +963,7 @@ a slash is appended to it. * Undo can clear modified-flag. If you undo changes in a buffer back to a state in which the -buffer was not considered "modified", then it is labelled as +buffer was not considered "modified", then it is labeled as once again "unmodified". * M-x run-lisp. diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index e4917d40987..d50727ceb82 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja @@ -524,7 +524,7 @@ C-_ $B$d(B C-x u $B$O?tCM0z?t$r7+$jJV$72s?t$H2r> "foo" $B$H$$$&L>$N%U%!%$%k$r:n$j$^$7$g$&!#(BC-x C-f foo $B$G$9!#(B $B2?$+J8>O$rF~$l!"JT=8$7!"(BC-x C-s $B$G(B "foo" $B$r%;!<%V$7$F2<$5$$!#(B - $B:G8e$K(B C-x C-f TUTORIAL.ja $B$H%?%$%W$7(B + $B:G8e$K(B C-x C-f TUTORIAL.ja $B$H%?%$%W$7(B $BF~Lg%,%$%I$KLa$j$^$7$g$&!#(B Emacs $B$O%U%!%$%k$NFbMF$r%P%C%U%!!J(Bbuffer$B!K$H8F$P$l$k$b$N$NCf$K3JG<$7$F(B @@ -890,7 +890,7 @@ ESC $B$O$=$l<+BN$,0l$D$NJ8;z$G=$>~%-!<$G$O$J$$$+$i$G$9!#(B >> M-x make-frame $B$H%?%$%W$7$F!"?7$7$$%U%l!<%`$,I=<($5$l$k$N(B $B$r3NG'$7$^$7$g$&!#(B - + $B85$N%U%l!<%`$G$d$C$F$$$?$3$H$O$J$s$G$b$3$N?7$7$$%U%l!<%`$G$b$G$-$^$9!#(B $B:G=i$N%U%l!<%`$H$=$N8e$K:n$i$l$k%U%l!<%`$G0c$$$O$"$j$^$;$s!#(B @@ -1083,4 +1083,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism ;;; Local Variables: ;;; coding: iso-2022-jp ;;; End: - diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el index 503d8b4ec89..a41cf53c377 100644 --- a/leim/quail/ipa.el +++ b/leim/quail/ipa.el @@ -170,7 +170,7 @@ incorrectly, as separate from the modified glyphs.") ("a~" "ã") ;; Low central unrounded vowel, nasal U+00E3 ("o~" "õ") ;; Upper-mid back rounded vowel, nasal U+00F5 ("u~" "Å©") ;; High back rounded vowel, nasal U+0169 - ("~" "̃") ;; +Nasalised modifier U+0303 + ("~" "̃") ;; +Nasalized modifier U+0303 (":" "Ë") ;; +Long modifier U+02D0 ("-" "Ì©") ;; +Syllabic modifier U+0329 ("." "Ì£") ;; +Retroflex modifier U+0323 diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 1c2f2b5b015..a1cba0a9cd9 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -9383,7 +9383,7 @@ 2002-10-06 Glenn Morris - * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO + * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO loops. 2002-10-05 Stefan Monnier @@ -23550,4 +23550,3 @@ See ChangeLog.9 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 7ef7fe9dffc..ed7ee443c4c 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -4923,10 +4923,10 @@ (fortran-blink-matching-if, fortran-blink-matching-do) (fortran-indent-new-line): Bind case-fold-search. (fortran-end-do, fortran-beginning-do, fortran-end-if) - (fortran-beginning-if): Bind case-fold-search. Allow labelled blocks. + (fortran-beginning-if): Bind case-fold-search. Allow labeled blocks. Use fortran-end-prog-re. (fortran-if-start-re): New variable. - (fortran-calculate-indent): Allow labelled blocks. Simplify the conds. + (fortran-calculate-indent): Allow labeled blocks. Simplify the conds. Make select case indentation work. (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. (fortran-fill): Allow double quotes in check for string. @@ -21766,9 +21766,9 @@ * f90.el (f90-no-block-limit): Fixed bug for indentation of elsewhere and elseif. - (f90-looking-at-where-or-forall): Now allows for labelled forall + (f90-looking-at-where-or-forall): Now allows for labeled forall and where statements. - (f90-font-lock-keywords-2): New highlighting for labelled where + (f90-font-lock-keywords-2): New highlighting for labeled where and forall. Fixed small bug with else highlighting. (f90-fill-region): Moved indentation to f90-break-line. (f90-break-line): Will now always indent the second line. @@ -23123,4 +23123,3 @@ See ChangeLog.6 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index edfe26fbc03..d2d6409cdd3 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -14191,7 +14191,7 @@ * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. Provide ja-dic-cnv instead of skkdic-cnv. - (ja-dic-filename): Renamed from skkdic-filename. Referers changed. + (ja-dic-filename): Renamed from skkdic-filename. Referrers changed. (iso-2022-7bit-short): Add safe-charsets property. (skkdic-convert-postfix): Search Japanese chou-on character in addition to Hiragana character. @@ -20709,4 +20709,3 @@ See ChangeLog.8 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 162da1f4815..472615039bb 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -1632,7 +1632,7 @@ We return the item-widget corresponding to the item at point." (defun allout-redecorate-item (item-widget) "Resituate ITEM-WIDGET decorations, disregarding context. -Use this to redecorate only the item, when you know that it's +Use this to redecorate only the item, when you know that its situation with respect to siblings, parent, and offspring is unchanged from its last decoration. Use `allout-decorate-item-and-context' instead to reassess and adjust diff --git a/lisp/allout.el b/lisp/allout.el index 18cc3c80dc6..6b1542cd3f8 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -5473,7 +5473,7 @@ header and body. The elements of that list are: "invalid format" format)))) (list depth prefix strings)) result)) - ;; Reasses format, if any: + ;; Reassess format, if any: (if (and format (listp format)) (cond ((= new-depth depth) (setq format (cons (1+ (car format)) diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 63991c54e7f..718fdf58b11 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -71,7 +71,7 @@ (end-of-line) (= (preceding-char) ?\\))) -;;; Programatic editing of a Makefile +;;; Programmatic editing of a Makefile ;; (defun makefile-move-to-macro (macro &optional next) "Move to the definition of MACRO. Return t if found. diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el index 4d68e1544a7..1c9b9bea0f4 100644 --- a/lisp/cedet/ede/proj-misc.el +++ b/lisp/cedet/ede/proj-misc.el @@ -50,7 +50,7 @@ All listed sources are included in the distribution.") (defvar ede-misc-source (ede-sourcecode "ede-misc-source" - :name "Miscelaneous" + :name "Miscellaneous" :sourcepattern ".*") "Miscellaneous field definition.") diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el index 1dfbb72d416..036a6f38724 100644 --- a/lisp/cedet/semantic/bovine.el +++ b/lisp/cedet/semantic/bovine.el @@ -240,7 +240,7 @@ list of semantic tokens found." matchlist nil) ;;generate exit condition (if (not end) (setq out nil))) - ;; Nothin? + ;; Nothing? )) (setq result (if (eq s starting-stream) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 1076402ac91..af293a10348 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef." ;; `throws' as a common name for things that toss ;; exceptions about. :throws (nth 5 tokenpart) - ;; Reemtrant is a C++ thingy. Add it here + ;; Reentrant is a C++ thingy. Add it here :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) ;; A function post-const is funky. Try stuff :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 34718d1fdd2..74c4d8e3788 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -862,7 +862,7 @@ instead." (let ((tab (car (car tmp))) (tags (cdr (car tmp)))) (dolist (T tags) - ;; Normilzation gives specialty database tables a chance + ;; Normalization gives specialty database tables a chance ;; to convert into a more stable tag format. (let* ((norm (semanticdb-normalize-one-tag tab T)) (ntab (car norm)) diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index e7e1da55ce3..35d9ff04a2a 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (defcustom semantic-imenu-bucketize-type-members t "*Non-nil if members of a type should be grouped into buckets. A nil value means to keep them in the same order. -Overriden to nil if `semantic-imenu-bucketize-file' is nil." +Overridden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) (make-variable-buffer-local 'semantic-imenu-bucketize-type-members) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 84964a9e8b4..cccfe099e74 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -255,7 +255,7 @@ ST can be a class, or an object." (let ((c (oref st code))) (srecode-push st) (srecode-insert-code-stream c dictionary)) - ;; Poping the stack is protected + ;; Popping the stack is protected. (srecode-pop st))) (defun srecode-insert-code-stream (code dictionary) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 5a407aad135..0a99b7869e8 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -483,7 +483,7 @@ section or ? for an ask variable." (if (> start (point)) ;; If our starting point is after the found point, that - ;; means we are not inside the macro. Retur nil. + ;; means we are not inside the macro. Return nil. nil ;; We are inside the macro, extract the text so far. (let* ((macroend (match-beginning 0)) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7b98ade2422..0630f5f4e4e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -527,7 +527,7 @@ ;; However, don't actually bother calling `ignore'. `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) - ;; Neeeded as long as we run byte-optimize-form after cconv. + ;; Needed as long as we run byte-optimize-form after cconv. ((eq fn 'internal-make-closure) form) ((byte-code-function-p fn) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index cad7c8419b2..95d93eb113d 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -759,7 +759,7 @@ Possible return values: (indirect-function 'smie-op-left) halfsexp)) -;;; Miscellanous commands using the precedence parser. +;;; Miscellaneous commands using the precedence parser. (defun smie-backward-sexp-command (&optional n) "Move backward through N logical elements." diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 75c9a01323d..e16970c6804 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 1b245ec2e33..7ae15307a55 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -88,7 +88,7 @@ strings." (defun erc-notify-install-message-catalogs () (erc-define-catalog 'english - '((notify_current . "Notificated people online: %l") + '((notify_current . "Notified people online: %l") (notify_list . "Current notify list: %l") (notify_on . "Detected %n on IRC network %m") (notify_off . "%n has left IRC network %m")))) @@ -250,4 +250,3 @@ with args, toggle notify status of people." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 2c00229c76e..b0ef0439404 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1446,7 +1446,7 @@ like an INI file. You can add this hook to `find-file-hook'." "REGDB_STRING" "REGDB_UNINSTALL_NAME" "REMOTE_DRIVE" - "REMOVALE_DRIVE" + "REMOVEABLE_DRIVE" "REPLACE_ITEM" "REPLACE" "RESET" diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index f1a2ed43e26..17af1a38333 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -430,7 +430,7 @@ inheritance." regexp list-topic topic-level) "List all newsgroups with unread articles of level LEVEL or lower. Use the `gnus-group-topics' to sort the groups. -If PREDICTE is a function, list groups that the function returns non-nil; +If PREDICATE is a function, list groups that the function returns non-nil; if it is t, list groups that have no unread articles. If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (set-buffer gnus-group-buffer) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 30223e69ae0..f3e7caab174 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -638,7 +638,7 @@ These properties are determined by the Image mode variables `image-transform-resize' and `image-transform-rotation'. The return value is suitable for appending to an image spec. -Recaling and rotation properties only take effect if Emacs is +Rescaling and rotation properties only take effect if Emacs is compiled with ImageMagick support." (when (or image-transform-resize (not (equal image-transform-rotation 0.0))) diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index cccf65b8051..efb910a3ef6 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -958,7 +958,7 @@ the current buffer." (insert "\n ------") (put-text-property (line-beginning-position) (point) 'face 'highlight))) (if (and start1 end2) - ;; Reoder the printed information to match with the font + ;; Reorder the printed information to match with the font ;; searching strategy; i.e. FONTSET, the default fontset, ;; default of FONTSET, default of the default fontset. (transpose-regions start1 end1 start2 end2)) diff --git a/lisp/language/european.el b/lisp/language/european.el index 6dfc03d0f5f..5bdec6dec7b 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set: (input-method . "latin-4-postfix") (documentation . "\ These languages are supported with the Latin-4 (ISO-8859-4) character set: - Danish, English, Estonian, Finnish, German, Greenlandic, Lappish, - Latvian, Lithuanian, and Norwegian.")) + Danish, English, Estonian, Finnish, German, Greenlandic, Latvian, + Lithuanian, Norwegian, and Sami.")) '("European")) @@ -226,7 +226,7 @@ See also the Turkish environment.")) "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." :coding-type 'charset ;; `W' for `Welsh', since `C' for `Celtic' is taken. - :mnemonic ?W + :mnemonic ?W :charset-list '(iso-8859-14) :mime-charset 'iso-8859-14) @@ -610,7 +610,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D* (define-coding-system 'mac-roman "Mac Roman Encoding (MIME:MACINTOSH)." :coding-type 'charset - :mnemonic ?M + :mnemonic ?M :charset-list '(mac-roman) :mime-charset 'macintosh) diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index b9c250fd700..25a10633a28 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -35,7 +35,7 @@ (unibyte-display . iso-8859-2) (tutorial . "TUTORIAL.ro") (sample-text . "Bunã ziua, bine aþi venit!") - (documentation . "Rmoanian environment using Latin-2 encoding. + (documentation . "Romanian environment using Latin-2 encoding. An environment for generic Latin-10 encoding is also available.")) '("European")) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 0ce53fcb9a3..8847c16bfb4 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index c3a7da41823..12826001d86 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1961,7 +1961,7 @@ place. It affects how `mail-extract-address-components' works." ("gw" "Guinea-Bissau") ("gy" "Guyana") ("hk" "Hong Kong") - ("hm" "Heard Island and Mcdonald Islands") + ("hm" "Heard Island and McDonald Islands") ("hn" "Honduras") ("hr" "Croatia" "Croatia (Hrvatska)") ("ht" "Haiti") diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 882a8771e28..eceb7a5fe3a 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag', folder msg) ;; Was inserted before us, move to end of file to preserve order (goto-char (point-max))))))) - ;; Postition just before forwarded message + ;; Position just before forwarded message. (if (re-search-forward "^------- Forwarded Message" nil t) (forward-line -1) (goto-char (mh-mail-header-end)) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 458993ca8f1..b614cdb7991 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"." "Original-NNTP-" ; mail to news "Original-Path:" ; mail to news "Original-Received:" ; mail to news - "Original-Recipt:" ; RFC 2298 + "Original-Recipient:" ; RFC 2298 "Original-To:" ; mail to news "Original-X-" ; mail to news "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 10a1fa5afc5..89948a2c81a 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time :type '(repeat (string :tag "Argument")) :group 'browse-url) -;; GNOME means of invoking either Mozilla or Netrape. +;; GNOME means of invoking either Mozilla or Netscape. (defvar browse-url-gnome-moz-program "gnome-moz-remote") (defcustom browse-url-gnome-moz-arguments '() diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 9fa5eb32d43..88deef46862 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'." (secrets-get-collections))) (defun secrets-collection-path (collection) - "Return the object path of collection labelled COLLECTION. + "Return the object path of collection labeled COLLECTION. If COLLECTION is nil, return the session collection path. If there is no such COLLECTION, return nil." (or @@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil." (throw 'collection-found collection-path)))))) (defun secrets-create-collection (collection) - "Create collection labelled COLLECTION if it doesn't exist. + "Create collection labeled COLLECTION if it doesn't exist. Return the D-Bus object path for collection." (let ((collection-path (secrets-collection-path collection))) ;; Create the collection. @@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported." "Label")) (defun secrets-set-alias (collection alias) - "Set ALIAS as alias of collection labelled COLLECTION. + "Set ALIAS as alias of collection labeled COLLECTION. For the time being, only the alias \"default\" is supported." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported." alias :object-path secrets-empty-path)) (defun secrets-unlock-collection (collection) - "Unlock collection labelled COLLECTION. + "Unlock collection labeled COLLECTION. If successful, return the object path of the collection." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -509,7 +509,7 @@ If successful, return the object path of the collection." collection-path)) (defun secrets-delete-collection (collection) - "Delete collection labelled COLLECTION." + "Delete collection labeled COLLECTION." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) (secrets-prompt @@ -636,7 +636,7 @@ The object path of the created item is returned." (car result))))) (defun secrets-item-path (collection item) - "Return the object path of item labelled ITEM in COLLECTION. + "Return the object path of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((collection-path (secrets-unlock-collection collection))) (catch 'item-found @@ -645,7 +645,7 @@ If there is no such item, return nil." (throw 'item-found item-path)))))) (defun secrets-get-secret (collection item) - "Return the secret of item labelled ITEM in COLLECTION. + "Return the secret of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((item-path (secrets-item-path collection item))) (unless (secrets-empty-path item-path) @@ -656,7 +656,7 @@ If there is no such item, return nil." "GetSecret" :object-path secrets-session-path)))))) (defun secrets-get-attributes (collection item) - "Return the lookup attributes of item labelled ITEM in COLLECTION. + "Return the lookup attributes of item labeled ITEM in COLLECTION. If there is no such item, or the item has no attributes, return nil." (unless (stringp collection) (setq collection "default")) (let ((item-path (secrets-item-path collection item))) @@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil." secrets-interface-item "Attributes"))))) (defun secrets-get-attribute (collection item attribute) - "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION. + "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION. If there is no such item, or the item doesn't own this attribute, return nil." (cdr (assoc attribute (secrets-get-attributes collection item)))) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 24361e3667a..c7e78cb282a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols: statement-case-open -- The first line in a case block starting with brace. substatement -- The first line after an if/while/for/do/else. substatement-open -- The brace that opens a substatement block. - substatement-label -- Labelled line after an if/while/for/do/else. + substatement-label -- Labeled line after an if/while/for/do/else. case-label -- A \"case\" or \"default\" label. access-label -- C++ private/protected/public access label. label -- Any ordinary label. @@ -1625,7 +1625,7 @@ names).")) (defvar c-macro-with-semi-re nil ;; Regular expression which matches a (#define'd) symbol whose expansion ;; ends with a semicolon. - ;; + ;; ;; This variable should be set by `c-make-macros-with-semi-re' rather than ;; directly. ) @@ -1651,7 +1651,7 @@ names).")) (t (error "c-make-macro-with-semi-re: invalid \ c-macro-names-with-semicolon: %s" c-macro-names-with-semicolon)))))) - + (defvar c-macro-names-with-semicolon '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") "List of #defined symbols whose expansion ends with a semicolon. diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index c027b2b7454..597d84619ab 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -5037,7 +5037,7 @@ killed after process termination." (when gen-func (setq error-msg "EMPTY RULES" tree (ebnf-eliminate-empty-rules tree)) - (setq error-msg "OPTMIZE" + (setq error-msg "OPTIMIZE" tree (ebnf-optimize tree)) (setq error-msg "DIMENSIONS" tree (ebnf-dimensions tree)) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index fd3d42685f0..cb0b02ff350 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1462,7 +1462,7 @@ Return point or nil." (defun fortran-beginning-do () "Search backwards for first unmatched DO [WHILE]. -Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." +Return point or nil. Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)." (let ((case-fold-search t) (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) (if (save-excursion @@ -1482,7 +1482,7 @@ Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." (skip-chars-forward " \t0-9") (cond ((looking-at dostart-re) (setq count (1- count))) - ;; Note labelled loop ends not considered. + ;; Note labeled loop ends not considered. ((looking-at "end[ \t]*do\\b") (setq count (1+ count))))) (and (zerop count) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 2f06afaa5ef..a8ff759717e 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Menues +;;; Menus ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 3e707ff3832..31609232884 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -2100,7 +2100,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." (if (= index 0) ;; If the shown files variable has extra directories, then ;; it is our responsibility to redraw them all - ;; Luckilly, the nature of inserting items into this list means + ;; Luckily, the nature of inserting items into this list means ;; that by reversing it, we can easilly go in the right order (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories diff --git a/lisp/startup.el b/lisp/startup.el index 842548577c5..877ba1987f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace." (eq orig-enable-multibyte (default-value 'enable-multibyte-characters))) ;; Init file changed to unibyte. Reset existing multibyte - ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*). + ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*). ;; Arguably this should only be done if they're free of ;; multibyte characters. (mapc (lambda (buffer) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 2325d7b26ff..be14e90e000 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2437,7 +2437,7 @@ in the coord." point-list)) ;; artist-save-chars-under-point-list -;; Remebers the chars that were there before we did draw the line. +;; Remembers the chars that were there before we did draw the line. ;; Returns point-list. ;; (defun artist-save-chars-under-point-list (point-list) diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 741b6cd904c..4459ac10098 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files. Otherwise the search is limited to the current buffer. Return position of entry if CROSSREF-KEY is found or nil otherwise. If CROSSREF-KEY is in the same buffer like current entry but before it -an error is signaled. If NOERRER is non-nil this error is suppressed. +an error is signaled. If NOERROR is non-nil this error is suppressed. Optional arg PNT is the position of the referencing entry. It defaults to position of point. If optional arg SPLIT is non-nil, split window so that both the referencing and the crossrefed entry are displayed. diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index ccdab49750b..6a3a7bef244 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -139,7 +139,7 @@ No active TAGS table is required." (set (make-local-variable 'TeX-master) master) (erase-buffer) (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") - (insert + (insert " Move point to label and type `r' to run a query-replace on the label\n" " and its references. Type `q' to exit this buffer.\n\n") (insert " LABEL FILE\n") @@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile documents. You should not use it if another document refers to this one with the `xr' package." (interactive) - ;; Resan the entire document + ;; Rescan the entire document (reftex-access-scan-info 1) ;; Get some insurance (if (and (reftex-is-multi) (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) (error "Abort")) ;; Make the translation list - (let* ((re-core (concat "\\(" - (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") + (let* ((re-core (concat "\\(" + (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") "\\)")) (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) @@ -231,11 +231,11 @@ one with the `xr' package." (reftex-save-all-document-buffers) ;; First test to check for erros - (setq n (reftex-translate + (setq n (reftex-translate files search-re translate-alist error-fmt 'test)) ;; Now the real thing. - (if (yes-or-no-p + (if (yes-or-no-p (format "Replace %d items at %d places in %d files? " (length translate-alist) n (length files))) (progn @@ -253,9 +253,9 @@ one with the `xr' package." (defun reftex-translate (files search-re translate-alist error-fmt test) ;; In FILES, look for SEARCH-RE and replace match 1 of it with - ;; its association in TRANSLATE-ALSIT. + ;; its association in TRANSLATE-ALSIT. ;; If we do not find an association and TEST is non-nil, query - ;; to ignore the problematic string. + ;; to ignore the problematic string. ;; If TEST is nil, it is ignored without query. ;; Return the number of replacements. (let ((n 0) file label match-data buf macro pos cell) @@ -281,7 +281,7 @@ one with the `xr' package." (or (looking-at "\\\\ref") (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") - (looking-at (format + (looking-at (format reftex-find-label-regexp-format (regexp-quote label))))) ;; OK, we should replace it. @@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode." (defun reftex-isearch-wrap-function () (if (not isearch-word) - (switch-to-buffer + (switch-to-buffer (funcall isearch-next-buffer-function (current-buffer) t))) (goto-char (if isearch-forward (point-min) (point-max)))) @@ -435,7 +435,7 @@ With no argument, this command toggles `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." (interactive "P") (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) - (setq reftex-isearch-minor-mode + (setq reftex-isearch-minor-mode (not (or (and (null arg) reftex-isearch-minor-mode) (<= (prefix-numeric-value arg) 0)))) (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) @@ -471,7 +471,7 @@ With no argument, this command toggles ;; Force modeline redisplay. (set-buffer-modified-p (buffer-modified-p)))) -(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil +(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 'reftex-isearch-minor-mode) ;;; reftex-global.el ends here diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index eeaa2cfa927..787a8b7c0f1 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -81,7 +81,7 @@ that Ediff doesn't know about.") ;; so that `kill-all-local-variables' (called by major-mode setting ;; commands) won't destroy Ediff control variables. ;; -;; Plagiarised from `emerge-defvar-local' for XEmacs. +;; Plagiarized from `emerge-defvar-local' for XEmacs. (defmacro ediff-defvar-local (var value doc) "Defines VAR as a local variable." (declare (indent defun)) diff --git a/msdos/README b/msdos/README index 9f75d9c12bf..532d18726c6 100644 --- a/msdos/README +++ b/msdos/README @@ -60,7 +60,7 @@ This document is Copyright (C) DJ Delorie and may be distributed verbatim, but changing it is not allowed. Source code copyright DJ Delorie is distributed under the terms of the -GNU General Public Licence, with the following exceptions: +GNU General Public License, with the following exceptions: * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and libemu.a are distributed under the terms of the GNU Library General @@ -68,7 +68,7 @@ GNU General Public Licence, with the following exceptions: * Any existing copyright or authorship information in any given source file must remain intact. If you modify a source file, a notice to that - effect must be added to the authorship information in the source file. + effect must be added to the authorship information in the source file. * Runtime binaries, as provided by DJ in DJGPP, may be distributed without sources ONLY if the recipient is given sufficient information diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index bf1e77b5ff7..aa27211c05c 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h @@ -185,7 +185,7 @@ typedef struct _xmenu { Window parent; /* Menu's parent window. */ int width; /* Overall menu width. */ int height; /* Overall menu height. */ - int x_pos; /* Oveall menu origin. */ + int x_pos; /* Overall menu origin. */ int y_pos; /* Overall menu origin. */ Cursor mouse_cursor; /* Mouse cursor raster. */ XAssocTable *assoc_tab; /* XMWindow association table. */ diff --git a/src/ccl.c b/src/ccl.c index 01943eddf58..83192d9d737 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1762,7 +1762,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size case CCL_STAT_QUIT: if (! ccl->quit_silently) - sprintf (msg, "\nCCL: Quited."); + sprintf (msg, "\nCCL: Quitted."); break; default: diff --git a/src/font.c b/src/font.c index f6723157de1..ead8225471e 100644 --- a/src/font.c +++ b/src/font.c @@ -802,7 +802,7 @@ font_expand_wildcards (Lisp_Object *field, int n) struct { /* Minimum possible field. */ int from; - /* Maxinum possible field. */ + /* Maximum possible field. */ int to; /* Bit mask of possible field. Nth bit corresponds to Nth field. */ int mask; diff --git a/src/fontset.c b/src/fontset.c index 74a25a1ca04..5c9ebf8440a 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1788,7 +1788,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) /* Return a cons (FONT-OBJECT . GLYPH-CODE). FONT-OBJECT is the font for the character at POSITION in the current buffer. This is computed from all the text properties and overlays - that apply to POSITION. POSTION may be nil, in which case, + that apply to POSITION. POSITION may be nil, in which case, FONT-SPEC is the font for displaying the character CH with the default face. diff --git a/src/keyboard.c b/src/keyboard.c index f8c31af3fbe..fb989d3ea95 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8782,7 +8782,7 @@ typedef struct keyremap /* Positions [START, END) in the key sequence buffer are the key that we have scanned so far. Those events are the ones that we will replace - if PAREHT maps them into a key sequence. */ + if PARENT maps them into a key sequence. */ int start, end; } keyremap; diff --git a/src/nsfns.m b/src/nsfns.m index 20b021c6f5d..bcf14fe6105 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1267,7 +1267,7 @@ This function is an internal primitive--use `make-frame' instead. */) #endif init_frame_faces (f); - + /* The resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode variables; ignore them here. */ @@ -1656,7 +1656,7 @@ If omitted or nil, the selected frame's display is used. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Return whether the Nexstep display DISPLAY supports backing store. + doc: /* Return whether the Nextstep display DISPLAY supports backing store. The value may be `buffered', `retained', or `non-retained'. DISPLAY should be a frame, the display name as a string, or a terminal ID. If omitted or nil, the selected frame's display is used. */) diff --git a/src/w32term.c b/src/w32term.c index f876cff0363..e2a06446976 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3287,7 +3287,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, /* Handle mouse button event on the tool-bar of frame F, at frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress - or ButtonRelase. */ + or ButtonRelease. */ static void w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) diff --git a/src/xdisp.c b/src/xdisp.c index dfb794f38d3..efe7a6c9d00 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22049,7 +22049,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, /* Get glyph code of character C in FONT in the two-byte form CHAR2B. - Retunr 1 if FONT has a glyph for C, otherwise return 0. */ + Return 1 if FONT has a glyph for C, otherwise return 0. */ static inline int get_char_glyph_code (int c, struct font *font, XChar2b *char2b) diff --git a/src/xfns.c b/src/xfns.c index 2359a1a82c2..6de412c4e68 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3691,7 +3691,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of the X server of display TERMINAL. -\(Labelling every distributor as a "vendor" embodies the false assumption +\(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). -- cgit v1.2.3 From 91af3942e9ab5540b3ab4dde6733bc883dc2abdd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 14 Nov 2011 15:59:56 -0800 Subject: Spelling fixes. --- admin/README | 3 +- admin/alloc-colors.c | 3 +- admin/grammars/c.by | 2 +- admin/notes/multi-tty | 23 +++-- admin/notes/nextstep | 3 +- doc/emacs/ack.texi | 2 +- doc/emacs/building.texi | 2 +- doc/emacs/macos.texi | 2 +- doc/lispref/processes.texi | 2 +- doc/misc/ChangeLog | 2 +- doc/misc/cc-mode.texi | 78 +++++++-------- doc/misc/eshell.texi | 2 +- doc/misc/gnus-faq.texi | 98 +++++++++---------- doc/misc/gnus.texi | 2 +- doc/misc/org.texi | 4 +- doc/misc/sc.texi | 4 +- doc/misc/semantic.texi | 2 +- doc/misc/tramp.texi | 2 +- etc/ChangeLog | 2 +- etc/NEWS.1-17 | 3 +- etc/NEWS.23 | 2 +- etc/PROBLEMS | 2 +- etc/gnus-tut.txt | 4 +- etc/srecode/wisent.srt | 2 +- etc/themes/manoj-dark-theme.el | 2 +- lisp/ChangeLog.15 | 2 +- lisp/apropos.el | 2 +- lisp/arc-mode.el | 2 +- lisp/cedet/ede.el | 2 +- lisp/cedet/ede/generic.el | 2 +- lisp/cedet/semantic/analyze.el | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/decorate.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/ia.el | 4 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/lex.el | 2 +- lisp/cedet/semantic/scope.el | 2 +- lisp/cedet/srecode/ctxt.el | 2 +- lisp/cedet/srecode/document.el | 4 +- lisp/cedet/srecode/extract.el | 2 +- lisp/cedet/srecode/fields.el | 2 +- lisp/comint.el | 2 +- lisp/desktop.el | 2 +- lisp/dired.el | 2 +- lisp/emacs-lisp/eieio.el | 4 +- lisp/emacs-lisp/eldoc.el | 2 +- lisp/emacs-lisp/rx.el | 2 +- lisp/emulation/crisp.el | 2 +- lisp/erc/erc-autoaway.el | 3 +- lisp/eshell/esh-cmd.el | 2 +- lisp/gnus/ChangeLog | 16 +-- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-diary.el | 2 +- lisp/gnus/gnus-start.el | 2 +- lisp/help-fns.el | 2 +- lisp/info.el | 2 +- lisp/isearch.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/ldefs-boot.el | 2 +- lisp/mail/feedmail.el | 2 +- lisp/mh-e/mh-alias.el | 2 +- lisp/net/quickurl.el | 2 +- lisp/net/tramp-sh.el | 2 +- lisp/net/zeroconf.el | 2 +- lisp/obsolete/iso-acc.el | 2 +- lisp/org/ChangeLog | 8 +- lisp/org/org-beamer.el | 2 +- lisp/org/org-ctags.el | 8 +- lisp/org/org-footnote.el | 2 +- lisp/org/org-publish.el | 4 +- lisp/org/org.el | 2 +- lisp/play/5x5.el | 6 +- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/cc-engine.el | 16 +-- lisp/progmodes/cc-vars.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/gdb-mi.el | 4 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/prolog.el | 2 +- lisp/progmodes/sql.el | 18 ++-- lisp/simple.el | 2 +- lisp/tar-mode.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/reftex-parse.el | 2 +- lisp/textmodes/reftex-toc.el | 4 +- lisp/textmodes/reftex.el | 4 +- lisp/textmodes/remember.el | 2 +- lisp/textmodes/rst.el | 2 +- lisp/vc/ediff-wind.el | 2 +- lisp/vc/vc-rcs.el | 2 +- lisp/whitespace.el | 2 +- lisp/windmove.el | 2 +- lisp/xml.el | 2 +- src/alloc.c | 2 +- src/bytecode.c | 2 +- src/coding.h | 2 +- src/emacs.c | 2 +- src/font.c | 2 +- src/image.c | 2 +- src/indent.c | 2 +- src/keyboard.c | 2 +- src/nsterm.m | 2 +- src/sound.c | 2 +- src/w32fns.c | 2 +- src/w32font.c | 2 +- src/w32menu.c | 2 +- src/w32term.c | 2 +- test/indent/octave.m | 166 ++++++++++++++++---------------- 112 files changed, 329 insertions(+), 337 deletions(-) (limited to 'src/keyboard.c') diff --git a/admin/README b/admin/README index 4dd1705fe74..10a8f2244fc 100644 --- a/admin/README +++ b/admin/README @@ -18,7 +18,7 @@ Living list of activities that must be completed before the next release. ** make-tarball.txt -Instructions to create pretest or release tarballs, annoucements, etc. +Instructions to create pretest or release tarballs, announcements, etc. ** admin.el @@ -88,4 +88,3 @@ Local variables: mode: outline paragraph-separate: "[ ]*$" end: - diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index e09ddd62b97..b3ea8af9d70 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -40,7 +40,7 @@ void usage (const char *progname) { fprintf (stderr, "Usage %s options\n", progname); - fprintf (stderr, "-n NCOLORS allcoate NCOLORS colors\n"); + fprintf (stderr, "-n NCOLORS allocate NCOLORS colors\n"); exit (1); } @@ -111,4 +111,3 @@ main (int argc, char **argv) XCloseDisplay (dpy); return 0; } - diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 9fbb6592b75..8c97261debd 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -1105,7 +1105,7 @@ fun-or-proto-end ( t ) | semantic-list ( nil ) - ;; Here is an anoying feature of C++ pure virtual methods + ;; Here is an annoying feature of C++ pure virtual methods | EQUAL ZERO SEMICOLON ( :pure-virtual-flag ) | fun-try-end diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 85babb903b9..410e3aa8614 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions: name="$1" shift - + if [ -z "$name" ]; then echo "Usage: connect_emacs ..." >&2 exit 1 @@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER" serverdir="/tmp/emacs$UID" emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs -if [ -z "$name" ]; then +if [ -z "$name" ]; then echo "Usage: preload_emacs []" >&2 exit 1 fi @@ -314,7 +314,7 @@ THINGS TO DO Emacs with GTK support. If you want to play around with GTK multidisplay (and don't mind core dumps), you can edit src/config.h and define HAVE_GTK_MULTIDISPLAY there by hand. - + http://bugzilla.gnome.org/show_bug.cgi?id=85715 Update: Han reports that GTK+ version 2.8.9 almost gets display @@ -414,7 +414,7 @@ THINGS TO DO sometimes; Emacs does not respond to stimuli from other keyboards. At least a beep or a message would be important, if the single-mode is still required to prevent interference. (Reported by Dan - Nicolaescu.) + Nicolaescu.) Update: selecting a region with the mouse enables single_kboard under X. This is very confusing. @@ -542,7 +542,7 @@ THINGS TO DO are not useful; before starting work on DOS support, revert to pristine, pre-multi-tty versions. -** Fix Windows support. Currently bootstraping works on w32, but Emacs +** Fix Windows support. Currently bootstrapping works on w32, but Emacs crashes on startup and none of the multi-tty features are implemented. Many XXX comments mark things that probably need updating, ChangeLogs will help in spotting changes to X specific @@ -1026,7 +1026,7 @@ DIARY OF CHANGES settings as Emacs itself. This may lead to bogus results in a multi-locale setup. (E.g., while logging in from a remote client with a different locale.) - (Update after new bugreport by Friedrich Delgado Friedrichs: + (Update after new bugreport by Friedrich Delgado Friedrichs: (at least) the structs terminal_coding and keyboard_coding in coding.c must be moved to struct display, and the Lisp interface [set-]keyboard-coding-system must be adapted for the change.) @@ -1088,7 +1088,7 @@ DIARY OF CHANGES -- Miles Bader suggests that C-x C-c on an emacsclient frame should only close the frame, not exit the entire Emacs session. Update: see above for a function that does this. Maybe this should be the - new default? + new default? (Done. This is the new default. No complaints so far.) @@ -1131,7 +1131,7 @@ DIARY OF CHANGES from exiting Emacs. (Reported by Mnemonikk on freenode.) (Done, I hope.) - + -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow keys on non-selected terminals under screen, and sometimes on other @@ -1157,7 +1157,7 @@ DIARY OF CHANGES > Cursor mode. Applications have to send the smkx and rmkx terminfo > strings to switch between the 2 modes. So Emacs (and emacsclient) have > to send smkx when initializing and rmkx when quitting (or on - > suspend). + > suspend). (I think patch-370 fixed this.) @@ -1166,7 +1166,7 @@ DIARY OF CHANGES emacs M-x server-start - + # From another xterm: emacsclient -e '(y-or-n-p "Do you want me to crash? ")' # Notice how the answer ends up in the *scratch* buffer @@ -1205,7 +1205,7 @@ DIARY OF CHANGES it is not recognized correctly. May be related to the bug below. (Seems to have been fixed as a side effect of patch-434. "The bug - below" was the set-input-mode madness.) + below" was the set-input-mode madness.) (Update: this bug was fixed for good in patch-449. It was tracked down to a bug in `read_key_sequence': it failed to reinitialize its @@ -1359,4 +1359,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - diff --git a/admin/notes/nextstep b/admin/notes/nextstep index 462101f9abf..cf0ebbc11aa 100644 --- a/admin/notes/nextstep +++ b/admin/notes/nextstep @@ -78,7 +78,7 @@ Text Rendering and Font Handling nsfont.m implements the font driver, responsible for managing fonts and rendering text. Fonts are obtained through NSFontManager. Rendering must be done at a low level due to emacs' fine control over this process, therefore -there are different approachs under Cocoa and GNUstep. Under GNUstep, the +there are different approaches under Cocoa and GNUstep. Under GNUstep, the original NeXT Display PostScript (DPS) APIs are available and used. Under Cocoa, these were removed and Quartz drawing functions replaced them. @@ -156,4 +156,3 @@ EmacsPrefsController : NSObject EmacsSavePanel : NSSavePanel EmacsOpenPanel : NSOpenPanel - utility override for panel notifications - diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index c2242c444dd..6801c7f1e0e 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -206,7 +206,7 @@ use it, Snake and Tetris. @item Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before -it is analysed for spam. +it is analyzed for spam. @item Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index cca9e441ed4..ac62e2d9652 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1251,7 +1251,7 @@ screen Emacs frame. In all-stop mode, whenever your program stops, @emph{all} threads of execution stop. Likewise, whenever you restart the program, all threads start executing. @xref{All-Stop Mode, , All-Stop Mode, gdb, -The GNU debugger}. You can enable this behaviour in Emacs by setting +The GNU debugger}. You can enable this behavior in Emacs by setting @code{gdb-non-stop-setting} to @code{nil} before starting a debugging session. diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 5a97fa8460b..3e1e67fecd8 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -120,7 +120,7 @@ Useful in this context is the listing of all faces obtained by @key{M-x} @subsection Open files by dragging to an Emacs window -The default behaviour when a user drags files from another application +The default behavior when a user drags files from another application into an Emacs frame is to insert the contents of all the dragged files into the current buffer. To remap the @code{ns-drag-file} event to open the dragged files in the current frame use the following line: diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index d4f8ee9708b..51d91572d0e 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -420,7 +420,7 @@ remote files. Per default, this variable is always set to @code{t}, meaning that a call of @code{process-file} could potentially change any file on a remote host. When set to @code{nil}, a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by @code{setq}. Instead of, it shall be set only by let-binding. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f06405be625..ec12b77e826 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2299,7 +2299,7 @@ 2009-08-25 Michael Albinus * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping. - Describe autostart behaviour of dbus-ping. + Describe autostart behavior of dbus-ping. (Synchronous Methods, Asynchronous Methods): Use English numeric format for timeout values. (Top): Remove footnote saying D-Bus is not enabled by diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 887e3f3c808..a4d377ebdce 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -287,11 +287,11 @@ Configuration Basics Styles -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: Customizing Auto-newlines @@ -311,19 +311,19 @@ Indentation Engine Basics Syntactic Symbols -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: Customizing Indentation @@ -343,8 +343,8 @@ Line-Up Functions Customizing Macros -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end detailmenu @end menu @@ -912,7 +912,7 @@ construct, should the point start inside it. If @ccmode fails to find function beginnings or ends inside the current declaration scope, it will search the enclosing scopes. If you want @ccmode to recognize functions only at the top level@footnote{this was @ccmode{}'s -behaviour prior to version 5.32.}, set @code{c-defun-tatic} to +behavior prior to version 5.32.}, set @code{c-defun-tatic} to @code{t}. These functions are analogous to the Emacs built-in commands @@ -2537,11 +2537,11 @@ As an alternative to writing a style definition yourself, you can have already formatted piece of your code, @ref{Guessing the Style}. @menu -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -4266,19 +4266,19 @@ Java. @ref{Java Symbols}. @end table @menu -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -6653,8 +6653,8 @@ these macros properly, see @ref{Macros with ;}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @menu -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 74082bfd3b1..d2705155887 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -379,7 +379,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el' sudo is an alias, defined as "*sudo $*" @end example -Some of the built-in commands have a special behaviour in Eshell: +Some of the built-in commands have a special behavior in Eshell: @table @code diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index e8e89ed2a30..b5bb75f7284 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -12,7 +12,7 @@ @section Frequently Asked Questions @menu -* FAQ - Changes:: +* FAQ - Changes:: * FAQ - Introduction:: About Gnus and this FAQ. * FAQ 1 - Installation FAQ:: Installation of Gnus. * FAQ 2 - Startup / Group buffer:: Start up questions and the @@ -37,7 +37,7 @@ This is the new Gnus Frequently Asked Questions list. -Please submit features and suggestions to the +Please submit features and suggestions to the @email{ding@@gnus.org, ding list}. @node FAQ - Changes @@ -166,7 +166,7 @@ package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs 21 is outdated). You can get the latest released version of Gnus from @uref{http://www.gnus.org/dist/gnus.tar.gz} -or via anonymous FTP from +or via anonymous FTP from @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}. @node FAQ 1-4 @@ -176,7 +176,7 @@ What to do with the tarball now? @subsubheading Answer -Untar it via @samp{tar xvzf gnus.tar.gz} and do the common +Untar it via @samp{tar xvzf gnus.tar.gz} and do the common @samp{./configure; make; make install} circle. (under MS-Windows either get the Cygwin environment from @uref{http://www.cygwin.com} @@ -344,7 +344,7 @@ hit @samp{C-y}. @subsection Getting Messages @menu -* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} +* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} but it only says "nntp (news) open error", what to do? * FAQ 3-2:: I'm working under Windows and have no idea what ~/.gnus.el means. @@ -369,8 +369,8 @@ hit @samp{C-y}. @node FAQ 3-1 @subsubheading Question 3.1 -I just installed Gnus, started it via -@samp{M-x gnus} +I just installed Gnus, started it via +@samp{M-x gnus} but it only says "nntp (news) open error", what to do? @subsubheading Answer @@ -396,14 +396,14 @@ I'm working under Windows and have no idea what ~/.gnus.el means. The ~/ means the home directory where Gnus and Emacs look for the configuration files. However, you don't really need to know what this means, it suffices that Emacs knows -what it means :-) You can type -@samp{C-x C-f ~/.gnus.el RET } +what it means :-) You can type +@samp{C-x C-f ~/.gnus.el RET } (yes, with the forward slash, even on Windows), and Emacs will open the right file for you. (It will most likely be new, and thus empty.) However, I'd discourage you from doing so, since the directory Emacs chooses will most certainly not be what -you want, so let's do it the correct way. +you want, so let's do it the correct way. The first thing you've got to do is to create a suitable directory (no blanks in directory name please) e.g. c:\myhome. Then you must set the environment @@ -442,7 +442,7 @@ machine news.yourprovider.net login YourUserName password YourPassword . Make sure that the file isn't readable to others if you work on a OS which is capable of doing so. (Under Unix -say +say @example chmod 600 ~/.authinfo @end example @@ -477,13 +477,13 @@ post on this server as well as I am, what's that? Some providers allow restricted anonymous access and full access only after authorization. To make Gnus send authinfo -to those servers append +to those servers append @example force yes @end example @noindent - + to the line for those servers in ~/.authinfo. @node FAQ 3-6 @@ -774,7 +774,7 @@ When I enter a group, all read messages are gone. How to view them again? @subsubheading Answer -If you enter the group by saying +If you enter the group by saying @samp{RET} in group buffer with point over the group, only unread and ticked messages are loaded. Say @samp{C-u RET} @@ -787,13 +787,13 @@ Loading only unread messages can be annoying if you have threaded view enabled, (setq gnus-fetch-old-headers 'some) @end example @noindent - + in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load -all articles (Warning: Both settings enlarge the amount of data which is +all articles (Warning: Both settings enlarge the amount of data which is fetched when you enter a group and slow down the process of entering a group). -If you already use Gnus 5.10, you can say -@samp{/o N} +If you already use Gnus 5.10, you can say +@samp{/o N} In summary buffer to load the last N messages, this feature is not available in 5.8.8 If you don't want all old messages, but the parent of the message you're just reading, @@ -822,9 +822,9 @@ How to view the headers of a message? @subsubheading Answer -Say @samp{t} +Say @samp{t} to show all headers, one more -@samp{t} +@samp{t} hides them again. @node FAQ 4-4 @@ -834,10 +834,10 @@ How to view the raw unformatted message? @subsubheading Answer -Say -@samp{C-u g} +Say +@samp{C-u g} to show the raw message -@samp{g} +@samp{g} returns to normal view. @node FAQ 4-5 @@ -873,7 +873,7 @@ Say @example (eval-after-load "mm-decode" - '(progn + '(progn (add-to-list 'mm-discouraged-alternatives "text/html") (add-to-list 'mm-discouraged-alternatives "text/richtext"))) @end example @@ -1042,7 +1042,7 @@ back ends. Gnus thinks "highest-article-number - lowest-article-number = total-number-of-articles". This works OK for Usenet groups, but if you delete and move many messages in mail groups, this fails. To cure the -symptom, enter the group via @samp{C-u RET} +symptom, enter the group via @samp{C-u RET} (this makes Gnus get all messages), then hit @samp{M P b} to mark all messages and then say @samp{B m name.of.group} to move @@ -1162,7 +1162,7 @@ general rule (regular expression .*) which denotes where articles should go which don't match any other rule. If the folder doesn't exist yet, it will be created as soon as an article lands there. By default the mail will be -send to all groups whose rules match. If you +send to all groups whose rules match. If you don't want that (you probably don't want), say @example @@ -1203,7 +1203,7 @@ from using them): ("Spam" "^CC: .*azzrael@@t-online.invalid") ("Spam" "^X-Mailer-Version: 1.50 BETA") ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") - ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)") + ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") ("Spam" ""))) @end example @noindent @@ -1393,13 +1393,13 @@ You can use ispell.el to spell-check stuff in Emacs. So the first thing to do is to make sure that you've got either @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell} or @uref{http://aspell.sourceforge.net/, aspell} -installed and in your Path. Then you need +installed and in your Path. Then you need @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el} -and for on-the-fly spell-checking +and for on-the-fly spell-checking @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}. -Ispell.el is shipped with Emacs and available through the XEmacs package system, -flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is -available through the package system, so there should be no need to install them +Ispell.el is shipped with Emacs and available through the XEmacs package system, +flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is +available through the package system, so there should be no need to install them manually. Ispell.el assumes you use ispell, if you choose aspell say @@ -1408,7 +1408,7 @@ Ispell.el assumes you use ispell, if you choose aspell say (setq ispell-program-name "aspell") @end example @noindent - + in your Emacs configuration file. If you want your outgoing messages to be spell-checked, say @@ -1445,7 +1445,7 @@ Yes, say something like (ispell-change-dictionary "english"))))) @end example @noindent - + in ~/.gnus.el. Change "^de\\." and "deutsch8" to something that suits your needs. @@ -1472,7 +1472,7 @@ cause Gnus to insert the full address for you. See the node "Mail Aliases" in Message (not Gnus) manual for details. -However, what you really want is the Insidious Big Brother +However, what you really want is the Insidious Big Brother Database bbdb. Get it through the XEmacs package system or from @uref{http://bbdb.sourceforge.net/, bbdb's homepage}. Now place the following in ~/.gnus.el, to activate bbdb for Gnus: @@ -1488,7 +1488,7 @@ place them in ~/.emacs: @example (require 'bbdb) -;;If you don't live in Northern America, you should disable the +;;If you don't live in Northern America, you should disable the ;;syntax check for telephone numbers by saying (setq bbdb-north-american-phone-numbers-p nil) ;;Tell bbdb about your email address: @@ -1529,7 +1529,7 @@ X-Face. So fire up some image manipulation program (say Gimp), open the image you want to include, cut out the relevant part, reduce color depth to 1 bit, resize to 48*48 and save as bitmap. Now you should get the compface -package from +package from @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}. and create the actual X-face by saying @@ -1539,7 +1539,7 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted @end example @noindent -If you can't use compface, there's an online X-face converter at +If you can't use compface, there's an online X-face converter at @uref{http://www.dairiki.org/xface/}. If you use MS Windows, you could also use the WinFace program from @uref{http://www.xs4all.nl/~walterln/winface/}. @@ -1668,7 +1668,7 @@ by saying: @noindent in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this -instead (works for newer versions as well): +instead (works for newer versions as well): @example (eval-after-load "message" @@ -1961,12 +1961,12 @@ receives the mail you write from Gnus and sends them when you're online. Let's talk about Unix systems first: For the news part, -the easiest solution is a small nntp server like +the easiest solution is a small nntp server like @uref{http://www.leafnode.org/, Leafnode} or @uref{http://infa.abo.fi/~patrik/sn/, sn}, of course you can also install a full featured news -server like -@uref{http://www.isc.org/products/INN/, inn}. +server like +@uref{http://www.isc.org/products/INN/, inn}. Then you want to fetch your Mail, popular choices are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail} and @uref{http://pyropus.ca/software/getmail/, getmail}. @@ -1978,8 +1978,8 @@ sending part: This can be done with every MTA like @uref{http://www.exim.org/, exim} or @uref{http://www.qmail.org/, qmail}. -On windows boxes I'd vote for -@uref{http://www.tglsoft.de/, Hamster}, +On windows boxes I'd vote for +@uref{http://www.tglsoft.de/, Hamster}, it's a small freeware, open-source program which fetches your mail and news from remote servers and offers them to Gnus (or any other mail and/or news reader) via nntp @@ -2136,7 +2136,7 @@ Which mailing lists and newsgroups are there? @subsubheading Answer There's the newsgroup gnu.emacs.gnus (also available as -@uref{http://dir.gmane.org/gmane.emacs.gnus.user, +@uref{http://dir.gmane.org/gmane.emacs.gnus.user, gmane.emacs.gnus.user}) which deals with general Gnus questions. If you have questions about development versions of Gnus, you should better ask on the ding mailing list, see below. @@ -2149,7 +2149,7 @@ de.comm.software.gnus. The ding mailing list (ding@@gnus.org) deals with development of Gnus. You can read the ding list via NNTP, too under the name -@uref{http://dir.gmane.org/gmane.emacs.gnus.general, +@uref{http://dir.gmane.org/gmane.emacs.gnus.general, gmane.emacs.gnus.general} from news.gmane.org. @node FAQ 8-5 @@ -2160,7 +2160,7 @@ Where to report bugs? @subsubheading Answer Say @samp{M-x gnus-bug}, this will start -a message to the +a message to the @email{bugs@@gnus.org, gnus bug mailing list} including information about your environment which make it easier to help you. @@ -2237,7 +2237,7 @@ building of summary say at the bottom of your ~/.gnus.el, this will make gnus byte-compile things like -gnus-summary-line-format. +gnus-summary-line-format. then you could increase the value of gc-cons-threshold by saying something like @@ -2254,7 +2254,7 @@ recent GNU Emacs, you should say (setq gnus-use-correct-string-widths nil) @end example @noindent - + in ~/.gnus.el (thanks to Jesper harder for the last two suggestions). Finally if you are still using 5.8.8 or 5.9 and experience speed problems with summary diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 545306e4dc7..6d9ffaf17d8 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -18001,7 +18001,7 @@ see the event's date. @code{gnus-diary} provides two supplemental user formats to be used in summary line formats. @code{D} corresponds to a formatted time string for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''), -while @code{d} corresponds to an approximative remaining time until the +while @code{d} corresponds to an approximate remaining time until the next occurrence of the event (e.g. ``in 6 months, 1 week''). For example, here's how Joe's birthday is displayed in my diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2a3d99ca7f4..9d164999b7c 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -3883,7 +3883,7 @@ special faces for some of them. This can be done using the variable @end lisp While using a list with face properties as shown for CANCELED @emph{should} -work, this does not aways seem to be the case. If necessary, define a +work, this does not always seem to be the case. If necessary, define a special face and use that. A string is interpreted as a color. The variable @code{org-faces-easy-properties} determines if that color is interpreted as a foreground or a background color. @@ -5664,7 +5664,7 @@ an item: @orgcmd{C-c C-d,org-deadline} Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen in the line directly following the headline. Any CLOSED timestamp will be -removed. When called with a prefix arg, an existing deadline will be removed +removed. When called with a prefix arg, an existing deadline will be removed from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, and @code{nologredeadline}}, a note will be taken when changing an existing diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 8853192af04..37ccc4045be 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -56,7 +56,7 @@ developing GNU and promoting software freedom.'' @top Supercite @comment node-name, next, previous, up -@insertcopying +@insertcopying The manual is divided into the following chapters. @@ -1877,7 +1877,7 @@ been continuously added through the comments and suggestions of the Supercite mailing list participants. With version 3, Supercite underwent an almost complete rewrite, -benefitting in a number of ways, including vast improvements in the +benefiting in a number of ways, including vast improvements in the speed of performance, a big reduction in size of the code and in the use of Emacs resources, and a much cleaner and flexible internal architecture. Most of this work was internal and not of very great diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f6cf7a07ae8..eb59f6d6b94 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -349,7 +349,7 @@ This file also provides support for @code{semanticdb-minor-mode}, which automatically associates files with tables in databases so that tags are @emph{saved} while a buffer is not in memory. -The database and tables both also provide applicate cache information, +The database and tables both also provide applicable cache information, and cache flushing system. The semanticdb search routines use caches to save datastructures that are complex to calculate. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index a4e06ab22f1..0accc6fac43 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1575,7 +1575,7 @@ password handling. Consider @command{ssh-agent} for @option{ssh}-like methods, or @command{pageant} for @option{plink}-like methods. However, if you cannot apply such native password handling, -@value{tramp} offers altenatives. +@value{tramp} offers alternatives. @anchor{Using an authentication file} diff --git a/etc/ChangeLog b/etc/ChangeLog index 1b1bc3f2abd..1db595b3175 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -375,7 +375,7 @@ 2011-01-04 Jan Moringen - * NEWS: Extended behaviour of dbus-register-{method,property}. + * NEWS: Extended behavior of dbus-register-{method,property}. 2011-01-02 Kenichi Handa diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index e8570cb7c48..d835cd6f33e 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1074,7 +1074,7 @@ Another `t' switches back to the usual display. * Rmail commands `a' and `k' set message attributes. `a' adds an attribute and `k' removes one. You specify -the attrbute by name. You can specify either a built-in +the attribute by name. You can specify either a built-in flag such as "deleted" or "filed", or a user-defined keyword (anything not recognized as built-in). @@ -2530,4 +2530,3 @@ along with GNU Emacs. If not, see . Local variables: mode: text end: - diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 182a8a4a008..43c085ad803 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -2102,7 +2102,7 @@ function to use for searching in `query-replace-regexp', *** New keymap `search-map' bound to `M-s' provides global bindings for search related commands. -*** New keymap `multi-query-replace-map' contains additonal keys bound +*** New keymap `multi-query-replace-map' contains additional keys bound to `automatic-all' and `exit-current' for multi-buffer interactive replacement. *** The variable `inhibit-changing-match-data', if non-nil, prevents diff --git a/etc/PROBLEMS b/etc/PROBLEMS index e85972f0bfd..57a3387ee40 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1250,7 +1250,7 @@ be carried out at the same time: 4) Use lbxproxy on the remote end of the connection. This is an interface to the low bandwidth X extension in most modern X servers, which improves performance dramatically, at the slight expense of correctness - of the X protocol. lbxproxy acheives the performance gain by grouping + of the X protocol. lbxproxy achieves the performance gain by grouping several X requests in one TCP packet and sending them off together, instead of requiring a round-trip for each X request in a separate packet. The switches that seem to work best for emacs are: diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 80a652ba25f..9132ece533e 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -188,7 +188,7 @@ remove all hilit code from all the Gnus hooks (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and `gnus-summary-article-hook'). (Well, at the very least the first two.) Gnus provides various integrated functions for highlighting, -which are both faster and more accurated. +which are both faster and more accurate. There is absolutely no chance, whatsoever, of getting Gnus to work with Emacs 18. It won't even work on Emacsen older than Emacs @@ -288,5 +288,3 @@ me the patches, but one can't have everything. If you have any questions on usage, the "ding@ifi.uio.no" mailing list is where to post the questions. - - diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index d45392e93dd..b66a17a4be5 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt @@ -55,7 +55,7 @@ goal %% (define-lex wisent-{{TARGETMODE}}-lexer - "Lexical analzer to handle {{TARGETMODE}} buffers." + "Lexical analyzer to handle {{TARGETMODE}} buffers." ;; semantic-lex-newline semantic-lex-ignore-whitespace semantic-lex-ignore-newline diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index bd6bbaa88a2..55b07e6eaef 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -52,7 +52,7 @@ ;; reading mail/USENET. ;; In the message itself, quoted mail messages from different people -;; are color coordinated, with high contrast beteen citations that are +;; are color coordinated, with high contrast between citations that are ;; close to each other in the heirarchy, so it is less likely that one ;; misunderstands who said what in a long conversation. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index aa9c9066dc1..e51e10df6a5 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -5815,7 +5815,7 @@ querying the password for. * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers - behaviour, don't bury the ibuffer buffer when visiting other buffers. + behavior, don't bury the ibuffer buffer when visiting other buffers. 2010-10-08 Chong Yidong diff --git a/lisp/apropos.el b/lisp/apropos.el index 1dfe5cde9ed..9a372f27991 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1052,7 +1052,7 @@ If non-nil TEXT is a string that will be printed as a heading." ;; omitting any that contain a buffer or a frame. ;; FIXME: Why omit keys that contain buffers and ;; frames? This looks like a bad workaround rather - ;; than a proper fix. Does anybod know what problem + ;; than a proper fix. Does anybody know what problem ;; this is trying to address? --Stef (dolist (key keys) (let ((i 0) diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index e3d1955ded5..4e45383eaec 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1036,7 +1036,7 @@ using `make-temp-file', and the generated name is returned." (setq archive-file-name-coding-system file-name-coding) (if (and (null - (let (;; We may have to encode file name arguement for + (let (;; We may have to encode the file name argument for ;; external programs. (coding-system-for-write (and enable-multibyte-characters diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 14f09517b1d..987351a25e0 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR." ;; recomment as we go ;;nil )) - ;; Do nothing if we are buiding an EDE project already + ;; Do nothing if we are building an EDE project already. (ede-constructing nil) ;; Load in the project in question. diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index b557d703f29..5ed83b39163 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -249,7 +249,7 @@ All directories need at least one target.") "EDE Generic Project target for Misc files. All directories need at least one target.") -;;; Automatic target aquisition. +;;; Automatic target acquisition. (defun ede-generic-find-matching-target (class dir targets) "Find a target that is a CLASS and is in DIR in the list of TARGETS." (let ((match nil)) diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index a61fb6b1cf2..636ac30b166 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error (mapcar 'semantic-tag-type-members tagtype)))) (oset miniscope fullscope rawscope))) - ;; Now analayze the type to remove metatypes. + ;; Now analyze the type to remove metatypes. (or (semantic-analyze-type tmp miniscope) tmp)) (t diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 74c4d8e3788..35aef5d16ef 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -918,7 +918,7 @@ but should be good enough for debugging assertions." result " ") ">") - ;; Longer results should have an abreviated form. + ;; Longer results should have an abbreviated form. (format "#" (semanticdb-find-result-length result) (length result)))) diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el index ee356ad3a9e..4eeac8de141 100644 --- a/lisp/cedet/semantic/decorate.el +++ b/lisp/cedet/semantic/decorate.el @@ -107,7 +107,7 @@ the extent 'intangible' property does not exist." "Hook used in modification hooks to prevent modification. Allows deletion of the entire text. Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system." - ;; Stolen blithly from cpp.el in Emacs 21.1 + ;; Stolen blithely from cpp.el in Emacs 21.1 (if (and (not after) (or (< (semantic-overlay-start overlay) start) (> (semantic-overlay-end overlay) end))) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index a37f43d177f..e32aca54b0f 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -459,7 +459,7 @@ to add the path to Semantic's search. If this is an include file that belongs to your project, then you may need to update `semanticdb-project-roots' or better yet, use `ede' to manage your project. See the ede manual for projects that will -wrap existing project code for Semantic's benifit. +wrap existing project code for Semantic's benefit. ") (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 69b1dba0bcf..3941424e4b5 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el @@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ) (if pf (message "%s" (semantic-format-tag-summarize pf nil t)) - (message "No summary info availalble")))) + (message "No summary info available")))) ;;; Variants ;; @@ -245,7 +245,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ;; Jump to a destination based on the local context. ;; ;; This shows how to use the analyzer context, and the -;; analyer references objects to choose a good destination. +;; analyzer references objects to choose a good destination. (defun semantic-ia--fast-jump-helper (dest) "Jump to DEST, a Semantic tag. diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index e49968b07e7..5489765dcc8 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil." ;;; Symbol Is Macro ;; -;; An analyser that will push tokens from a macro in place +;; An analyzer that will push tokens from a macro in place ;; of the macro symbol. ;; (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index d6b8e1a8bf5..a9a5ab586d0 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on ;;; Comment lexer ;; ;; Predefined lexers that could be used instead of creating new -;; analyers. +;; analyzers. (define-lex semantic-comment-lexer "A simple lexical analyzer that handles comments. diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 30c57571599..64e60fae0f2 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -384,7 +384,7 @@ be found." ;;------------------------------------------------------------ (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist) - "Return accessable tags when TYPELIST and PARENTLIST is in scope. + "Return accessible tags when TYPELIST and PARENTLIST is in scope. Tags returned are not in the global name space, but are instead scoped inside a class or namespace. Such items can be referenced without use of \"object.function()\" style syntax due to an diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index cae52428e75..f392379347a 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el @@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are: ) (defun srecode-calculate-nearby-things () - ;; NOTE: May need to add bounes to this FCN + ;; NOTE: May need to add bounds to this FCN "Calculate the CONTEXT type items nearby the current point. Assume that what we want to insert next is based on what is just before point. If there is nothing, then assume it is whatever is diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index a52cadbfb2c..61cbab19998 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -811,8 +811,8 @@ not account for verb parts." (if (string-match (car (car al)) (downcase ts)) (progn (setq newstr (concat newstr (cdr (car al)))) - ;; don't terminate because we may actuall have 2 words - ;; next to eachother we didn't identify before + ;; don't terminate because we may actually have 2 words + ;; next to each other we didn't identify before (setq llow t))) (setq al (cdr al))) (if (not llow) (setq newstr (concat newstr ts))) diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 80e6f9d8d1c..d87dc315829 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -61,7 +61,7 @@ (oset st lastdict dict)) (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) - "Reset the achor point on extract state ST." + "Reset the anchor point on extract state ST." (oset st anchor (point))) (defmethod srecode-extract-state-extract ((st srecode-extract-state) diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 088781cfb53..d7ca84c1f97 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -101,7 +101,7 @@ Has virtual :start and :end initializers.") )) ;; Create a temporary overlay now. We have to use an overlay and - ;; not a marker becaues of the in-front insertion rules. The rules + ;; not a marker because of the in-front insertion rules. The rules ;; are backward from what is wanted while typing. (setq olay (make-overlay start end (current-buffer) t nil)) (overlay-put olay 'srecode-init-only t) diff --git a/lisp/comint.el b/lisp/comint.el index b91b82adb21..f25293ff3ac 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3442,7 +3442,7 @@ Also print a message when redirection is completed." :group 'comint :type 'boolean) -;; Directly analagous to comint-preoutput-filter-functions +;; Directly analogous to comint-preoutput-filter-functions (defvar comint-redirect-filter-functions nil "List of functions to call before inserting redirected process output. Each function gets one argument, a string containing the text received diff --git a/lisp/desktop.el b/lisp/desktop.el index cdc787dfde9..f4991c5bcc6 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1176,7 +1176,7 @@ directory DIRNAME." (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count)) (setq result nil)) ;; Restore buffer list order with new buffer at end. Don't change - ;; the order for old desktop files (old desktop module behaviour). + ;; the order for old desktop files (old desktop module behavior). (unless (< desktop-file-version 206) (mapc 'bury-buffer buffer-list) (when result (bury-buffer result))) diff --git a/lisp/dired.el b/lisp/dired.el index 4e03d61a06e..90cf610116a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1025,7 +1025,7 @@ BEG..END is the line where the file info is located." ;; spaces there (and within the filename as well, of course). (save-excursion (let (file file-col other other-col) - ;; Check that there is indeed a file, and that there is anoter adjacent + ;; Check that there is indeed a file, and that there is another adjacent ;; file with which to align, and that additional spaces are needed to ;; align the filenames. (when (and (setq file (progn (goto-char beg) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 68a3440b179..119424e789c 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -958,7 +958,7 @@ if default value is nil." (progn (eieio-perform-slot-validation-for-default a type value skipnil) ;; Here we have found a :class version of a slot. This - ;; requires a very different aproach. + ;; requires a very different approach. (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a))) (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc))) (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type))) @@ -2563,7 +2563,7 @@ This is usually a symbol that starts with `:'." ;;; ;; We want all objects created by EIEIO to have some default set of -;; behaviours so we can create object utilities, and allow various +;; behaviors so we can create object utilities, and allow various ;; types of error checking. To do this, create the default EIEIO ;; class, and when no parent class is specified, use this as the ;; default. (But don't store it in the other classes as the default, diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 901b6d1bf6a..9822b556f34 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -434,7 +434,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." nil (list (eldoc-current-symbol) argument-index))))) -;; Move to the beginnig of current sexp. Return the number of nested +;; Move to the beginning of current sexp. Return the number of nested ;; sexp the point was over or after. (defun eldoc-beginning-of-sexp () (let ((parse-sexp-ignore-comments t) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 56efd142198..2e388d20114 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -393,7 +393,7 @@ FORM is of the form `(and FORM1 ...)'." (defun rx-anything (form) "Match any character." (if (consp form) - (error "rx `anythng' syntax error: %s" form)) + (error "rx `anything' syntax error: %s" form)) (rx-or (list 'or 'not-newline ?\n))) diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 010e32857c5..71e607140de 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -34,7 +34,7 @@ ;; you put (setq crisp-load-scroll-all t) in your .emacs before ;; loading this package. If this feature is enabled, it will bind ;; meta-f1 to the scroll-all mode toggle. The scroll-all package -;; duplicates the scroll-alling feature in CRiSP. +;; duplicates the scroll-all feature in CRiSP. ;; Also, the default keybindings for brief/CRiSP override the M-x ;; key to exit the editor. If you don't like this functionality, you diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index a15e038dddc..74172b2573f 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'." "Set the away state globally. If NOTEST is specified, do not check to see whether there is an -activer server buffer available." +active server buffer available." ;; Note that the idle timer runs, even when Emacs is inactive. In ;; order to prevent flooding when we connect, we test for an ;; existing process. @@ -284,4 +284,3 @@ activer server buffer available." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 52c8c2ddc20..a7c92084bf9 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -247,7 +247,7 @@ will have to visit the file 'eshell-cmd.el' and run the command '(eshell-named-command eshell-lisp-command eshell-process-identity) - "A list of functions which might return an ansychronous process. + "A list of functions which might return an asynchronous process. If they return a process object, execution of the calling Eshell command will wait for completion (in the background) before finishing the command." diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index fbbf3bad5a8..0a6e3a426a1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1820,7 +1820,7 @@ 2011-03-15 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if + * gnus-sum.el (gnus-articles-to-read): Revert back to old behavior if we're selecting a group with unread articles. * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. @@ -4557,7 +4557,7 @@ * shr.el (shr-put-image): Use point even if only inserting text. (shr-put-image): Save excursion when inserting alt text on non-graphic - display, so the behaviour is the same when we are on a graphic display. + display, so the behavior is the same when we are on a graphic display. * nnir.el (nnir-run-swish-e): Remove hyrex support. @@ -5178,7 +5178,7 @@ bidning gnus-agent variables. * shr.el (shr-render-td): Use a cache for the table rendering function - to avoid getting an exponential rendering behaviour in nested tables. + to avoid getting an exponential rendering behavior in nested tables. (shr-insert): Rework the line-breaking algorithm. (shr-insert): Don't leave trailing spaces. (shr-insert-table): Also insert empty TDs. @@ -6783,7 +6783,7 @@ * gnus-start.el (gnus-get-unread-articles): Allow the backends to update the group info. This makes the nndraft groups, for instance, go - back to their old behaviour. + back to their old behavior. * gnus-sum.el (gnus-select-newsgroup): Indent. @@ -7175,7 +7175,7 @@ * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default so that nnimap methods aren't agentized by default. There's apparently - many problems related to agent/imap behaviour. + many problems related to agent/imap behavior. * gnus-art.el (gnus-article-copy-string): New command and key binding. @@ -7220,7 +7220,7 @@ storage than before. * gnus.el (gnus-refer-article-method): Change default to 'current. - When referring an article, the common behaviour is to refer it from the + When referring an article, the common behavior is to refer it from the current select method, not the native select method. The chances of the native select method having the message in question is rather slim these days. @@ -7236,7 +7236,7 @@ * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so that commands like `d' (and the like) go to the next line in the buffer, instead of the next unread article. I think this is the - behaviour that is most natural for most users. + behavior that is most natural for most users. (gnus-single-article-buffer): Change default to nil, so that people can have as many article buffers open as they have summary buffer. I think this is the most natural way for the groups to behave. @@ -16517,7 +16517,7 @@ 2005-06-16 Arne Jørgensen * smime.el (smime-cert-by-ldap-1): Detect PEM format without - header by looking for magic "MII" at the beginnig. + header by looking for magic "MII" at the beginning. 2005-06-16 Miles Bader diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0068fbad6e2..a11e9ebf0fa 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1559,7 +1559,7 @@ node `(gnus)Gravatars' for details." gnus-treat-from-picon gnus-treat-from-gravatar gnus-treat-mail-gravatar) - ;; If there's much decoration, the user might prefer a boundery. + ;; If there's much decoration, the user might prefer a boundary. 'head nil) "Draw a boundary at the end of the headers. diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 0b5a7ebf1f9..9f86e74bd99 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -157,7 +157,7 @@ There are currently two built-in format functions: ;; I just ignore it. ;;;###autoload (defun gnus-user-format-function-d (header) - ;; Returns an aproximative delay string for the next occurrence of this + ;; Return an approximate delay string for the next occurrence of this ;; message. The delay is given only in the first non zero unit. ;; Code partly stolen from article-make-date-line (let* ((extras (mail-header-extra header)) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 7c63d5e2653..b18b78df063 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1678,7 +1678,7 @@ If SCAN, request a scan of that group as well." ;; Sort the methods based so that the primary and secondary ;; methods come first. This is done for legacy reasons to try to - ;; ensure that side-effect behaviour doesn't change from previous + ;; ensure that side-effect behavior doesn't change from previous ;; Gnus versions. (setq type-cache (sort (nreverse type-cache) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5e034b14fde..efdc237d11f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -256,7 +256,7 @@ if the variable `help-downcase-arguments' is non-nil." ;; so let's skip over it (search-backward "(") (goto-char (scan-sexps (point) 1))))) - ;; Highlight aguments in the USAGE string + ;; Highlight arguments in the USAGE string (setq usage (help-do-arg-highlight (buffer-string) args)) ;; Highlight arguments in the DOC string (setq doc (and doc (help-do-arg-highlight doc args)))))) diff --git a/lisp/info.el b/lisp/info.el index b3bdbc5e5be..0148ee544f9 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -264,7 +264,7 @@ Before leaving the initial Info node, where isearch was started, it fails once with the error message [initial node], and with subsequent C-s/C-r continues through other nodes without failing with this error message in other nodes. When isearch fails for -the rest of the manual, it wraps aroung the whole manual and +the rest of the manual, it wraps around the whole manual and restarts the search from the top/final node depending on search direction. diff --git a/lisp/isearch.el b/lisp/isearch.el index 3ffe6e8a656..2013d7f7078 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2243,7 +2243,7 @@ If there is no completion possible, say so and continue searching." ;; Searching (defvar isearch-search-fun-function nil - "Overrides the default `isearch-search-fun' behaviour. + "Overrides the default `isearch-search-fun' behavior. This variable's value should be a function, which will be called with no arguments, and should return a function that takes three arguments: STRING, BOUND, and NOERROR. diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index bb242a50acc..444f4d519da 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -582,7 +582,7 @@ See also the descriptions of the variables (narrow-to-region p (point)) (robin-invert-region (point-min) (point-max) "ethiopic-sera") - ;; ethio-quote-vowel-alwyas + ;; ethio-quote-vowel-always (goto-char (point-min)) (while (re-search-forward "'[eauio]" nil t) (save-excursion diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 81c5577fa57..83386f2e852 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -372,7 +372,7 @@ indicate the place to embed a consonant. Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL follwoing a consonant and preceding a maa-sakod character. If it is -nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is alwasy +nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always appended at the tail. For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 8847c16bfb4..744560a8223 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -20621,7 +20621,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index f4b29958aab..d0907b078ac 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1356,7 +1356,7 @@ for you. Add this function to `mail-send-hook' with something like this: (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) Then add the functions you want called to either `feedmail-mail-send-hook-queued' -or `feedmail-mail-send-hook', as apprpriate. The distinction is that +or `feedmail-mail-send-hook', as appropriate. The distinction is that `feedmail-mail-send-hook' will be called when you send mail from a composition buffer (typically by typing C-c C-c), whether the message is sent immediately or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index d1b3ccebf46..c6d60b3b2e2 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -272,7 +272,7 @@ Blind aliases or users from /etc/passwd are not expanded." (completing-read prompt mh-alias-alist nil nil) ","))))) (if (not mh-alias-expand-aliases-flag) (mapconcat 'identity the-answer ", ") - ;; Loop over all elements, checking if in passwd aliast or blind first + ;; Loop over all elements, checking if in passwd alias or blind first (mapconcat 'mh-alias-expand the-answer ",\n "))))) ;;;###mh-autoload diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 3f1437f0799..791e566fc8e 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -26,7 +26,7 @@ ;; ;; This package provides a simple method of inserting a URL based on the ;; text at point in the current buffer. This is part of an on-going effort -;; to increase the information I provide people while reducing the ammount +;; to increase the information I provide people while reducing the amount ;; of typing I need to do. No-doubt there are undiscovered Emacs packages ;; out there that do all of this and do it better, feel free to point me to ;; them, in the mean time I'm having fun playing with Emacs Lisp. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 55732194bc8..6cba1a5b7a6 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4307,7 +4307,7 @@ connection if a previous connection has died for some reason." (tramp-compat-temporary-file-directory))))) spec) - ;; Add arguments for asynchrononous processes. + ;; Add arguments for asynchronous processes. (when (and process-name async-args) (setq login-args (append async-args login-args))) diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index 9060e091587..cc538c224dc 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN. APROTOCOL stands for the network protocol family ADDRESS is encoded (`zeroconf-avahi-protocol-inet4' means INET4, `zeroconf-avahi-protocol-inet6' means INET6). It can be -different from PROTOCOL, when an adrress resolution has been +different from PROTOCOL, when an address resolution has been requested for another protocol family but the default one. ADDRESS is the service address, encoded according to the diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index cb06091dfcf..347db281f1a 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el @@ -32,7 +32,7 @@ ;; In `iso-accents-mode', pseudo accent characters are used to ;; introduce accented keys. The pseudo-accent characters are: ;; -;; ' (minute) -> actue accent +;; ' (minute) -> acute accent ;; ` (backtick) -> grave accent ;; " (second) -> diaeresis ;; ^ (caret) -> circumflex diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 704da5fa68e..d4f993fedf6 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -7163,7 +7163,7 @@ src blocks. (org-speed-command-default-hook): The default hook for org-speed-command-hook. Factored out from org-self-insert-command - and mimics existing behaviour. + and mimics existing behavior. (org-self-insert-command): Modified to use org-speed-command-hook. 2010-11-11 Carsten Dominik @@ -10577,7 +10577,7 @@ a list of symbols specifying which of the special keywords #+DATE, #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock. (org-fontify-meta-lines-and-blocks): Changes to font-lock code - implementing new faces and hiding behaviour. + implementing new faces and hiding behavior. * org-faces.el (org-document-title): New face for #+TITLE lines. (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines. @@ -16482,14 +16482,14 @@ 2008-11-23 Carsten Dominik * org-export-latex.el (org-export-latex-subcontent): - Interprete target aliases as additonal labels. + Interprete target aliases as additional labels. * org-exp.el (org-export-target-aliases): New variable. (org-export-preprocess-string) (org-export-handle-invisible-targets): Fill the alias alist. (org-export-as-html): Remove the   from the anchor, and also assign an id. - (org-html-level-start): Insert the target aliases as additonal + (org-html-level-start): Insert the target aliases as additional anchors. * org.el (org-edit-fixed-width-region): Fix bug when starting a new diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 5cebe50efd1..9f40c5bd9d5 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el @@ -451,7 +451,7 @@ The effect is that these values will be accessible during export." ((stringp org-beamer-frame-level-now) (setq org-beamer-frame-level-now (string-to-number org-beamer-frame-level-now)))) - ;; Find the header additons, most likely theme commands + ;; Find the header additions, most likely theme commands (setq org-beamer-header-extra (or (and (org-region-active-p) (save-excursion diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 48eced9ea08..352d414a4b6 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -64,19 +64,19 @@ ;; with the same name as the link; then, if unsuccessful, ask the user if ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if ;; the user wishes to append 'tag' as a new toplevel heading at the end of -;; the buffer; and finally, defer to org's default behaviour which is to +;; the buffer; and finally, defer to org's default behavior which is to ;; search the entire text of the current buffer for 'tag'. ;; -;; This behaviour can be modified by changing the value of +;; This behavior can be modified by changing the value of ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my -;; .emacs, which describes the same behaviour as the above paragraph with +;; .emacs, which describes the same behavior as the above paragraph with ;; one difference: ;; ;; (setq org-ctags-open-link-functions ;; '(org-ctags-find-tag ;; org-ctags-ask-rebuild-tags-file-then-find-tag ;; org-ctags-ask-append-topic -;; org-ctags-fail-silently)) ; <-- prevents org default behaviour +;; org-ctags-fail-silently)) ; <-- prevents org default behavior ;; ;; ;; Usage diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 223d2573fdb..0d47132d2f8 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el @@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index ddb3cf7b63a..0c924cd9f07 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -191,7 +191,7 @@ sitemap of files or summary page for a given project. display folders first or last, respectively. Any other value will mix files and folders. :sitemap-sort-files The site map is normally sorted alphabetically. - You can change this behaviour setting this to + You can change this behavior setting this to `chronologically', `anti-chronologically' or nil. :sitemap-ignore-case Should sorting be case-sensitive? Default nil. @@ -1114,7 +1114,7 @@ so that the file including them will be republished as well." (let ((ctime (org-publish-cache-ctime-of-src filename))) (or (< pstamp ctime) (when included-files-ctime - (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) + (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) included-files-ctime)))))))))) (defun org-publish-cache-set-file-property (filename property value &optional project-name) diff --git a/lisp/org/org.el b/lisp/org/org.el index 10531b07325..a22cf4d6efc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -11217,7 +11217,7 @@ changes. Such blocking occurs when: (forward-line 1) (re-search-forward org-not-done-heading-regexp pos t)) (throw 'dont-block nil)) ; block, there is an older sibling not done. - ;; Search further up the hierarchy, to see if an anchestor is blocked + ;; Search further up the hierarchy, to see if an ancestor is blocked (while t (goto-char parent-pos) (if (not (looking-at org-not-done-heading-regexp)) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 86e6b4abb6c..1ea8df36cd6 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -151,7 +151,7 @@ "Local keymap for the 5x5 game.") (5x5-defvar-local 5x5-solver-output nil - "List that is is the output of artihmetic solver. + "List that is is the output of an arithmetic solver. This list L is such that @@ -162,8 +162,8 @@ M is the move count when the solve output was stored. S_1 ... S_N are all the solutions ordered from least to greatest number of strokes. S_1 is the solution to be displayed. -Each solution S_1, ..., S_N is a a list (STROKE-COUNT GRID) where -STROKE-COUNT is to number of strokes to achieve the solution and +Each solution S_1, ..., S_N is a list (STROKE-COUNT GRID) where +STROKE-COUNT is the number of strokes to achieve the solution and GRID is the grid of positions to click.") diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4a57a1eef67..4cf00cd3cfd 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1747,7 +1747,7 @@ Information is extracted from the ali file." (unless declaration-found - ;; Since we alread know the number of the file, search for a direct + ;; Since we already know the number of the file, search for a direct ;; reference to it (goto-char (point-min)) (set 'declaration-found t) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ea0a8f2d3b3..fd32e5e956c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info." ;; Just gone back over an ordinary symbol of some sort? (t (c-crosses-statement-barrier-p (point) maybe-after-boundary-pos)))) - + (when boundary-pos (setq pptok ptok ptok tok @@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info." pos tok) ; always non-nil ) ; end of (catch loop ....) ) ; end of sexp-at-a-time (while ....) - + ;; If the stack isn't empty there might be errors to report. (while stack (if (and (vectorp saved-pos) (eq (length saved-pos) 3)) @@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info." rung-is-marked simple-ws-beg cmt-skip-pos) ;; Skip simple horizontal ws and do a quick check on the preceding - ;; character to see if it's anying that can't end syntactic ws, so we can + ;; character to see if it's anything that can't end syntactic ws, so we can ;; bail out early in the majority of cases when there just are a few ws ;; chars. Newlines are complicated in the backward direction, so we can't ;; skip over them. @@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info." ;; a relevant match. (goto-char pos) nil)))))) - + (> (point) (progn ;; Skip syntactic ws afterwards so that we don't stop at the @@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info." ;; car ^ ^ point ;; Foo::Foo (int b) : Base (b) {} ;; car ^ ^ point - ;; + ;; ;; The cdr of the return value is non-nil when a ;; `c-typedef-decl-kwds' specifier is found in the declaration. ;; Specifically it is a dotted pair (A . B) where B is t when a @@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info." ;; other `c-typedef-decl-kwds' (e.g. class, struct, enum) ;; specifier is present. I.e., (some of) the declared ;; identifier(s) are types. - ;; + ;; ;; If a cast is parsed: ;; ;; The point is left at the first token after the closing paren of @@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info." nil) (t nil)))) (eolp)) - + (goto-char pos) (progn (c-backward-syntactic-ws) (eq (point) pos)) @@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info." ;; FIXME: Should use c-add-stmt-syntax, but it's not yet ;; template aware. (c-add-syntax 'template-args-cont (point) placeholder)) - + ;; CASE D: continued statement. (t (c-beginning-of-statement-1 containing-sexp) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index c7e78cb282a..02256ead392 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like: [foo blahBlahBlah: fred thisIsTooDamnLong: barney -This behaviour can be overridden by customizing the indentation of +This behavior can be overridden by customizing the indentation of `objc-method-call-cont' in the \"objc\" style." :type 'integer :group 'c) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index a79d1a2c064..0556741b65b 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -902,7 +902,7 @@ the settings present before the switch. 9) When doing indentation of control constructs, may correct line-breaks/spacing between elements of the construct. -10) Uses a linear-time algorith for indentation of regions (on Emaxen with +10) Uses a linear-time algorithm for indentation of regions (on Emaxen with capable syntax engines). 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index cb0b02ff350..009400504b2 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -29,7 +29,7 @@ ;; form. For editing Fortran 90 free format source, use `f90-mode' ;; (f90.el). It is meant to support the GNU Fortran language ;; implemented by g77 (its extensions to Fortran77 and -;; interpretations, e.g. of blackslash in strings). +;; interpretations, e.g. of backslash in strings). ;;; History: diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index c88727c721c..53807b8de30 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2217,7 +2217,7 @@ Return position where LINE begins." (defun gdb-mapcar* (function &rest seqs) "Apply FUNCTION to each element of SEQS, and make a list of the results. If there are several SEQS, FUNCTION is called with that many -arugments, and mapping stops as sson as the shortest list runs +arguments, and mapping stops as sson as the shortest list runs out." (let ((shortest (apply #'min (mapcar #'length seqs)))) (mapcar (lambda (i) @@ -3428,7 +3428,7 @@ breakpoints buffer." (error "Not recognized as break/watchpoint line"))))) -;; Frames buffer. This displays a perpetually correct bactrack trace. +;; Frames buffer. This displays a perpetually correct backtrack trace. ;; (def-gdb-trigger-and-handler gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames") diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 543539421fe..b54b2dc5f47 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2102,7 +2102,7 @@ extension EXTN. Normally EXTN is given as the regular expression massaged-args))) ;; Search for an association with P, a fully qualified class name, in -;; gud-jdb-class-source-alist. The asssociation gives the fully +;; gud-jdb-class-source-alist. The association gives the fully ;; qualified file name of the source file which produced the class. (defun gud-jdb-find-source-file (p) (cdr (assoc p gud-jdb-class-source-alist))) diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index e15f765ea58..958c1bfb0cc 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -700,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first." (defun meta-beginning-of-defun (&optional arg) - "Move backward to beginnning of a defun in Metafont or MetaPost code. + "Move backward to beginning of a defun in Metafont or MetaPost code. With numeric argument, do it that many times. Negative arg -N means move forward to Nth following beginning of defun. Returns t unless search stops due to beginning or end of buffer." diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 00315856ad5..93d27042dc8 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -151,7 +151,7 @@ ;; (`prolog-electric-dot-full-predicate-template', defaults to t ;; since it seems quicker to me to just type those commata). A ;; trivial adaptation of a patch by Markus Triska. -;; o Improved the behaviour of electric if-then-else to only skip +;; o Improved the behavior of electric if-then-else to only skip ;; forward if the parenthesis/semicolon is preceded by ;; whitespace. Once more a trivial adaptation of a patch by ;; Markus Triska. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 97a1c4605c2..3166abb21a7 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -672,7 +672,7 @@ highlighted properly when you open them." :safe 'symbolp) (defvaralias 'sql-dialect 'sql-product) -;; misc customization of sql.el behaviour +;; misc customization of sql.el behavior (defcustom sql-electric-stuff nil "Treat some input as electric. @@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.") (setq has-schema (and (>= (length (car names)) schema-len) (string= schema-dot - (downcase (substring (car names) + (downcase (substring (car names) 0 schema-len)))) names (cdr names))) (unless has-schema (sql-build-completions schema))))) - + ;; Try to find the completion (cond ((not predicate) @@ -3951,7 +3951,7 @@ is specified in the connection settings." ;; interactive session (eval `(let ((sql-connection ,connection) (,param-var ',rem-params)) - (sql-product-interactive sql-product + (sql-product-interactive sql-product new-name))))) (message "SQL Connection <%s> does not exist" connection) @@ -3981,16 +3981,16 @@ optionally is saved to the user's init file." (if connection (message "This session was started by a connection; it's already been saved.") - + (let ((login (sql-get-product-feature product :sqli-login)) (alist sql-connection-alist) connect) - + ;; Remove the existing connection if the user says so (when (and (assoc name alist) (yes-or-no-p (format "Replace connection definition <%s>? " name))) (setq alist (assq-delete-all name alist))) - + ;; Add the new connection if it doesn't exist (if (assoc name alist) (message "Connection <%s> already exists" name) @@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this: (sql-redirect sqlbuf "\\t off") (when (not (string= a "aligned")) (sql-redirect sqlbuf "\\a")) - - ;; Return the list of table names (public schema name can be omitted) + + ;; Return the list of table names (public schema name can be omitted) (mapcar (lambda (tbl) (if (string= (car tbl) "public") (cadr tbl) diff --git a/lisp/simple.el b/lisp/simple.el index 90d22c817b0..82d82bc7240 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2657,7 +2657,7 @@ value passed." Per default, this variable is always set to `t', meaning that a call of `process-file' could potentially change any file on a remote host. When set to `nil', a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by `setq'. Instead of, it shall be set only by let-binding.") diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index cfa406c2b48..ff528fcc9df 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -142,7 +142,7 @@ This information is useful, but it takes screen space away from file names." ;; The Tar data is made up of bytes and better manipulated as bytes ;; and can be very large, so insert/delete can be costly. The summary we -;; want to display may contain non-ascci chars, of course, so we'd like it +;; want to display may contain non-ascii chars, of course, so we'd like it ;; to be multibyte. We used to keep both in the same buffer and switch ;; from/to uni/multibyte. But this had several downsides: ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index be14e90e000..20d9c18c43e 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2263,7 +2263,7 @@ Returns a DIRECTION, a number 0--7, coded as follows: ;; Things for drawing lines in all directions. -;; The line drawing engine is the eight-point alrogithm. +;; The line drawing engine is the eight-point algorithm. ;; ;; A line is here a list of (x y saved-char new-char)s. ;; diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 4d6b5e5fb83..1a0f7ec5836 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -711,7 +711,7 @@ of master file." context) (when (and (not appendix) (>= (string-to-char (match-string 2)) ?A)) - ;; Just entered the appendex. Get out. + ;; Just entered the appendix. Get out. (throw 'exit nil)) ;; Change the section number. diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 37983d17931..dbed09c9ccb 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -33,7 +33,7 @@ (defvar reftex-toc-mode-map (let ((map (make-sparse-keymap))) - + (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)]) 'reftex-toc-mouse-goto-line-and-hide) (define-key map [follow-link] 'mouse-face) @@ -660,7 +660,7 @@ point." (setq msg (catch 'exit (if (reftex-region-active-p) - ;; A region is dangerous, check if we have a brandnew scan, + ;; A region is dangerous, check if we have a brand new scan, ;; to make sure we are not missing any section statements. (if (not (reftex-toc-check-docstruct)) (reftex-toc-load-all-files-for-promotion) ;; exits diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index cef8a3d1548..3ac0aa0f65d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1568,7 +1568,7 @@ Valid actions are: readable, restore, read, kill, write." ;;; Finding files (defun reftex-locate-file (file type master-dir &optional die) - "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE. + "Find FILE of type TYPE in MASTER-DIR or on the path associated with TYPE. If the file does not have any of the valid extensions for TYPE, try first the default extension and only then the naked file name. When DIE is non-nil, throw an error if file not found." @@ -2254,7 +2254,7 @@ IGNORE-WORDS List of words which should be removed from the string." (defvar font-lock-defaults-computed) (defun reftex-fontify-select-label-buffer (parent-buffer) ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to - ;; start with none-SPC char, beacuse Font-Lock otherwise refuses operation. + ;; start with none-SPC char, because Font-Lock otherwise refuses operation. (run-hook-with-args 'reftex-pre-refontification-functions parent-buffer 'reftex-ref) (let* ((oldname (buffer-name)) diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 1923ab692d8..07a4fae9c30 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el @@ -113,7 +113,7 @@ ;; - Allowing particular views of the initially amorphous data pool ;; (ala the Xanadu concept). ;; -;; - Storage of the data in a manner most appopriate to that data, +;; - Storage of the data in a manner most appropriate to that data, ;; such as keeping address-book type information in BBDB, etc. ;; ;; * Using "remember" diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 0ce71c25ad7..d66b297bd2b 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -2475,7 +2475,7 @@ first of a paragraph." ;;------------------------------------------------------------------------------ ;; FIXME: these next functions should become part of a larger effort to redo the -;; bullets in bulletted lists. The enumerate would just be one of the possible +;; bullets in bulleted lists. The enumerate would just be one of the possible ;; outputs. ;; ;; FIXME: TODO we need to do the enumeration removal as well. diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 5a7fa0bf950..9bf75fa7f55 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer." ;; Revise the mode line to display which difference we have selected ;; Also resets modelines of buffers A/B, since they may be clobbered by -;; anothe invocations of Ediff. +;; other invocations of Ediff. (defun ediff-refresh-mode-lines () (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8051009a983..39c583b8a0d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -1399,7 +1399,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." ;; `incg' or `buffer-substring-no-properties'. (This is ;; for speed; strictly speaking, it is sufficient to use ;; only the former since it behaves identically to the - ;; latter in the absense of "@@".) + ;; latter in the absence of "@@".) sub) (flet ((incg (beg end) (let ((b beg) (e end) @-holes) (while (and asc (< (car asc) e)) diff --git a/lisp/whitespace.el b/lisp/whitespace.el index f50386b1827..dde85478f7e 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -2573,7 +2573,7 @@ Also refontify when necessary." (setq whitespace-display-table-was-local t whitespace-display-table (copy-sequence buffer-display-table)) - ;; asure `buffer-display-table' is unique + ;; Assure `buffer-display-table' is unique ;; when two or more windows are visible. (setq buffer-display-table (copy-sequence buffer-display-table))) diff --git a/lisp/windmove.el b/lisp/windmove.el index 2aef37dd4c8..1deaa44c7dd 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -245,7 +245,7 @@ placement bugs in old versions of Emacs." ;; Actually, the whole subject of the minibuffer edge of the frame is ;; rather messy. It turns out that with a sufficiently large delta, ;; we can fly off the bottom edge of the frame and miss the minibuffer -;; altogther. This, I think, is never right: if there's a minibuffer +;; altogether. This, I think, is never right: if there's a minibuffer ;; and you're not in it, and you move down, the minibuffer should be ;; in your way. ;; diff --git a/lisp/xml.el b/lisp/xml.el index 52bb0de7ea0..68aa5f4db6f 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -540,7 +540,7 @@ Leave point at the first non-blank character after the tag." (replace-regexp-in-string "\\s-\\{2,\\}" " " string) (let ((expansion (xml-substitute-special string))) (unless (stringp expansion) - ; We say this is the constraint. It is acctually that + ; We say this is the constraint. It is actually that neither ; external entities nor "<" can be in an attribute value. (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements")) (push (cons name expansion) attlist))) diff --git a/src/alloc.c b/src/alloc.c index 985e4b71426..1d274e2111e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -882,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg) /* Like malloc but used for allocating Lisp data. NBYTES is the number of bytes to allocate, TYPE describes the intended use of the - allcated memory block (for strings, for conses, ...). */ + allocated memory block (for strings, for conses, ...). */ #ifndef USE_LSB_TAG static void *lisp_malloc_loser; diff --git a/src/bytecode.c b/src/bytecode.c index 91d360bec1b..3af0abd63cf 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -271,7 +271,7 @@ struct byte_stack /* A list of currently active byte-code execution value stacks. Fbyte_code adds an entry to the head of this list before it starts processing byte-code, and it removed the entry again when it is - done. Signaling an error truncates the list analoguous to + done. Signaling an error truncates the list analogous to gcprolist. */ struct byte_stack *byte_stack_list; diff --git a/src/coding.h b/src/coding.h index fdf9b762e75..2621928adc3 100644 --- a/src/coding.h +++ b/src/coding.h @@ -518,7 +518,7 @@ struct coding_system #define CODING_REQUIRE_DETECTION_MASK 0x1000 #define CODING_RESET_AT_BOL_MASK 0x2000 -/* Return 1 if the coding context CODING requires annotaion +/* Return 1 if the coding context CODING requires annotation handling. */ #define CODING_REQUIRE_ANNOTATION(coding) \ ((coding)->common_flags & CODING_ANNOTATION_MASK) diff --git a/src/emacs.c b/src/emacs.c index 12be7bc0808..529fa35a5bd 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #endif /* argmatch must not be used after here, - except when bulding temacs + except when building temacs because the -d argument has not been skipped in skip_args. */ #ifdef MSDOS diff --git a/src/font.c b/src/font.c index ead8225471e..3fc5fc944b4 100644 --- a/src/font.c +++ b/src/font.c @@ -5144,7 +5144,7 @@ the corresponding glyph code. If ENCODING is a char-table, looking up the table by a character gives the corresponding glyph code. REPERTORY specifies a repertory of characters supported by the font. -If REPERTORY is a charset, all characters beloging to the charset are +If REPERTORY is a charset, all characters belonging to the charset are supported. If REPERTORY is a char-table, all characters who have a non-nil value in the table are supported. If REPERTORY is nil, Emacs gets the repertory information by an opened font and ENCODING. */); diff --git a/src/image.c b/src/image.c index 1869b83ac2a..8b64bdf20b0 100644 --- a/src/image.c +++ b/src/image.c @@ -8781,7 +8781,7 @@ syms_of_image (void) operation on GNU/Linux of calling dump-emacs after loading some images. */ image_types = NULL; - /* Must be defined now becase we're going to update it below, while + /* Must be defined now because we're going to update it below, while defining the supported image types. */ DEFVAR_LISP ("image-types", Vimage_types, doc: /* List of potentially supported image types. diff --git a/src/indent.c b/src/indent.c index a70b7971b96..07a54c0c1b7 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1675,7 +1675,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ val_compute_motion.prevhpos = contin_hpos; else val_compute_motion.prevhpos = prev_hpos; - /* We alalways handle all of them here; none of them remain to do. */ + /* We always handle all of them here; none of them remain to do. */ val_compute_motion.ovstring_chars_done = 0; /* Nonzero if have just continued a line */ diff --git a/src/keyboard.c b/src/keyboard.c index fb989d3ea95..87dd2b0e251 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context) struct frame *sf = SELECTED_FRAME (); /* The immediate context is not interesting for Quits, - since they are asyncronous. */ + since they are asynchronous. */ if (EQ (XCAR (data), Qquit)) Vsignaling_function = Qnil; diff --git a/src/nsterm.m b/src/nsterm.m index 3d3723fc28c..7d26cba6d73 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3035,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) /* Currently on NS img->mask is always 0. Since get_window_cursor_type specifies a hollow box cursor when on a non-masked image we never reach this clause. But we put it - in in antipication of better support for image masks on + in in anticipation of better support for image masks on NS. */ tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); } diff --git a/src/sound.c b/src/sound.c index 362c04b7d40..39007574afc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -226,7 +226,7 @@ struct sound_device /* Close device SD. */ void (* close) (struct sound_device *sd); - /* Configure SD accoring to device-dependent parameters. */ + /* Configure SD according to device-dependent parameters. */ void (* configure) (struct sound_device *device); /* Choose a device-dependent format for outputting sound S. */ diff --git a/src/w32fns.c b/src/w32fns.c index ffbcff86694..b4166cbf691 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key) key_mapping = Qnil; } - /* NB. This code runs in the input thread, asychronously to the lisp + /* NB. This code runs in the input thread, asynchronously to the lisp thread, so we must be careful to ensure access to lisp data is thread-safe. The following code is safe because the modifier variable values are updated atomically from lisp and symbols are diff --git a/src/w32font.c b/src/w32font.c index 365f8b78a5e..2088af2fbe7 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Callback function for EnumFontFamiliesEx. - * Checks if a font matches everything we are trying to check agaist, + * Checks if a font matches everything we are trying to check against, * and if so, adds it to a list. Both the data we are checking against * and the list to which the fonts are added are passed in via the * lparam argument, in the form of a font_callback_data struct. */ diff --git a/src/w32menu.c b/src/w32menu.c index c31a8c1fd96..39d101e7bd5 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) out_string = (char *) local_alloc (strlen (wv->name) + 1); strcpy (out_string, wv->name); #ifdef MENU_DEBUG - DebPrint ("Menu: allocing %ld for owner-draw", out_string); + DebPrint ("Menu: allocating %ld for owner-draw", out_string); #endif fuFlags = MF_OWNERDRAW | MF_DISABLED; } diff --git a/src/w32term.c b/src/w32term.c index e2a06446976..e9fa16ba325 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5691,7 +5691,7 @@ x_make_frame_visible (struct frame *f) f->output_data.w32->asked_for_visible = 1; /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL - causes unexpected behaviour when unminimizing frames that were + causes unexpected behavior when unminimizing frames that were previously maximised. But only SW_SHOWNORMAL works properly for frames that were truely hidden (using make-frame-invisible), so we need it to avoid Bug#5482. It seems that async_iconified diff --git a/test/indent/octave.m b/test/indent/octave.m index 768f3d85e01..5ce52ad7a19 100644 --- a/test/indent/octave.m +++ b/test/indent/octave.m @@ -3,7 +3,7 @@ function res = tcomp (fn) %% res = tcomp (fn) %% imports components and rearranges them. - + if nargin ~= 1 print_usage() end @@ -36,7 +36,7 @@ function res = tcomp (fn) endfunction ## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg -## +## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it @@ -73,16 +73,16 @@ endfunction ## ## @table @code ## @item -nodeps -## The package manager will disable the dependency checking. That way it -## is possible to install a package even if it depends on another package +## The package manager will disable the dependency checking. That way it +## is possible to install a package even if it depends on another package ## that's not installed on the system. @strong{Use this option with care.} ## ## @item -noauto -## The package manager will not automatically load the installed package +## The package manager will not automatically load the installed package ## when starting Octave, even if the package requests that it is. ## ## @item -auto -## The package manager will automatically load the installed package when +## The package manager will automatically load the installed package when ## starting Octave, even if the package requests that it isn't. ## ## @item -local @@ -93,7 +93,7 @@ endfunction ## system privileges ## ## @item -verbose -## The package manager will print the output of all of the commands that are +## The package manager will print the output of all of the commands that are ## performed. ## @end table ## @@ -205,7 +205,7 @@ endfunction ## pkg global_list ## @end example ## @item rebuild -## Rebuilds the package database from the installed directories. This can +## Rebuilds the package database from the installed directories. This can ## be used in cases where for some reason the package database is corrupted. ## It can also take the @code{-auto} and @code{-noauto} options to allow the ## autoloading state of a package to be changed. For example @@ -227,7 +227,7 @@ endfunction ## @noindent ## where @code{builddir} is the name of a directory where the temporary ## installation will be produced and the binary packages will be found. -## The options @code{-verbose} and @code{-nodeps} are respected, while +## The options @code{-verbose} and @code{-nodeps} are respected, while ## the other options are ignored. ## @end table ## @end deftypefn @@ -259,7 +259,7 @@ function [local_packages, global_packages] = pkg (varargin) available_actions = {"list", "install", "uninstall", "load", ... "unload", "prefix", "local_list", ... - "global_list", "rebuild", "build","describe"}; + "global_list", "rebuild", "build","describe"}; ## Handle input if (length (varargin) == 0 || ! iscellstr (varargin)) print_usage (); @@ -321,14 +321,14 @@ function [local_packages, global_packages] = pkg (varargin) if (length (files) == 0) error ("you must specify at least one filename when calling 'pkg install'"); endif - install (files, deps, auto, prefix, archprefix, verbose, local_list, + install (files, deps, auto, prefix, archprefix, verbose, local_list, global_list, global_install); case "uninstall" if (length (files) == 0) error ("you must specify at least one package when calling 'pkg uninstall'"); endif - uninstall (files, deps, verbose, local_list, + uninstall (files, deps, verbose, local_list, global_list, global_install); case "load" @@ -406,7 +406,7 @@ function [local_packages, global_packages] = pkg (varargin) case "rebuild" if (global_install) - global_packages = rebuild (prefix, archprefix, global_list, files, + global_packages = rebuild (prefix, archprefix, global_list, files, auto, verbose); global_packages = save_order (global_packages); save (global_list, "global_packages"); @@ -414,7 +414,7 @@ function [local_packages, global_packages] = pkg (varargin) local_packages = global_packages; endif else - local_packages = rebuild (prefix, archprefix, local_list, files, auto, + local_packages = rebuild (prefix, archprefix, local_list, files, auto, verbose); local_packages = save_order (local_packages); save (local_list, "local_packages"); @@ -450,7 +450,7 @@ function [local_packages, global_packages] = pkg (varargin) otherwise error ("you can request at most two outputs when calling 'pkg describe'"); endswitch - + otherwise error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); endswitch @@ -529,7 +529,7 @@ function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose) endfor if (! isempty (dup)) descriptions (dup) = []; - endif + endif endif endfunction @@ -555,7 +555,7 @@ function build (files, handle_deps, autoload, verbose) endif files(1) = []; buildlist = fullfile (builddir, "octave_packages"); - install (files, handle_deps, autoload, installdir, installdir, verbose, + install (files, handle_deps, autoload, installdir, installdir, verbose, buildlist, "", false); unwind_protect repackage (builddir, buildlist); @@ -570,7 +570,7 @@ function build (files, handle_deps, autoload, verbose) end_unwind_protect endfunction -function install (files, handle_deps, autoload, prefix, archprefix, verbose, +function install (files, handle_deps, autoload, prefix, archprefix, verbose, local_list, global_list, global_install) ## Check that the directory in prefix exist. If it doesn't: create it! @@ -583,10 +583,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages (local_list, + [local_packages, global_packages] = installed_packages (local_list, global_list); - installed_pkgs_lst = {local_packages{:}, global_packages{:}}; + installed_pkgs_lst = {local_packages{:}, global_packages{:}}; if (global_install) packages = global_packages; @@ -599,7 +599,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try ## Warn about non existent files. for i = 1:length (files) - if (isempty (glob(files{i}))) + if (isempty (glob(files{i}))) warning ("file %s does not exist", files{i}); endif endfor @@ -652,32 +652,32 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, packdir = fullfile (pwd(), dirlist{3}); endif packdirs{end+1} = packdir; - + ## Make sure the package contains necessary files. verify_directory (packdir); - + ## Read the DESCRIPTION file. filename = fullfile (packdir, "DESCRIPTION"); desc = get_description (filename); - + ## Verify that package name corresponds with filename. - [dummy, nm] = fileparts (tgz); + [dummy, nm] = fileparts (tgz); if ((length (nm) >= length (desc.name)) && ! strcmp (desc.name, nm(1:length(desc.name)))) - error ("package name '%s' doesn't correspond to its filename '%s'", + error ("package name '%s' doesn't correspond to its filename '%s'", desc.name, nm); endif - + ## Set default installation directory. desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); - - ## Set default architectire dependent installation directory. + + ## Set default architecture dependent installation directory. desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", desc.version)); - + ## Save desc. descriptions{end+1} = desc; - + ## Are any of the new packages already installed? ## If so we'll remove the old version. for j = 1:length (packages) @@ -705,14 +705,14 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, if (global_install) ## Global installation is not allowed to have dependencies on locally ## installed packages. - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(global_packages)); pseudo_installed_packages = {global_packages{idx1}, ... descriptions{idx2}}; else - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(local_packages)); - pseudo_installed_packages = {local_packages{idx1}, ... + pseudo_installed_packages = {local_packages{idx1}, ... global_packages{:}, ... descriptions{idx2}}; endif @@ -755,10 +755,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try for i = packages_to_uninstall if (global_install) - uninstall ({global_packages{i}.name}, false, verbose, local_list, + uninstall ({global_packages{i}.name}, false, verbose, local_list, global_list, global_install); else - uninstall ({local_packages{i}.name}, false, verbose, local_list, + uninstall ({local_packages{i}.name}, false, verbose, local_list, global_list, global_install); endif endfor @@ -809,7 +809,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, ## requested that it is, then mark the package as autoloaded. for i = length (descriptions):-1:1 if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) - fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", + fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", ".autoload"), "wt")); descriptions{i}.autoload = 1; endif @@ -872,10 +872,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif endfunction -function uninstall (pkgnames, handle_deps, verbose, local_list, +function uninstall (pkgnames, handle_deps, verbose, local_list, global_list, global_install) ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages(local_list, + [local_packages, global_packages] = installed_packages(local_list, global_list); if (global_install) installed_pkgs_lst = {local_packages{:}, global_packages{:}}; @@ -996,13 +996,13 @@ function uninstall (pkgnames, handle_deps, verbose, local_list, endfunction -function [pkg_desc_list, flag] = describe (pkgnames, verbose, +function [pkg_desc_list, flag] = describe (pkgnames, verbose, local_list, global_list) ## Get the list of installed packages. installed_pkgs_lst = installed_packages(local_list, global_list); num_packages = length (installed_pkgs_lst); - + describe_all = false; if (any (strcmp ("all", pkgnames))) @@ -1043,7 +1043,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, non_inst_str = sprintf (" %s ", pkgnames{non_inst}); error ("some packages are not installed: %s", non_inst_str); else - pkg_desc_list{non_inst} = struct ("name", {}, "description", + pkg_desc_list{non_inst} = struct ("name", {}, "description", {}, "provides", {}); endif endif @@ -1052,7 +1052,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, for i = 1:num_pkgnames print_package_description (pkg_desc_list{i}.name, pkg_desc_list{i}.version, - pkg_desc_list{i}.provides, + pkg_desc_list{i}.provides, pkg_desc_list{i}.description, flag{i}, verbose); endfor @@ -1069,12 +1069,12 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) if (! exist (index_file, "file")) error ("could not find any INDEX file in directory %s, try 'pkg rebuild all' to generate missing INDEX files", packdir); - endif + endif + - [fid, msg] = fopen (index_file, "r"); if (fid == -1) - error ("the INDEX file %s could not be read: %s", + error ("the INDEX file %s could not be read: %s", index_file, msg); endif @@ -1089,7 +1089,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) while (! feof (fid) || line != -1) if (! any (! isspace (line)) || line(1) == "#" || any (line == "=")) - ## Comments, blank lines or comments about unimplemented + ## Comments, blank lines or comments about unimplemented ## functions: do nothing ## FIXME: probably comments and pointers to external functions ## could be treated better when printing to screen? @@ -1114,7 +1114,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) fclose (fid); endfunction -function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, +function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, pkg_desc, status, verbose) printf ("---\nPackage name:\n\t%s\n", pkg_name); @@ -1122,7 +1122,7 @@ function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, printf ("Short description:\n\t%s\n", pkg_desc); printf ("Status:\n\t%s\n", status); if (verbose) - printf ("---\nProvides:\n"); + printf ("---\nProvides:\n"); for i = 1:length(pkg_idx_struct) if (! isempty (pkg_idx_struct{i}.functions)) printf ("%s\n", pkg_idx_struct{i}.category); @@ -1177,26 +1177,26 @@ function repackage (builddir, buildlist) unlink (fullfile (pack.name, "inst", "PKG_DEL")); endif if (exist (fullfile (archdir, "PKG_ADD"), "file")) - movefile (fullfile (archdir, "PKG_ADD"), + movefile (fullfile (archdir, "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); endif if (exist (fullfile (archdir, "PKG_DEL"), "file")) - movefile (fullfile (archdir, "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); + movefile (fullfile (archdir, "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); endif else if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_ADD"), + movefile (fullfile (pack.name, "inst", "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); - endif + endif if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); - endif - endif + movefile (fullfile (pack.name, "inst", "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); + endif + endif tfile = cstrcat (pack.name, "-", pack.version, ".tar"); tar (tfile, pack.name); - try + try gzip (tfile); unlink (tfile); catch @@ -1231,7 +1231,7 @@ function prepare_installation (desc, packdir) wd = pwd (); try cd (packdir); - pre_install (desc); + pre_install (desc); cd (wd); catch cd (wd); @@ -1245,13 +1245,13 @@ function prepare_installation (desc, packdir) [status, msg] = mkdir (inst_dir); if (status != 1) rm_rf (desc.dir); - error ("the 'inst' directory did not exist and could not be created: %s", + error ("the 'inst' directory did not exist and could not be created: %s", msg); endif endif endfunction -function configure_make (desc, packdir, verbose) +function configure_make (desc, packdir, verbose) ## Perform ./configure, make, make install in "src". if (exist (fullfile (packdir, "src"), "dir")) src = fullfile (packdir, "src"); @@ -1362,7 +1362,7 @@ function configure_make (desc, packdir, verbose) printf (" %s", archdependent{:}); printf (" %s\n", archdir); endif - if (! exist (archdir, "dir")) + if (! exist (archdir, "dir")) mkdir (archdir); endif [status, output] = copyfile (archdependent, archdir); @@ -1398,8 +1398,8 @@ endfunction function create_pkgadddel (desc, packdir, nm, global_install) instpkg = fullfile (desc.dir, nm); instfid = fopen (instpkg, "wt"); - ## If it is exists, most of the PKG_* file should go into the - ## architecture dependent directory so that the autoload/mfilename + ## If it is exists, most of the PKG_* file should go into the + ## architecture dependent directory so that the autoload/mfilename ## commands work as expected. The only part that doesn't is the ## part in the main directory. archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", @@ -1465,7 +1465,7 @@ function copy_files (desc, packdir, global_install) if (! exist (desc.dir, "dir")) [status, output] = mkdir (desc.dir); if (status != 1) - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", desc.dir, output); endif endif @@ -1493,32 +1493,32 @@ function copy_files (desc, packdir, global_install) [status, output] = mkdir (octm3); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm3, output); endif endif [status, output] = mkdir (octm2); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm2, output); endif endif [status, output] = mkdir (octm1); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm1, output); endif endif [status, output] = mkdir (octfiledir); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octfiledir, output); endif endif - [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), + [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), octfiledir); rm_rf (fullfile (desc.dir, getarch ())); @@ -1753,7 +1753,7 @@ function deps_cell = fix_depends (depends) version = fix_version (parts{2}); ## If no version is specified for the dependency - ## we say that the version should be greater than + ## we say that the version should be greater than ## or equal to "0.0.0". else package = tolower (strip (dep)); @@ -1813,7 +1813,7 @@ function write_index (desc, dir, index_file, global_install) if (err) error ("couldn't read directory %s: %s", tmpdir, msg); endif - files = [files; files2]; + files = [files; files2]; endif functions = {}; @@ -1910,7 +1910,7 @@ function [out1, out2] = installed_packages (local_list, global_list) endfor if (! isempty(dup)) installed_pkgs_lst(dup) = []; - endif + endif ## Now check if the package is loaded. tmppath = strrep (path(), "\\", "/"); @@ -1957,9 +1957,9 @@ function [out1, out2] = installed_packages (local_list, global_list) h1 = "Package Name"; h2 = "Version"; h3 = "Installation directory"; - max_name_length = length (h1); + max_name_length = length (h1); max_version_length = length (h2); - names = cell (num_packages, 1); + names = cell (num_packages, 1); for i = 1:num_packages max_name_length = max (max_name_length, length (installed_pkgs_lst{i}.name)); @@ -1996,7 +1996,7 @@ function [out1, out2] = installed_packages (local_list, global_list) first_char = length (cur_dir) - max_dir_length + 4; first_filesep = strfind (cur_dir(first_char:end), filesep()); if (! isempty (first_filesep)) - cur_dir = cstrcat ("...", + cur_dir = cstrcat ("...", cur_dir((first_char + first_filesep(1) - 1):end)); else cur_dir = cstrcat ("...", cur_dir(first_char:end)); @@ -2026,7 +2026,7 @@ function load_packages (files, handle_deps, local_list, global_list) if (length (files) == 1 && strcmp (files{1}, "all")) idx = [1:length(installed_pkgs_lst)]; ## Load auto. - elseif (length (files) == 1 && strcmp (files{1}, "auto")) + elseif (length (files) == 1 && strcmp (files{1}, "auto")) idx = []; for i = 1:length (installed_pkgs_lst) if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) @@ -2162,7 +2162,7 @@ endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) - archprefix = fullfile (octave_config_info ("libexecdir"), "octave", + archprefix = fullfile (octave_config_info ("libexecdir"), "octave", "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir; @@ -2207,7 +2207,7 @@ function newdesc = save_order (desc) newdesc = {}; for i = 1 : length(desc) deps = desc{i}.depends; - if (isempty (deps) || (length (deps) == 1 && + if (isempty (deps) || (length (deps) == 1 && strcmp(deps{1}.package, "octave"))) newdesc {end + 1} = desc{i}; else @@ -2220,7 +2220,7 @@ function newdesc = save_order (desc) endif endfor endfor - if (! isempty (tmpdesc)) + if (! isempty (tmpdesc)) newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; else newdesc{end+1} = desc{i}; @@ -2278,7 +2278,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) else if (handle_deps) deps = installed_pkgs_lst{i}.depends; - if ((length (deps) > 1) || (length (deps) == 1 && + if ((length (deps) > 1) || (length (deps) == 1 && ! strcmp(deps{1}.package, "octave"))) tmplidx = []; for k = 1 : length (deps) @@ -2289,7 +2289,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) endif endfor endfor - idx = load_package_dirs (tmplidx, idx, handle_deps, + idx = load_package_dirs (tmplidx, idx, handle_deps, installed_pkgs_lst); endif endif -- cgit v1.2.3 From 4c36be58ca2b4777a5e7bf0d3e692cfd9fa1aea3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 17 Nov 2011 01:09:20 -0800 Subject: Spelling fixes. --- admin/notes/commits | 2 +- configure.in | 2 +- doc/misc/ada-mode.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/org.texi | 2 +- doc/misc/pgg.texi | 26 ++++++++++----------- doc/misc/semantic.texi | 2 +- etc/NEWS.1-17 | 6 ++--- leim/quail/tibetan.el | 2 +- lib-src/update-game-score.c | 2 +- lisp/ChangeLog.12 | 2 +- lisp/allout-widgets.el | 2 +- lisp/allout.el | 4 ++-- lisp/ansi-color.el | 2 +- lisp/calc/calc-embed.el | 30 ++++++++++++------------ lisp/calc/calc-ext.el | 4 ++-- lisp/cedet/semantic/bovine/el.el | 2 +- lisp/cedet/semantic/complete.el | 6 ++--- lisp/cedet/semantic/db-file.el | 2 +- lisp/cedet/semantic/db-typecache.el | 2 +- lisp/cedet/semantic/db.el | 2 +- lisp/cedet/semantic/edit.el | 2 +- lisp/cedet/semantic/format.el | 2 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/sb.el | 2 +- lisp/cedet/semantic/texi.el | 2 +- lisp/cedet/srecode/compile.el | 2 +- lisp/cedet/srecode/dictionary.el | 2 +- lisp/cedet/srecode/document.el | 2 +- lisp/cedet/srecode/insert.el | 2 +- lisp/dired-aux.el | 4 ++-- lisp/emacs-lisp/advice.el | 4 ++-- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/emacs-lisp/smie.el | 5 ++-- lisp/eshell/esh-mode.el | 2 +- lisp/ezimage.el | 2 +- lisp/ffap.el | 2 +- lisp/follow.el | 2 +- lisp/gnus/gnus-srvr.el | 2 +- lisp/gnus/gnus.el | 2 +- lisp/gnus/html2text.el | 2 +- lisp/gnus/message.el | 2 +- lisp/gnus/nndiary.el | 2 +- lisp/gnus/nnmairix.el | 2 +- lisp/hilit-chg.el | 2 +- lisp/htmlfontify.el | 4 ++-- lisp/international/fontset.el | 2 +- lisp/international/titdic-cnv.el | 2 +- lisp/kmacro.el | 2 +- lisp/language/ethiopic.el | 2 +- lisp/loadhist.el | 2 +- lisp/mail/feedmail.el | 2 +- lisp/net/tramp-compat.el | 2 +- lisp/net/tramp-sh.el | 2 +- lisp/net/tramp.el | 2 +- lisp/org/org-clock.el | 2 +- lisp/org/org-compat.el | 2 +- lisp/org/org-list.el | 2 +- lisp/org/org.el | 6 ++--- lisp/play/animate.el | 2 +- lisp/play/decipher.el | 2 +- lisp/play/landmark.el | 2 +- lisp/progmodes/ada-xref.el | 3 ++- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cperl-mode.el | 6 ++--- lisp/progmodes/ebnf2ps.el | 2 +- lisp/progmodes/etags.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/idlw-help.el | 3 ++- lisp/progmodes/js.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/verilog-mode.el | 6 ++--- lisp/ses.el | 6 ++--- lisp/simple.el | 2 +- lisp/speedbar.el | 6 ++--- lisp/term/rxvt.el | 2 +- lisp/textmodes/artist.el | 4 ++-- lisp/textmodes/reftex-dcr.el | 46 ++++++++++++++++++------------------- lisp/textmodes/reftex-global.el | 2 +- lisp/textmodes/reftex-toc.el | 4 ++-- lisp/textmodes/reftex.el | 2 +- lisp/textmodes/texinfmt.el | 2 +- lisp/url/url-ldap.el | 2 +- lisp/url/url-vars.el | 2 +- lisp/vc/pcvs-defs.el | 2 +- lisp/vc/pcvs-util.el | 2 +- lisp/vc/pcvs.el | 2 +- lisp/window.el | 2 +- lisp/woman.el | 2 +- src/ccl.c | 4 ++-- src/chartab.c | 2 +- src/dired.c | 2 +- src/doprnt.c | 2 +- src/frame.c | 2 +- src/gtkutil.c | 4 ++-- src/keyboard.c | 4 ++-- src/w32fns.c | 2 +- src/w32font.c | 2 +- src/w32proc.c | 2 +- src/xterm.c | 2 +- test/cedet/tests/testpolymorph.cpp | 3 +-- 102 files changed, 178 insertions(+), 176 deletions(-) (limited to 'src/keyboard.c') diff --git a/admin/notes/commits b/admin/notes/commits index f37c3e020be..2c6f80c56f0 100644 --- a/admin/notes/commits +++ b/admin/notes/commits @@ -17,7 +17,7 @@ Date: Tue, 31 Mar 2009 12:21:20 +0900 files), not one-by-one. This is pretty easy using vc-dir now. (2) Make the log message describe the entire changeset, perhaps - including relevant changelog entiries (I often don't bother with + including relevant changelog entries (I often don't bother with the latter if it's a trivial sort of change). Many modern source-control systems vaguely distinguish the first diff --git a/configure.in b/configure.in index bf41b26b621..73e1d07edb7 100644 --- a/configure.in +++ b/configure.in @@ -1348,7 +1348,7 @@ AH_TEMPLATE(POINTER_TYPE, [Define as `void' if your compiler accepts `void *'; otherwise define as `char'.])dnl -dnl Check for endianess +dnl Check for endianness. AC_C_BIGENDIAN AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))], diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 1f4f1d5d05d..49f455b4e41 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -184,7 +184,7 @@ convention, where file names are a simple modification of the Ada names, and the extension for specs and bodies are @samp{.ads} and @samp{.adb}, respectively. -Ada mode uses the file extentions to allow moving from a package body +Ada mode uses the file extensions to allow moving from a package body to the corresponding spec and back. Ada mode supports a list of alternative file extensions for specs and bodies. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7c3328b9d77..a3a93c6ef61 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -26756,7 +26756,7 @@ Sudish Joseph---innumerable bug fixes. Ilja Weis---@file{gnus-topic.el}. @item -Steven L. Baur---lots and lots and lots of bugs detections and fixes. +Steven L. Baur---lots and lots and lots of bug detection and fixes. @item Vladimir Alexiev---the refcard and reference booklets. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 20abc28690a..cc925906c28 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -6216,7 +6216,7 @@ not started at exactly the right moment. @kindex ; Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown -timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else. +timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else. @code{org-timer-set-timer} prompts the user for a duration and displays a countdown timer in the modeline. @code{org-timer-default-timer} sets the diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 9cb7a637a05..0de12577b2d 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -57,18 +57,18 @@ and various tools for secure communication. PGG also provides a simple user interface to encrypt, decrypt, sign, and verify MIME messages. @ifnottex -@insertcopying +@insertcopying @end ifnottex @menu * Overview:: What PGG is. * Prerequisites:: Complicated stuff you may have to do. * How to use:: Getting started quickly. -* Architecture:: -* Parsing OpenPGP packets:: +* Architecture:: +* Parsing OpenPGP packets:: * GNU Free Documentation License:: The license for this documentation. -* Function Index:: -* Variable Index:: +* Function Index:: +* Variable Index:: @end menu @node Overview @@ -137,10 +137,10 @@ list autoload setting for desired functions as follows. @end lisp @menu -* User Commands:: -* Selecting an implementation:: -* Caching passphrase:: -* Default user identity:: +* User Commands:: +* Selecting an implementation:: +* Caching passphrase:: +* Default user identity:: @end menu @node User Commands @@ -358,13 +358,13 @@ singleton object wrapped with the luna object system. Since PGG was designed for accessing and developing PGP functionality, the architecture had to be designed not just for interoperability but -also for extensiblity. In this chapter we explore the architecture +also for extensibility. In this chapter we explore the architecture while finding out how to write the PGG back end. @menu -* Initializing:: -* Back end methods:: -* Getting output:: +* Initializing:: +* Back end methods:: +* Getting output:: @end menu @node Initializing diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index eb59f6d6b94..ad6159feb1a 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -606,7 +606,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. @c LocalWords: concat concocting const constantness ctxt Decl defcustom @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum -@c LocalWords: eq Exp EXPANDFULL expresssion fn foo func funcall +@c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall @c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 2ffd5e1e15b..5fbc872d3e9 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1612,7 +1612,7 @@ Changes in Emacs 13 The string "../lisp" now adds to the front of the load-path used for searching for Lisp files during Emacs initialization. It used to replace the path specified in paths.h entirely. - Now the directory ../lisp is searched first and the directoris + Now the directory ../lisp is searched first and the directories specified in paths.h are searched afterward. @@ -1670,7 +1670,7 @@ Changes in Emacs 1.12 the string, it is used unchanged. One way this feature can be used is to fix bad keyboard - designes. For example, on some terminals, Delete is + designs. For example, on some terminals, Delete is Shift-Underscore. Since Delete is a more useful character than Underscore, it is an improvement to make the unshifted character Delete and the shifted one Underscore. This can @@ -2446,7 +2446,7 @@ Changes in Emacs 1.1 containing *'s, etc, all processed by the shell). Also, you can dired more than one directory; dired names the buffer according to the filespec or directory name. Reinvoking - dired on a directory already direded just switches back to + dired on a directory already diredded just switches back to the same directory used last time; do M-x revert if you want to read in the current contents of the directory. diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el index 3b6e14c459b..c5c7061663e 100644 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@ -337,7 +337,7 @@ ("(" . "$(7!l(B") ("0" . "$(7!P(B") (")" . "$(7!m(B") -;;; ("-" ) ; enphatic, not yet supported +;;; ("-" ) ; emphatic, not yet supported ;;; ("_" ) ; id. ;;; ("=" ) ; special sign, not yet supported ("+" . "$(7!A(B") diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 9fba51a33de..e335617df4d 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -346,7 +346,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count) return -1; while ((readval = read_score (f, &ret[scorecount])) == 0) { - /* We encoutered an error */ + /* We encountered an error. */ if (readval < 0) return -1; scorecount++; diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 702248dd975..4baec98725c 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -16735,7 +16735,7 @@ * progmodes/cc-cmds.el (c-beginning-of-statement (and subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such that movement over macros and code are rigorously separated from - eachother. Correct a few incidental bugs. + each other. Correct a few incidental bugs. * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: Improve its doc-string. Improve the handling of certain specific cases. diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index c5d34fc3e3b..b2121de260d 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -49,7 +49,7 @@ ;; systematically couple overlays, graphics, and other features with ;; allout-governed text. -;;;_: Code (structured with comments that delinieate an allout outline) +;;;_: Code (structured with comments that delineate an allout outline) ;;;_ : General Environment (require 'allout) diff --git a/lisp/allout.el b/lisp/allout.el index 4098ba9ba5b..d3d4cf835ad 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1544,7 +1544,7 @@ substitution is used against the regexp matches, a la `replace-match'.") "Variable for regexps matching plaintext to remove before encryption. This is used to detect strings in encryption results that would -register as allout mode structural elements, for exmple, as a +register as allout mode structural elements, for example, as a topic prefix. Entries must be symbols that are bound to the desired regexp values. @@ -3543,7 +3543,7 @@ PRIOR-BULLET.) Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' is non-nil *and* no specific INSTEAD was specified. Then NUMBER-CONTROL non-nil forces prefix to either numbered or -denumbered format, depending on the value of the sixth arg, INDEX. +unnumbered format, depending on the value of the sixth arg, INDEX. \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...) diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index ff7edf40dcb..4d6f02a40b7 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -68,7 +68,7 @@ ;; ;; Markus Kuhn for pointing me to ECMA-48. ;; -;; Stefan Monnier explaing obscure font-lock stuff and +;; Stefan Monnier for explaining obscure font-lock stuff and for ;; code suggestions. diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f011d187a42..f1f79252857 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -125,7 +125,7 @@ "The mode settings for Calc buffer when put in embedded mode.") (defun calc-embedded-save-original-modes () - "Save the current Calc modes when entereding embedded mode." + "Save the current Calc modes when entering embedded mode." (let ((calcbuf (save-excursion (calc-create-buffer) (current-buffer))) @@ -144,7 +144,7 @@ (let ((var (cdr (car v)))) (unless (memq var '(the-language the-display-just)) (setq modes - (cons (cons var (symbol-value var)) + (cons (cons var (symbol-value var)) modes)))) (setq v (cdr v)))) (setq calc-embedded-original-modes (cons lang modes))) @@ -182,7 +182,7 @@ (calc-set-mode-line)))) (setq calc-embedded-original-modes nil))) -;; The variables calc-embed-outer-top, calc-embed-outer-bot, +;; The variables calc-embed-outer-top, calc-embed-outer-bot, ;; calc-embed-top and calc-embed-bot are ;; local to calc-do-embedded, calc-embedded-mark-formula, ;; calc-embedded-duplicate, calc-embedded-new-formula and @@ -195,7 +195,7 @@ ;; The variable calc-embed-arg is local to calc-do-embedded, ;; calc-embedded-update-formula, calc-embedded-edit and -;; calc-do-embedded-activate, but is used by +;; calc-do-embedded-activate, but is used by ;; calc-embedded-make-info, which is called by the above ;; functions. (defvar calc-embed-arg) @@ -208,14 +208,14 @@ ;; The following is to take care of any minor modes which override ;; a Calc command. -(defvar calc-override-minor-modes-map +(defvar calc-override-minor-modes-map (make-sparse-keymap) "A list of keybindings that might be overwritten by minor modes.") ;; Add any keys that might be overwritten here. (define-key calc-override-minor-modes-map "`" 'calc-edit) -(defvar calc-override-minor-modes +(defvar calc-override-minor-modes (cons t calc-override-minor-modes-map)) (defun calc-do-embedded (calc-embed-arg end obeg oend) @@ -279,7 +279,7 @@ (calc-embedded-save-original-modes) (or calc-embedded-globals (calc-find-globals)) - (setq info + (setq info (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) (if (eq (car-safe (aref info 8)) 'error) (progn @@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there." (goto-char calc-embed-outer-bot) (insert "\n") (setq new-top (point)) - (insert-buffer-substring (current-buffer) + (insert-buffer-substring (current-buffer) calc-embed-outer-top calc-embed-outer-bot) (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) (let ((calc-embedded-quiet (if already t 'x))) @@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there." (equal (symbol-value (car (car v))) value)) (progn (setq changed t) - (if temp (setq calc-embed-prev-modes + (if temp (setq calc-embed-prev-modes (cons (cons (car (car v)) (symbol-value (car (car v)))) calc-embed-prev-modes))) @@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there." (list modes emodes pmodes))) ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, -;; calc-embedded-evaluate-expr and calc-embedded-update, but is +;; calc-embedded-evaluate-expr and calc-embedded-update, but is ;; used by calc-embedded-find-vars, which is called by the above functions. (defvar calc-embed-vars-used) (defun calc-embedded-make-info (point cbuf fresh &optional - calc-embed-top calc-embed-bot + calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot) (let* ((bufentry (assq (current-buffer) calc-embedded-active)) (found bufentry) @@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there." (newform (assoc major-mode calc-embedded-open-close-formula-alist)) (newword (assoc major-mode calc-embedded-word-regexp-alist)) (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) - (newnewform + (newnewform (assoc major-mode calc-embedded-open-close-new-formula-alist)) (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) (when newann @@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there." (aset info 1 (or cbuf (save-excursion (calc-create-buffer) (current-buffer))))) - (if (and + (if (and (or (integerp calc-embed-top) (equal calc-embed-top '(4))) - (not calc-embed-bot)) + (not calc-embed-bot)) ; started with a user-supplied argument (progn (if (equal calc-embed-top '(4)) @@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there." (if need-display (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) (t - (set (car (car calc-embed-prev-modes)) + (set (car (car calc-embed-prev-modes)) (cdr (car calc-embed-prev-modes))))) (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 8b816665d97..5429509af86 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -432,7 +432,7 @@ (define-key calc-mode-map "ls" 'calc-spn) (define-key calc-mode-map "lm" 'calc-midi) (define-key calc-mode-map "lf" 'calc-freq) - + (define-key calc-mode-map "l?" 'calc-l-prefix-help) (define-key calc-mode-map "m" nil) @@ -2867,7 +2867,7 @@ If X is not an error form, return 1." (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) ;; The variable math-integral-cache is originally declared in calcalg2.el, -;; but is set by math-defintegral and math-definitegral2. +;; but is set by math-defintegral and math-defintegral-2. (defvar math-integral-cache) (defmacro math-defintegral (funcs &rest code) diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 1a4e0d9f6ba..2151e9ef53b 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding." (&optional point) "Return a list of tag classes allowed at POINT. Emacs Lisp knows much more about the class of the tag needed to perform -completion than some languages. We distincly know if we are to be a +completion than some languages. We distinctly know if we are to be a function name, variable name, or any type of symbol. We could identify fields and such to, but that is for some other day." (save-excursion diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index f1aee1ef381..6709236c541 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -891,7 +891,7 @@ making the action of homing in on a token faster.") This completion is calculated and saved for future use.") (last-whitespace-completion :type (or null string) :documentation "The last whitespace completion. -For partial completion, SPC will disabiguate over whitespace type +For partial completion, SPC will disambiguate over whitespace type characters. This is the last calculated version.") (current-exact-match :type list :protection :protected @@ -1353,7 +1353,7 @@ to click on the items to aid in completion.") (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) "A request to show the current tags table." - ;; NOTE TO SELF. Find the character to type next, and emphesize it. + ;; NOTE TO SELF. Find the character to type next, and emphasize it. (with-output-to-temp-buffer "*Completions*" (display-completion-list @@ -1377,7 +1377,7 @@ given tag, by highlighting its location.") ) "Abstract displayor supporting `focus'. A displayor which has the ability to focus in on one tag. -Focusing is a way of differentiationg between multiple tags +Focusing is a way of differentiating among multiple tags which have the same name." :abstract t) diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 661bc8d6841..943ccf23031 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -289,7 +289,7 @@ Argument OBJ is the object to write." (when (and (boundp semantic-show-unmatched-syntax-mode) semantic-show-unmatched-syntax-mode) ;; Only do this if the user runs unmatched syntax - ;; mode display enties. + ;; mode display entries. (oset obj unmatched-syntax (semantic-show-unmatched-lex-tokens-fetch)) ) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index ce76dddf359..a4c4bd99f26 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -368,7 +368,7 @@ a master list." (semanticdb-typecache-merge-streams incstream ;; Getting the cache from this table will also cause this - ;; file to update it's cache from it's decendants. + ;; file to update its cache from its decendents. ;; ;; In theory, caches are only built for most includes ;; only once (in the loop before this one), so this ends diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index f83d30ac12a..c9013ed8c90 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer." ;; The lexical table should be good too. (when (featurep 'semantic/lex-spp) (oset table lexical-table (semantic-lex-spp-save-table))) - ;; this implies dirtyness + ;; this implies dirtiness (semanticdb-set-dirty table) ;; Synchronize the index diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 8115f3c9a16..4ac2733a34f 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." ;; We want to take some set of changes, and group them ;; together into a small change group. One change forces ;; a reparse of a larger region (the size of some set of - ;; tags it encompases.) It may contain several tags. + ;; tags it encompasses.) It may contain several tags. ;; That region may have other changes in it (several small ;; changes in one function, for example.) ;; Optimize for the simple cases here, but try to handle diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el index 8a099a9bfb0..876ec9bbd4a 100644 --- a/lisp/cedet/semantic/format.el +++ b/lisp/cedet/semantic/format.el @@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".") "Convert PROTECTION-SYMBOL to a string for UML. By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list' to convert. -By defaul character returns are: +By default character returns are: public -- + private -- - protected -- #. diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 5489765dcc8..8009a257a7b 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -639,7 +639,7 @@ and what valid VAL values are." ;;; Macro Merging ;; -;; Used when token streams from different macros include eachother. +;; Used when token streams from different macros include each other. ;; Merged macro streams perform in place replacements. (defun semantic-lex-spp-merge-streams (raw-stream) diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index 3fe3f05f1fb..d9a3ede360d 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -399,7 +399,7 @@ Returns the tag list, or t for an error." (if (listp out) (condition-case nil (progn - ;; This brings externally defind methods into + ;; This brings externally defined methods into ;; their classes, and creates meta classes for ;; orphans. (setq out (semantic-adopt-external-members out)) diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index e79953400a7..c2f080ce75b 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -597,7 +597,7 @@ Note: TYPE not yet implemented." ;; ;; If we have a string, do the replacement. ;; (delete-region (semantic-tag-start tag) ;; (semantic-tag-end tag)) -;; ;; Use useful functions from the docaument library. +;; ;; Use useful functions from the document library. ;; (srecode-texi-insert-tag-as-doc doctag) ;; ;(semantic-insert-foreign-tag doctag) ;; )) diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index d65cd2b8d88..d3623d6022f 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -62,7 +62,7 @@ (dictionary :initarg :dictionary :type (or null srecode-dictionary) :documentation - "List of section dictinaries. + "List of section dictionaries. The compiled template can contain lists of section dictionaries, or values that are expected to be passed down into different section macros. The template section dictionaries are merged in with diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 5f6806a06b3..62ceff82448 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -202,7 +202,7 @@ associated with a buffer or parent." :size 20) :origin origin))) ;; Only set up the default variables if we are being built - ;; directroy for a particular buffer. + ;; directly for a particular buffer. (when initfrombuff ;; Variables from the table we are inserting from. ;; @todo - get a better tree of tables. diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index e297f5dffda..caf1ddebdb2 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -720,7 +720,7 @@ allocating something based on its type." "Convert tag or string PARAM into a name,comment pair. Optional COMMENTLIST is list of previously existing comments to use instead in alist form. If the name doesn't appear in the list of -standard names, then englishify it instead." +standard names, then english it instead." (let ((cmt "") (aso srecode-document-autocomment-param-alist) (fnd nil) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index cccfe099e74..9fbfc5dc042 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -936,7 +936,7 @@ with the dictionaries found in the dictionary." (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) ;; If we have a value, then call the next method (srecode-insert-method-helper sti dictionary 'includedtemplate) - ;; If we don't have a special dictitonary, then just insert with the + ;; If we don't have a special dictionary, then just insert with the ;; current dictionary. (srecode-insert-subtemplate sti dictionary 'includedtemplate)) ) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b09096978fd..b63940cec2d 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -347,7 +347,7 @@ This calls touch." ;; Do the operation and record failures. failures (nconc (apply function (append args pending)) failures) - ;; Transfer the elemens of PENDING onto PAST + ;; Transfer the elements of PENDING onto PAST ;; and clear it out. Now PAST contains the first N files ;; specified (for some N), and FILES contains the rest. past (nconc past pending) @@ -1490,7 +1490,7 @@ ARG as in `dired-get-marked-files'. Optional arg MARKER-CHAR as in `dired-create-files'. Optional arg OP1 is an alternate form for OPERATION if there is only one file. -Optional arg HOW-TO determiness how to treat the target. +Optional arg HOW-TO determines how to treat the target. If HOW-TO is nil, use `file-directory-p' to determine if the target is a directory. If so, the marked file(s) are created inside that directory. Otherwise, the target is a plain file; diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index a245a91c5c1..8527bc9e640 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -664,8 +664,8 @@ ;; @@@ Enabling automatic advice activation: ;; ========================================= -;; Automatic advice activation is enabled by default. It can be disabled by -;; doint `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. +;; Automatic advice activation is enabled by default. It can be disabled with +;; `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. ;; @@ Caching of advised definitions: ;; ================================== diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 84aaf8718ed..096e91ea4fb 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments." (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc) "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC. -CONST2 may be evaulated multiple times." +CONST2 may be evaluated multiple times." `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8) ,bytes ,pc)) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 8257c6aebea..265328631e9 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1579,8 +1579,9 @@ KEYWORDS are additional arguments, which can use the following keywords: (while (setq closer (pop closers)) (unless (and closers ;; FIXME: this eliminates prefixes of other - ;; closers, but we should probably elimnate - ;; prefixes of other keywords as well. + ;; closers, but we should probably + ;; eliminate prefixes of other keywords + ;; as well. (string-prefix-p closer (car closers))) (push (aref closer (1- (length closer))) triggers))) (delete-dups triggers))))))) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 9abb0c8ecc0..43d56a5b89f 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -607,7 +607,7 @@ will return the parsed command." (setq command (eshell-parse-command (cons beg end) args t))))) (ignore - (message "Expecting completion of delimeter %c ..." + (message "Expecting completion of delimiter %c ..." (if (listp delim) (car delim) delim))) diff --git a/lisp/ezimage.el b/lisp/ezimage.el index e8680b65d96..a3562944039 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -59,7 +59,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image." (defimage ,variable ,imagespec ,docstring) (put (quote ,variable) 'ezimage t))) -;; This hack is for the ezimage install which has an icons direcory for +;; This hack is for the ezimage install which has an icons directory for ;; the default icons to be used. ;; (add-to-list 'load-path ;; (concat (file-name-directory diff --git a/lisp/ffap.el b/lisp/ffap.el index 97105ed422b..74df9883324 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -523,7 +523,7 @@ The optional NOMODIFY argument suppresses the extra search." ;; (ffap-file-remote-p "/ffap.el:80") (or (and ffap-ftp-regexp (string-match ffap-ftp-regexp filename) - ;; Convert "/host.com://dir" to "/host:/dir", to handle a dieing + ;; Convert "/host.com://dir" to "/host:/dir", to handle a dying ;; practice of advertising ftp files as "host.dom://filename". (if (string-match "//" filename) ;; (replace-match "/" nil nil filename) diff --git a/lisp/follow.el b/lisp/follow.el index a0e363aea2a..aa40c27a7a9 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -560,7 +560,7 @@ Keys specific to Follow mode: ;; `scroll-up' and `-down', but for windows in Follow mode. ;; -;; Almost like the real thing, excpet when the cursor ends up outside +;; Almost like the real thing, except when the cursor ends up outside ;; the top or bottom... In our case however, we end up outside the ;; window and hence we are recenterd. Should we let `recenter' handle ;; the point position we would never leave the selected window. To do diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index ec98b2ff749..2d8587ace3f 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -553,7 +553,7 @@ The following commands are available: (gnus-server-list-servers)) (defun gnus-server-copy-server (from to) - "Copy a server definiton to a new name." + "Copy a server definition to a new name." (interactive (list (or (gnus-server-server-name) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 924d974eb3c..5f385ec1054 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -3582,7 +3582,7 @@ that that variable is buffer-local to the summary buffers." (equal (nth 1 m1) (nth 1 m2))))))) (defsubst gnus-sloppily-equal-method-parameters (m1 m2) - ;; Check parameters for sloppy equalness. + ;; Check parameters for sloppy equality. (let ((p1 (copy-sequence (cddr m1))) (p2 (copy-sequence (cddr m2))) e1 e2) diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index 345e7c19a6a..dade86ab174 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -123,7 +123,7 @@ If this list contains the element \"font\".") This is an alist where each dotted pair consists of a tag, and then the name of a function to be called when this tag is found. The function is called with the arguments p1, p2, p3 and p4. These are -demontrated below: +demonstrated below: \" This is bold text \" ^ ^ ^ ^ diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 1d0830afd28..176857633e1 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2503,7 +2503,7 @@ Return the number of headers removed." (point-max))) (goto-char (point-min))) -;; FIXME: clarify diffference: message-narrow-to-head, +;; FIXME: clarify difference: message-narrow-to-head, ;; message-narrow-to-headers-or-head, message-narrow-to-headers (defun message-narrow-to-head () "Narrow the buffer to the head of the message. diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index db7ac1b44f8..a798e22902f 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -72,7 +72,7 @@ ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: ;; NNDiary has some experimental parts, in the sense Gnus normally uses only ;; one mail back ends for mail retreival and splitting. This back end is -;; also an attempt to make it behave differently. For Gnus developpers: as +;; also an attempt to make it behave differently. For Gnus developers: as ;; you can see if you snarf into the code, that was not a very difficult ;; thing to do. Something should be done about the respooling breakage ;; though. diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 66ed90be823..9d6011e6573 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -1634,7 +1634,7 @@ search in raw mode." (nnheader-message 3 "Couldn't find original article")))) (defun nnmairix-determine-original-group-from-registry (mid) - "Try to determinale original group for message-id MID from the registry." + "Try to determine original group for message-id MID from the registry." (when (gnus-bound-and-true-p 'gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 46db4280688..0dee4157d78 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -480,7 +480,7 @@ This is the opposite of `hilit-chg-hide-changes'." (defun hilit-chg-make-ov (prop start end) (or prop (error "hilit-chg-make-ov: prop is nil")) - ;; For the region create overlays with a distincive face + ;; For the region create overlays with a distinctive face ;; and the text property 'hilit-chg. (let ((ov (make-overlay start end)) (face (if (eq prop 'hilit-chg-delete) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index deb241ce7f5..56859269e02 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -586,7 +586,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." (defvar hfy-cperl-mode-kludged-p nil) (defun hfy-kludge-cperl-mode () - "CPerl mode does its damndest not to do some of its fontification when not + "CPerl mode does its damnedest not to do some of its fontification when not in a windowing system - try to trick it..." (if (not hfy-cperl-mode-kludged-p) (progn (if (not window-system) @@ -1773,7 +1773,7 @@ Strips any leading \"./\" from each filename." (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) (split-string (shell-command-to-string hfy-find-cmd))) ) -;; strip the filename off, return a directiry name +;; strip the filename off, return a directory name ;; not a particularly thorough implementaion, but it will be ;; fed pretty carefully, so it should be Ok: (defun hfy-dirname (file) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 777779e5ec5..9f6520c7238 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -700,7 +700,7 @@ Internal use only. Should be called at startup time." ;; HPHEBREW8 8-bit character set ;; "HP-Japanese15" [36] ;; HPJAPAN15 15-bit character set, -;; modified from industry defacto +;; modified from industry de facto ;; standard Shift-JIS ;; "HP-Kana8" [36] ;; HPKANA8 8-bit character set diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index ad055ac9064..757322aa0ce 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -305,7 +305,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy (cond ((looking-at "PROMPT:[ \t]*") (goto-char (match-end 0)) (setq tit-prompt (tit-read-key-value)) - ;; Some TIT dictionaies that are encoded by + ;; Some TIT dictionaries that are encoded by ;; euc-china contains invalid character at the tail. (let* ((last (aref tit-prompt (1- (length tit-prompt)))) (split (split-char last))) diff --git a/lisp/kmacro.el b/lisp/kmacro.el index e47f571db71..eea3009faf4 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1020,7 +1020,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) next-index executing-kbd-macro-index))))) - ;; Query the user; stop macro exection temporarily + ;; Query the user; stop macro execution temporarily. (let ((macro executing-kbd-macro) (executing-kbd-macro nil) (defining-kbd-macro nil)) diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 22ccd56dab3..13a645a9975 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -61,7 +61,7 @@ (features ethio-util) (sample-text . "áŠá‹°áˆ") (documentation . -"This language envrironment provides these function key bindings: +"This language environment provides these function key bindings: [f3] ethio-fidel-to-sera-buffer [S-f3] ethio-fidel-to-sera-region [C-f3] ethio-fidel-to-sera-marker diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 0b569199935..da20e4cb7ca 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -144,7 +144,7 @@ These are symbols with hooklike values whose names don't end in pertinent symbols.") (defvar unload-function-defs-list nil - "List of defintions in the Lisp library being unloaded. + "List of definitions in the Lisp library being unloaded. This is meant to be used by `FEATURE-unload-function'; see the documentation of `unload-feature' for details.") diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 1ba8ec9f821..47583e3f860 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -83,7 +83,7 @@ ;; work properly. If you don't know what custom is all about and want ;; to edit your user option elisp variables the old fashioned way, ;; just imagine that all the "defcustom" stuff you see below is really -;; "defvar", and ignore everthing else. For info about custom, see +;; "defvar", and ignore everything else. For info about custom, see ;; . ;; ;; This code does in elisp a superset of the stuff that used to be done diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 5054f1d232d..89c7db241d8 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -412,7 +412,7 @@ element is not omitted." (program &optional infile destination display &rest args) "Calls `call-process' on the local host. This is needed because for some Emacs flavors Tramp has -defadviced `call-process' to behave like `process-file'. The +defadvised `call-process' to behave like `process-file'. The Lisp error raised when PROGRAM is nil is trapped also, returning 1." (let ((default-directory (if (file-remote-p default-directory) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1b00e81ef5d..50a3c1fca5e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -549,7 +549,7 @@ as given in your `~/.profile'." "*List of environment variables to be set on the remote host. Each element should be a string of the form ENVVARNAME=VALUE. An -entry ENVVARNAME= diables the corresponding environment variable, +entry ENVVARNAME= disables the corresponding environment variable, which might have been set in the init files like ~/.profile. Special handling is applied to the PATH environment, which should diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a47e7fa8f6f..0ee6ad8dea4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should choose a shell here which groks tilde expansion. `/bin/sh' normally does not understand tilde expansion. -For encoding and deocding, commands like the following are executed: +For encoding and decoding, commands like the following are executed: /bin/sh -c COMMAND < INPUT > OUTPUT diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index b1a8a4b9fdb..6279ed3df0d 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -2125,7 +2125,7 @@ the currently selected interval size." "Write out a clock table at position IPOS in the current buffer. TABLES is a list of tables with clocking data as produced by `org-clock-get-table-data'. PARAMS is the parameter property list obtained -from the dynamic block defintion." +from the dynamic block definition." ;; This function looks quite complicated, mainly because there are a ;; lot of options which can add or remove columns. I have massively ;; commented this function, the I hope it is understandable. If diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 896acc5aeae..5e4935caa7e 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -272,7 +272,7 @@ Works on both Emacs and XEmacs." nil)) (defmacro org-xemacs-without-invisibility (&rest body) - "Turn off exents with invisibility while executing BODY." + "Turn off extents with invisibility while executing BODY." `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 'all-extents-closed-open 'invisible)) ext-inv-specs) diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 14b3e12c888..1a14c71d510 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -681,7 +681,7 @@ Assume point is at an item." (cond ((<= (point) lim-up) ;; At upward limit: if we ended at an item, store it, - ;; else dimiss useless data recorded above BEG-CELL. + ;; else dismiss useless data recorded above BEG-CELL. ;; Jump to part 2. (throw 'exit (setq itm-lst diff --git a/lisp/org/org.el b/lisp/org/org.el index 5d988b3cecd..f88ed3c7ebc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1482,7 +1482,7 @@ in the search text." :type '(choice (const :tag "Use fuzy text search" nil) (const :tag "Match only exact headline" t) - (const :tag "Match extact headline or query to create it" + (const :tag "Match exact headline or query to create it" query-to-create))) (defcustom org-link-frame-setup @@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.") (defvar org-emph-face nil) (defun org-do-emphasis-faces (limit) - "Run through the buffer and add overlays to emphasised strings." + "Run through the buffer and add overlays to emphasized strings." (let (rtn a) (while (and (not rtn) (re-search-forward org-emph-re limit t)) (if (not (= (char-after (match-beginning 3)) @@ -14835,7 +14835,7 @@ user." (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) t nil ans))) - ;; Help matching dottet european dates + ;; Help matching dotted european dates (when (string-match "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) (setq year (if (match-end 3) diff --git a/lisp/play/animate.el b/lisp/play/animate.el index facdfa2f347..ec0cacc4a68 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el @@ -93,7 +93,7 @@ (defvar animation-buffer-name nil "*String naming the default buffer for animations. -When nil animations dipslayed in the buffer named *Animation*.") +When nil animations displayed in the buffer named *Animation*.") ;;;###autoload (defun animate-string (string vpos &optional hpos) diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index b9ce669533a..4d4ea71cd7a 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -672,7 +672,7 @@ X: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * 11 14 9% 1 1 1 2 1 1 2 5 7 This says that X comes before D once, and after B once. X begins 5 words, and ends 3 words (`*' represents a space). X comes before 8 -different letters, after 7 differerent letters, and is next to a total +different letters, after 7 different letters, and is next to a total of 11 different letters. It occurs 14 times, making up 9% of the ciphertext." (interactive (list (upcase (following-char)))) diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index f0e6670fe58..8629baf35d3 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1584,7 +1584,7 @@ If the game is finished, this command requests for another game." ;;;_ - something which doesn't work ; no-a-worka!! -;(defum landmark-sum-list (list) +;(defun landmark-sum-list (list) ; (if (> (length list) 0) ; (+ (car list) (landmark-sum-list (cdr list))) ; 0)) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4cf00cd3cfd..0cfdab23702 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1163,7 +1163,8 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame." (defun ada-goto-declaration-other-frame (pos) "Display the declaration of the identifier around POS. -The declation is shown in another frame if `ada-xref-other-buffer' is non-nil." +The declaration is shown in another frame if `ada-xref-other-buffer' is +non-nil." (interactive "d") (ada-goto-declaration pos t)) diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 74f9acab5b5..aa1289cd632 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -776,7 +776,7 @@ (setq anchor (point)) (search-forward-regexp c-awk-harmless-string*-here-re nil t) ;; We are now looking at either a " or a /. - ;; Do our thing on the string, regexp or divsion sign. + ;; Do our thing on the string, regexp or division sign. (setq anchor-state-/div (if (looking-at "_?\"") (c-awk-syntax-tablify-string) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 13858ad0da1..1925d16ba58 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1304,7 +1304,7 @@ versions of Emacs." (get-text-property (point) 'syntax-type)) '(here-doc pod))] "----" - ["CPerl pretty print (exprmntl)" cperl-ps-print + ["CPerl pretty print (experimental)" cperl-ps-print (fboundp 'ps-extend-face-list)] "----" ["Syntaxify region" cperl-find-pods-heres-region @@ -5793,7 +5793,7 @@ indentation and initial hashes. Behaves usually outside of comment." ;; "\\|") '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" - ;; This highlights declarations and definitions differenty. + ;; This highlights declarations and definitions differently. ;; We do not try to highlight in the case of attributes: ;; it is already done by `cperl-find-pods-heres' (list (concat "\\ x operator y + ;; binary macro definitions: x operator y (cons (concat "\\<" macro-keywords-2 "\\>" "[ \t\f]+\\(\\sw+\\)" "[ \t\f]*\\(\\sw+\\|\\s.+\\)" diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fe6bab0160d..8d2e6715444 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -119,7 +119,7 @@ (1 font-lock-type-face)) ;; Built-ins. (The next three blocks are from ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns - ;; are debateable, but they at least help to spot possible + ;; are debatable, but they at least help to spot possible ;; shadowing of builtins. (,(rx symbol-start (or ;; exceptions diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 3a3c7f0baa3..2d8334bcb7d 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -913,7 +913,7 @@ the MSB or LSB of a signal inside an AUTORESET." (put 'verilog-assignment-delay 'safe-local-variable 'stringp) (defcustom verilog-auto-arg-sort nil - "*If set, AUTOARG signal names will be sorted, not in delaration order. + "*If set, AUTOARG signal names will be sorted, not in declaration order. Declaration order is advantageous with order based instantiations and is the default for backward compatibility. Sorted order reduces changes when declarations are moved around in a file, and @@ -2151,7 +2151,7 @@ find the errors." "interface" "endinterface" "module" "macromodule" "endmodule" "package" "endpackage" - "primitive" "endprimative" + "primitive" "endprimitive" "program" "endprogram" "property" "endproperty" "sequence" "randsequence" "endsequence" @@ -3579,7 +3579,7 @@ With ARG, first kill any existing labels." "Move backward to beginning of statement." (interactive) ;; Move back token by token until we see the end - ;; of some ealier line. + ;; of some earlier line. (let (h) (while ;; If the current point does not begin a new diff --git a/lisp/ses.el b/lisp/ses.el index b1d7d7bfb9e..c71c603726c 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -980,7 +980,7 @@ if the cell's value is unchanged and FORCE is nil." (error "Circular references: %s" ses--deferred-recalc)) (message " ")) ;; Can't use save-excursion here: if the cell under point is updated, - ;; save-excusion's marker will move past the cell. + ;; save-excursion's marker will move past the cell. (goto-char pos))) @@ -3204,7 +3204,7 @@ By passing in REST some flags one can configure the way the range is read and how it is formatted. In the sequel we assume that cells A1, B1, A2 B2 have respective values -1 2 3 and 4 for examplication. +1 2 3 and 4. Readout direction is specified by a `>v', '`>^', `', `v<', `^>', `^<' flag. For historical reasons, in absence @@ -3230,7 +3230,7 @@ vector or a matrix depending on the number of rows, `*1' will flatten the result to a one row vector, and `*2' will make a matrix whatever the number of rows. -Warning: interaction with Calc is expermimental and may produce +Warning: interaction with Calc is experimental and may produce confusing results if you are not aware of Calc data format. Use `math-format-value' as a printer for Calc objects." (let (result-row diff --git a/lisp/simple.el b/lisp/simple.el index ca50282df15..e70d37588a0 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2409,7 +2409,7 @@ and only used if a buffer is displayed." 1)) 1))) ;; Don't use the echo area if the output buffer is - ;; already dispayed in the selected frame. + ;; already displayed in the selected frame. (not (get-buffer-window (current-buffer)))) ;; Echo area (goto-char (point-max)) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 00f68a0b45f..23a91888c1b 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -631,7 +631,7 @@ with `.' followed by extensions, followed by full-filenames." (substring (car extlist) 1))) (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) (setq extlist (cdr extlist))) - ;; concat all the sub-exressions together, making sure all types + ;; Concatenate all the subexpressions together, making sure all types ;; of parts exist during concatenation. (concat "\\(" (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") @@ -2105,7 +2105,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories (list (expand-file-name default-directory))) - ;; exand them all as we find them + ;; Expand them all as we find them. (while sf (if (speedbar-goto-this-file (car sf)) (progn @@ -3292,7 +3292,7 @@ With universal argument ARG, flush cached data." Optional argument ARG indicates that any cache should be flushed." (interactive "P") (speedbar-expand-line arg) - ;; Now, inside the area expaded here, expand all subnodes of + ;; Now, inside the area expanded here, expand all subnodes of ;; the same descendant type. (save-excursion (speedbar-next 1) ;; Move into the list. diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 0e9de519c8c..5b21913c32e 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -118,7 +118,7 @@ ;; function keys F11->F42 from the termcap/terminfo information. On ;; a PC-style keyboard these keys correspond to ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The - ;; code here subsitutes the corresponding defintions in + ;; code here subsitutes the corresponding definitions in ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 20d9c18c43e..d13437f4c7c 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2514,7 +2514,7 @@ This function returns a point-list." ;; -;; functions for accessing endoints and elements in object requiring +;; functions for accessing endpoints and elements in object requiring ;; 2 endpoints ;; @@ -3582,7 +3582,7 @@ FILL-INFO is a list of vectors on the form [X Y ELLIPSE-WIDTH-ON-THIS-LINE]." (width (abs (- x2 x1))) (height (abs (- y2 y1))) ;; When drawing our circle, we want it to through the cursor - ;; just as when drawing the ellispe, but we have to take + ;; just as when drawing the ellipse, but we have to take ;; care for the aspect-ratio. ;; The equation for the ellipse (where a is the x-radius and ;; b is the y-radius): diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 9b924ba7ad9..7de15c66cec 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -59,7 +59,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (error "Not on a crossref macro argument")) (setq reftex-call-back-to-this-buffer (current-buffer)) - + (cond ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro) ;; A citation macro: search for bibitems or BibTeX entries @@ -87,7 +87,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (format reftex-find-index-entry-regexp-format (regexp-quote key)) 3 nil nil))) - (t + (t (reftex-access-scan-info arg) (catch 'exit (let ((list reftex-view-crossref-extra) @@ -97,14 +97,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." action (nth 1 entry) group (nth 2 entry)) (when (string-match mre macro) - (setq dw (reftex-view-regexp-match + (setq dw (reftex-view-regexp-match (format action key) group nil nil)) (throw 'exit t)))) (error "Not on a crossref macro argument")))) (if (and (eq arg 2) (windowp dw)) (select-window dw))))) - + (defun reftex-view-cr-cite (arg key how) - ;; View crossreference of a ref cite. HOW can have the values + ;; View crossreference of a ref cite. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. @@ -114,7 +114,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let (files size item (pos (point)) (win (selected-window)) pop-win @@ -130,7 +130,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (setq item t files (reftex-uniquify (mapcar 'cdr - (reftex-all-assq + (reftex-all-assq 'thebib (symbol-value reftex-docstruct-symbol)))))) (reftex-default-bibliography (setq item nil @@ -169,17 +169,17 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (select-window pop-win))))) (defun reftex-view-cr-ref (arg label how) - ;; View crossreference of a ref macro. HOW can have the values + ;; View crossreference of a ref macro. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. ;; Ensure access to scanning info (reftex-access-scan-info (or arg current-prefix-arg)) - + (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol))) @@ -191,14 +191,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." ;; Label is defined in external document (save-excursion (save-match-data - (set-buffer + (set-buffer (or (reftex-get-file-buffer-force (cdr (assoc (match-string 1 label) (nth 1 xr-data)))) (error "Problem with external label %s" label)))) (setq label (substring label (match-end 1))) (reftex-access-scan-info) - (setq entry + (setq entry (assoc label (symbol-value reftex-docstruct-symbol))))) (if (eq how 'echo) ;; Display in echo area @@ -234,7 +234,7 @@ With argument, actually select the window showing the cross reference." (defun reftex-view-crossref-when-idle () ;; Display info about crossref at point in echo area or a window. - ;; This function was desigend to work with an idle timer. + ;; This function was designed to work with an idle timer. ;; We try to get out of here as quickly as possible if the call is useless. (and reftex-mode ;; Make sure message area is free if we need it. @@ -244,7 +244,7 @@ With argument, actually select the window showing the cross reference." reftex-mouse-view-crossref))) ;; Quick precheck if this might be a relevant spot ;; `reftex-view-crossref' will do a more thorough check. - (save-excursion + (save-excursion (search-backward "\\" nil t) (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)")) @@ -262,12 +262,12 @@ With argument, actually select the window showing the cross reference." (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf)) (put 'reftex-auto-view-crossref 'last-window-conf nil) (remove-hook 'pre-command-hook 'reftex-restore-window-conf)) - + (defun reftex-echo-ref (label entry docstruct) ;; Display crossref info in echo area. (cond ((null docstruct) - (message "%s" + (message "%s" (substitute-command-keys (format reftex-no-info-message "ref")))) ((null entry) (message "ref: unknown label: %s" label)) @@ -293,14 +293,14 @@ With argument, actually select the window showing the cross reference." (unless reftex-revisit-to-echo (setq files (reftex-visited-files files))) - (setq entry + (setq entry (condition-case nil (save-excursion (reftex-pop-to-bibtex-entry key files nil nil item t)) (error (if (and files (= (length all-files) (length files))) (message "cite: no such database entry: %s" key) - (message "%s" (substitute-command-keys + (message "%s" (substitute-command-keys (format reftex-no-info-message "cite")))) nil))) (when entry @@ -337,7 +337,7 @@ will display info in the echo area." (if (featurep 'xemacs) (if reftex-use-itimer-in-xemacs (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time reftex-idle-time t) (add-hook 'post-command-hook 'reftex-start-itimer-once) t) @@ -352,7 +352,7 @@ will display info in the echo area." (not (itimer-live-p reftex-auto-view-crossref-timer)) (setq reftex-auto-view-crossref-timer (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time nil t)))) (declare-function bibtex-beginning-of-entry "bibtex" ()) @@ -364,7 +364,7 @@ prompts upon first use for a buffer in RefTeX mode. To reset this link to a document, call the function with with a prefix arg. Calling this function several times find successive citation locations." (interactive "P") - (when arg + (when arg ;; Break connection to reference buffer (put 'reftex-bibtex-view-cite-locations :ref-buffer nil)) (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer))) @@ -372,10 +372,10 @@ Calling this function several times find successive citation locations." (unless ref-buffer (setq ref-buffer (save-current-buffer - (completing-read + (completing-read "Reference buffer: " (delq nil - (mapcar + (mapcar (lambda (b) (set-buffer b) (if reftex-mode (list (buffer-name b)) nil)) diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index b7978fb37b6..bf46635c479 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -230,7 +230,7 @@ one with the `xr' package." ;; Save all document buffers before this operation (reftex-save-all-document-buffers) - ;; First test to check for erros + ;; First test to check for errors. (setq n (reftex-translate files search-re translate-alist error-fmt 'test)) diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index dbed09c9ccb..d8b5384c6df 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -470,7 +470,7 @@ Label context is only displayed when the labels are there as well." (defun reftex-toc-max-level (arg) "Set the maximum level of toc lines in this buffer to value of prefix ARG. When no prefix is given, set the max level to a large number, so that all -levels are shown. For eaxample, to set the level to 3, type `3 m'." +levels are shown. For example, to set the level to 3, type `3 m'." (interactive "P") (setq reftex-toc-max-level (if arg (prefix-numeric-value arg) @@ -850,7 +850,7 @@ When finished, we exit with an error message." (defun reftex-toc-rename-label () "Rename the currently selected label in the *TOC* buffer. This launches a global search and replace in order to rename a label. -Renaming a label is hardly ever necessary - the only exeption is after +Renaming a label is hardly ever necessary - the only exception is after promotion/demotion in connection with a package like fancyref, where the label prefix determines the wording of a reference." (interactive) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index c4dbd365c43..b73056a803b 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -42,7 +42,7 @@ ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package ;; available from the XEmacs distribution sites. ;; - If you have downloaded this file from the maintainers webpage, follow -;; the instructions in the INSTALL file of the distrubution. +;; the instructions in the INSTALL file of the distribution. ;; ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. ;; diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 1194742a24c..094885bb0d0 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -620,7 +620,7 @@ if large. You can use `Info-split' to do this manually." "var{\\|" "w{\\|" "xref{\\|" - "@-\\|" ; @- is a descretionary hyphen (not an accent) (a noop). + "@-\\|" ; @- is a discretionary hyphen (not an accent) (a noop). texinfo-accent-commands "\\)" ) diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index bb937a44423..8a7bb76160b 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -173,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by (if attributes (setq attributes (mapcar 'url-unhex-string (split-string attributes ",")))) - ;; Parse out the exentions + ;; Parse out the extensions. (if extensions (setq extensions (mapcar (lambda (ext) (if (string-match "\\([^=]*\\)=\\(.*\\)" ext) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 42d33553e14..cfb98c6937e 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -335,7 +335,7 @@ Currently supported methods: `socks': Connect through a socks server; `tls': Connect with TLS; `ssl': Connect with SSL (deprecated, use `tls' instead); -`native': Connect directy." +`native': Connect directly." :type '(radio (const :tag "Telnet to gateway host" :value telnet) (const :tag "Rlogin to gateway host" :value rlogin) (const :tag "Use SOCKS proxy" :value socks) diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 46b95130ca0..f6340392dc2 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -502,7 +502,7 @@ It is expected to call the function.") (if (or (null cvs-version) (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) ;; Supposedly some recent versions of CVS output some directory info - ;; as they recurse downthe tree, but it's not good enough in the case + ;; as they recurse down the tree, but it's not good enough in the case ;; where we run "cvs status foo bar/foo". '("status") t) diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 311841d37a0..4915cb9bf7f 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -307,7 +307,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just See `cvs-prefix-set' for further description of the behavior.")) (defvar ,cps (let ((defaults ,defaults)) - ;; sanity ensurance + ;; sanity insurance (unless (>= (length defaults) cvs-prefix-number) (setq defaults (append defaults (make-list (1- cvs-prefix-number) diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 5595dc0b03f..256719d4c84 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -620,7 +620,7 @@ If non-nil, NEW means to create a new buffer no matter what." (str (car hf)) (done "") (tin (ewoc-nth cvs-cookies 0))) - ;; look for the first *real* fileinfo (to determine emptyness) + ;; look for the first *real* fileinfo (to determine emptiness) (while (and tin (memq (cvs-fileinfo->type (ewoc-data tin)) diff --git a/lisp/window.el b/lisp/window.el index 6de37c1d16e..4550526b44d 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3432,7 +3432,7 @@ is non-nil." "Balance the sizes of windows of WINDOW-OR-FRAME. WINDOW-OR-FRAME is optional and defaults to the selected frame. If WINDOW-OR-FRAME denotes a frame, balance the sizes of all -windows of that frame. If WINDOW-OR-FRAME denots a window, +windows of that frame. If WINDOW-OR-FRAME denotes a window, recursively balance the sizes of all child windows of that window." (interactive) diff --git a/lisp/woman.el b/lisp/woman.el index 4999a08bb72..a16bfa39c86 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2023,7 +2023,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated." ;; Both advices are disabled because "a file in Emacs should not put ;; advice on a function in Emacs" (see Info node "(elisp)Advising ;; Functions"). Counting the formatting time is useful for -;; developping, but less applicable for daily use. The advice for +;; developing, but less applicable for daily use. The advice for ;; `Man-getpage-in-background' can be discarded, because the ;; key-binding in `woman-mode-map' has been remapped to call `woman' ;; but `man'. Michael Albinus diff --git a/src/ccl.c b/src/ccl.c index 83192d9d737..6366f1acb88 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -484,7 +484,7 @@ static Lisp_Object Vccl_program_table; If the element is t or lambda, finish without changing reg[rrr]. If the element is a number, set reg[rrr] to the number and finish. - Detail of the map structure is descibed in the comment for + Detail of the map structure is described in the comment for CCL_MapMultiple below. */ #define CCL_IterateMultipleMap 0x10 /* Iterate multiple maps @@ -1808,7 +1808,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size /* Resolve symbols in the specified CCL code (Lisp vector). This function converts symbols of code conversion maps and character - translation tables embeded in the CCL code into their ID numbers. + translation tables embedded in the CCL code into their ID numbers. The return value is a vector (CCL itself or a new vector in which all symbols are resolved), Qt if resolving of some symbol failed, diff --git a/src/chartab.c b/src/chartab.c index 7e8161461f3..724b3076a11 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1196,7 +1196,7 @@ uniprop_table_uncompress (Lisp_Object table, int idx) } -/* Decode VALUE as an elemnet of char-table TABLE. */ +/* Decode VALUE as an element of char-table TABLE. */ static Lisp_Object uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value) diff --git a/src/dired.c b/src/dired.c index fac3a34ab9b..acc81a6ed9d 100644 --- a/src/dired.c +++ b/src/dired.c @@ -628,7 +628,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v if (includeall && !canexclude) { /* If we have one non-excludable file, we want to exclude the - excudable files. */ + excludable files. */ includeall = 0; /* Throw away any previous excludable match found. */ bestmatch = Qnil; diff --git a/src/doprnt.c b/src/doprnt.c index b4d13c59137..35af2297ff4 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -26,7 +26,7 @@ along with GNU Emacs. If not, see . */ of the (`int') argument, suitable for display in an Emacs buffer. . For %s and %c, when field width is specified (e.g., %25s), it accounts for - the diplay width of each character, according to char-width-table. That + the display width of each character, according to char-width-table. That is, it does not assume that each character takes one column on display. . If the size of the buffer is not enough to produce the formatted string in diff --git a/src/frame.c b/src/frame.c index ab60fd5b808..c14f4db91da 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2487,7 +2487,7 @@ If FRAME is omitted, the selected frame is used. The exact value of the result depends on the window-system and toolkit in use: In the Gtk+ version of Emacs, it includes only any window (including -the minibuffer or eacho area), mode line, and header line. It does not +the minibuffer or echo area), mode line, and header line. It does not include the tool bar or menu bar. With the Motif or Lucid toolkits, it also includes the tool bar (but diff --git a/src/gtkutil.c b/src/gtkutil.c index 04104064096..0b7fd41f5f6 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1423,7 +1423,7 @@ get_dialog_title (char key) /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down the dialog, but return TRUE so the event does not propagate further in GTK. This prevents GTK from destroying the dialog widget automatically - and we can always destrou the widget manually, regardles of how + and we can always destroy the widget manually, regardless of how it was popped down (button press or WM_DELETE_WINDOW). W is the dialog widget. EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). @@ -2294,7 +2294,7 @@ tearoff_activate (GtkWidget *widget, gpointer client_data) /* Create a menu item widget, and connect the callbacks. - ITEM decribes the menu item. + ITEM describes the menu item. F is the frame the created menu belongs to. SELECT_CB is the callback to use when a menu item is selected. HIGHLIGHT_CB is the callback to call when entering/leaving menu items. diff --git a/src/keyboard.c b/src/keyboard.c index 87dd2b0e251..5d1784ad0b0 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -932,7 +932,7 @@ pop_kboard (void) state later. If Emacs is already in single_kboard mode, and F's keyboard is - locked, then this function will throw an errow. */ + locked, then this function will throw an error. */ void temporarily_switch_to_single_kboard (struct frame *f) @@ -5393,7 +5393,7 @@ make_lispy_event (struct input_event *event) || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) { /* We need to use an alist rather than a vector as the cache - since we can't make a vector long enuf. */ + since we can't make a vector long enough. */ if (NILP (KVAR (current_kboard, system_key_syms))) KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); return modify_event_symbol (event->code, diff --git a/src/w32fns.c b/src/w32fns.c index b4166cbf691..4a6da46141c 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6709,7 +6709,7 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name, ClosePrinter (hPrn); return Qnil; } - /* Call GetPrinter again with big enouth memory block */ + /* Call GetPrinter again with big enough memory block. */ err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned); ClosePrinter (hPrn); if (!err) diff --git a/src/w32font.c b/src/w32font.c index ac1d678edee..bd58e7e757b 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -330,7 +330,7 @@ w32font_list (Lisp_Object frame, Lisp_Object font_spec) /* w32 implementation of match for font backend. Return a font entity most closely matching with FONT_SPEC on - FRAME. The closeness is detemined by the font backend, thus + FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. */ static Lisp_Object w32font_match (Lisp_Object frame, Lisp_Object font_spec) diff --git a/src/w32proc.c b/src/w32proc.c index 65d63597fae..c2020b40241 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -2296,7 +2296,7 @@ filesystems via ange-ftp. */); doc: /* Non-nil means attempt to fake realistic inode values. This works by hashing the truename of files, and should detect aliasing between long and short (8.3 DOS) names, but can have -false positives because of hash collisions. Note that determing +false positives because of hash collisions. Note that determining the truename of a file can be slow. */); Vw32_generate_fake_inodes = Qnil; #endif diff --git a/src/xterm.c b/src/xterm.c index fb77faa75fe..0da78ae1bb1 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6120,7 +6120,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, { /* Gnome shell does not iconify us when C-z is pressed. It hides the frame. So if our state says we aren't hidden anymore, - treat is as deiconfied. */ + treat it as deiconified. */ if (! f->async_iconified) SET_FRAME_GARBAGED (f); f->async_visible = 1; diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 493b4344c17..9db2d51efe7 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp @@ -50,7 +50,7 @@ namespace fcn_poly { } -// Test 3 - Methods w/ differet arg lists. +// Test 3 - Methods w/ different arg lists. class meth_poly { public: int pm_meth(void) { @@ -128,4 +128,3 @@ namespace template_multiple_spec { // End of polymorphism test file. - -- cgit v1.2.3