From c5e87d104b7342f35459c7513d6b4cefea1e968e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 17 Nov 2011 09:40:48 -0800 Subject: [PATCH] Spelling fixes. --- doc/emacs/ChangeLog | 3 ++- doc/emacs/msdog.texi | 2 +- doc/lispref/spellfile | 1 - doc/misc/ada-mode.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/faq.texi | 4 ++-- doc/misc/newsticker.texi | 16 +++++++--------- etc/NEWS.1-17 | 2 +- lib-src/ChangeLog | 2 +- lisp/ChangeLog.12 | 2 +- lisp/ChangeLog.13 | 4 ++-- lisp/ChangeLog.14 | 2 +- lisp/ChangeLog.15 | 2 +- lisp/ChangeLog.7 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/allout-widgets.el | 2 +- lisp/allout.el | 2 +- lisp/arc-mode.el | 4 ++-- lisp/calendar/timeclock.el | 6 +++--- lisp/cedet/semantic/complete.el | 2 +- lisp/cedet/semantic/ia-sb.el | 2 +- lisp/cedet/semantic/ia.el | 2 +- lisp/desktop.el | 2 +- lisp/follow.el | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gnus/gnus-agent.el | 2 +- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/sieve.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/language/vietnamese.el | 2 +- lisp/ldefs-boot.el | 4 ++-- lisp/mail/rmail-spam-filter.el | 2 +- lisp/mh-e/ChangeLog.1 | 12 ++++++------ lisp/net/mairix.el | 3 +-- lisp/net/newst-plainview.el | 4 ++-- lisp/net/newsticker.el | 2 +- lisp/obsolete/s-region.el | 2 +- lisp/org/ChangeLog | 4 ++-- lisp/org/org-beamer.el | 2 +- lisp/org/org-bibtex.el | 2 +- lisp/org/org-list.el | 2 +- lisp/org/org-remember.el | 2 +- lisp/org/org.el | 2 +- lisp/play/bruce.el | 2 +- lisp/play/fortune.el | 2 +- lisp/play/solitaire.el | 2 +- lisp/progmodes/f90.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/idlw-help.el | 2 +- lisp/progmodes/make-mode.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/sh-script.el | 2 +- lisp/term.el | 2 +- lisp/textmodes/rst.el | 2 +- lisp/url/url-future.el | 2 +- nt/gmake.defs | 3 +-- oldXMenu/ChangeLog | 2 +- src/ChangeLog.10 | 4 ++-- src/ChangeLog.6 | 2 +- src/dispnew.c | 2 +- src/font.c | 2 +- src/keymap.c | 2 +- src/process.c | 2 +- src/w32proc.c | 2 +- src/w32term.h | 2 +- 66 files changed, 86 insertions(+), 90 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9d78b7f948a..b796acd8b39 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1239,7 +1239,8 @@ 2010-03-27 Nick Roberts - doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. + doc/emacs/building.texi: Describe restored GDB/MI functionality + removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. doc/emacs/emacs.texi: Update node names for building.texi. 2010-03-24 Glenn Morris diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 0e72c4737bd..bbaf31ade85 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -322,7 +322,7 @@ default value is @code{(links uid gid)} i.e.@: all the 3 optional attributes are displayed. @vindex ls-lisp-emulation - The variable @code{ls-lisp-emulation} controls the flavour of the + The variable @code{ls-lisp-emulation} controls the flavor of the @code{ls} emulation by setting the defaults for the 3 options described above: @code{ls-lisp-ignore-case}, @code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}. The value of diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index f8e136f6bd9..e66dcc88f71 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile @@ -331,7 +331,6 @@ for' formfeed forms' forw -forwa found' frob from' diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 49f455b4e41..374158c2c78 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be included, separated from the word by a space. If the word starts with an asterisk (@key{*}), it defines the casing -af a word fragemnt (or ``substring''); part of a word between two +af a word fragment (or ``substring''); part of a word between two underscores or word boundary. For example: diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index a4d377ebdce..55c2c4c0ae8 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -1173,7 +1173,7 @@ Full details on how these minor modes work are at @ref{Electric Keys}, and @ref{Indentation Engine Basics}. You can toggle each of these minor modes on and off, and you can -configure @ccmode{} so that it starts up with your favourite +configure @ccmode{} so that it starts up with your favorite combination of them (@pxref{Sample .emacs File}). By default, when you initialize a buffer, electric mode and syntactic-indentation mode are enabled but the other two modes are disabled. diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 7528abca58d..262c3d734fe 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point. @ifnottex @insertcopying -@end ifnottex +@end ifnottex @menu * FAQ notation:: @@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope. There has never been a copyright infringement case involving the GPL to set any precedents. Although legal actions have been brought against companies for violating the terms of the GPL, so far all have been -settled out of court (in favour of the plaintiffs). Please take any +settled out of court (in favor of the plaintiffs). Please take any discussion regarding this issue to the newsgroup @uref{news:gnu.misc.discuss}, which was created to hold the extensive flame wars on the subject. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index c7d82245973..18e11aeeeb3 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -52,7 +52,7 @@ developing GNU and promoting software freedom.'' @node Top @top Newsticker -@insertcopying +@insertcopying @end ifnottex @@ -112,9 +112,9 @@ enclosed files (as delivered by podcasts, e.g.). Here are screen shots of the @uref{newsticker-1.7.png, version 1.7 (current version)} and some older screen shots: @uref{newsticker-1.6.png, version 1.6}, -@uref{newsticker-1.5.png, version 1.5}, +@uref{newsticker-1.5.png, version 1.5}, @uref{newsticker-1.4.png, version 1.4} -@uref{newsticker-1.3.png, version 1.3}, +@uref{newsticker-1.3.png, version 1.3}, @uref{newsticker-1.0.png, version 1.0}. @end ifhtml @@ -163,7 +163,7 @@ You can choose between two different frontends for reading headlines: @item Newsticker's @emph{treeview} uses separate windows for the feeds (in tree form), a list of headlines for the current feed, and the content of the current headline. Feeds can be placed into groups -which itself can be placed in groups and so on. +which itself can be placed in groups and so on. @item Newsticker's @emph{plainview} displays all headlines in a single buffer, called @samp{*newsticker*}. The modeline in the @samp{*newsticker*} buffer informs whenever new headlines have @@ -171,7 +171,7 @@ arrived. @end itemize In both views clicking mouse-button 2 or pressing RET on a headline will call @code{browse-url} to load the corresponding news story in -your favourite web browser. +your favorite web browser. @findex newsticker-start-ticker @findex newsticker-stop-ticker @@ -205,7 +205,7 @@ and some of the most important options. @item @code{newsticker-retrieval} contains options that define which news -feeds are retrieved and how this is done. +feeds are retrieved and how this is done. @itemize @item @@ -241,7 +241,7 @@ automatically mark headlines as immortal or old. @item @code{newsticker-hooks} contains options for hooking other Emacs -commands to newsticker functions. +commands to newsticker functions. @itemize @item @vindex newsticker-new-item-functions @@ -313,5 +313,3 @@ Byte-compiling newsticker.el is recommended. @printindex cp @bye - - diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 5fbc872d3e9..b1da9122934 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -996,7 +996,7 @@ with no confirmation. view-buffer selects the named buffer, view-file finds the named file; the resulting buffer is placed into view-mode (a recursive edit). The normal emacs commands are not available. Instead a set of special commands is -provided which faclitate moving around in the buffer, searching and +provided which facilitate moving around in the buffer, searching and scrolling by screenfuls. Exiting view-mode returns to the buffer in which the view-file or view-buffer command was given. Type ? or h when viewing for a complete list of view commands. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c763d7dce39..d043f41962e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -3642,7 +3642,7 @@ (lang_names): Add a NULL member for every entry, added an entry for makefiles. (Makefile_targets): New function. - (Texinfo_nodes): Rename from Texinfo_fuctions and made + (Texinfo_nodes): Rename from Texinfo_functions and made it conformant to the style of the rest of the code. 2001-01-13 Gerd Moellmann diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 4baec98725c..e916db64f05 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -9419,7 +9419,7 @@ (org-insert-labeled-timestamps-at-point): New option. (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead of `hide-sublevels 1', in case the first headline is not level 1. - (org-overview, org-content): New fuction. + (org-overview, org-content): New function. (org-cycle-global-status, org-cycle-subtree-status): Make these variables buffer-local. (org-global-cycle): New command. diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 14f07e7e00b..319cdb14b9b 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -10127,7 +10127,7 @@ 2007-10-08 Richard Stallman * wid-edit.el (widget-specify-button): Don't merge mouse-face with - neighbouring buttons. + neighboring buttons. 2007-10-08 Andreas Schwab @@ -10151,7 +10151,7 @@ 2007-10-08 Stefan Monnier * wid-edit.el (widget-image-insert): Don't merge mouse-face with - neighbouring buttons. + neighboring buttons. * progmodes/compile.el (compilation-error-regexp-alist-alist): Recognize gcc's use of "note" for informational messages. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index cfaa1763224..cd91dfad28c 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -17799,7 +17799,7 @@ (org-local-logging): New function. (org-columns-open-link): Fix bug with opening link in column view. (org-local-logging): New function. - (org-todo): Make sure that LOGGING properties are honoured. + (org-todo): Make sure that LOGGING properties are honored. (org-todo-keywords): Improve docstring. (org-startup-options): Cleanup startup options. (org-set-regexps-and-options): Process the "!" markers. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 9b4dddc076d..ddd8ad7e7ff 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -12221,7 +12221,7 @@ 2010-03-27 Nick Roberts - Restore GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. + Restore GDB/MI functionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. * progmodes/gdb-mi.el: Restore. * progmodes/gdb-ui.el: Remove. * progmodes/gud.el: Re-accommodate for gdb-mi.el. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 777252ff25c..cb606cd0847 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -6526,7 +6526,7 @@ * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words are used for key generation as well. - (bibtex-member-of-regexp): Case is honoured for matches now. + (bibtex-member-of-regexp): Case is honored for matches now. (bibtex-autokey-titleword-ignore): Added entries provide compatibility to former behavior. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index b15ee6078b0..4f867c24561 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -10569,7 +10569,7 @@ 2000-10-10 Dave Love * toolbar/tool-bar.el (tool-bar-add-item) - (tool-bar-add-item-from-menu): Don't favour XPM icons on mono display. + (tool-bar-add-item-from-menu): Don't favor XPM icons on mono display. * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm: * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm: diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index b2121de260d..3c2871594fc 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -810,7 +810,7 @@ Optional RECURSING is for internal use, to limit recursion." (forward-char -1))))))) (error - ;; zero work list so we don't get stuck futily retrying. + ;; zero work list so we don't get stuck futilely retrying. ;; error recording done by allout-widgets-hook-error-handler. (setq allout-widgets-changes-record nil)))) ;;;_ , major change handlers: diff --git a/lisp/allout.el b/lisp/allout.el index d3d4cf835ad..8cbdbee7303 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -3557,7 +3557,7 @@ number is used as the index for the numbered prefix (allowing, eg, sequential renumbering to not require this function counting back the index for each successive sibling)." ;;;_ . Code: - ;; The options are ordered in likely frequence of use, most common + ;; The options are ordered in likely frequency of use, most common ;; highest, least lowest. Ie, more likely to be doing prefix ;; adjustments than soliciting, and yet more than numbering. ;; Current prefix is least dominant, but most likely to be commonly diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 4e45383eaec..48b4c5be164 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder ;; Keywords: files archives msdog editing major-mode -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; This file is part of GNU Emacs. @@ -75,7 +75,7 @@ ;; ;; LZH A series of (header,file). Headers are checksummed. No ;; interaction among members. -;; Headers come in three flavours called level 0, 1 and 2 headers. +;; Headers come in three flavors called level 0, 1 and 2 headers. ;; Level 2 header is free of DOS specific restrictions and most ;; prevalently used. Also level 1 and 2 headers consist of base ;; and extension headers. For more details see diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 1ec474e828e..c9b8fdac613 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -407,7 +407,7 @@ discover the reason." (if arg (run-hooks 'timeclock-done-hook)))) -;; Should today-only be removed in favour of timeclock-relative? - gm +;; Should today-only be removed in favor of timeclock-relative? - gm (defsubst timeclock-workday-remaining (&optional today-only) "Return the number of seconds until the workday is complete. The amount returned is relative to the value of `timeclock-workday'. @@ -547,7 +547,7 @@ non-nil, the amount returned will be relative to past time worked." (defalias 'timeclock-seconds-to-time 'seconds-to-time) -;; Should today-only be removed in favour of timeclock-relative? - gm +;; Should today-only be removed in favor of timeclock-relative? - gm (defsubst timeclock-when-to-leave (&optional today-only) "Return a time value representing the end of today's workday. If TODAY-ONLY is non-nil, the value returned will be relative only to @@ -569,7 +569,7 @@ This string is relative to the value of `timeclock-workday'. If SHOW-SECONDS is non-nil, the value printed/returned will include seconds. If TODAY-ONLY is non-nil, the value returned will be relative only to the time worked today, and not to past time." - ;; Should today-only be removed in favour of timeclock-relative? - gm + ;; Should today-only be removed in favor of timeclock-relative? - gm (interactive) (let* ((then (timeclock-when-to-leave today-only)) (string diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 6709236c541..41a569564d0 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -54,7 +54,7 @@ ;; ;; Here, we will treat each section separately (excluding D) ;; They can then be strung together in user-visible commands to -;; fulfil specific needs. +;; fulfill specific needs. ;; ;; COLLECTORS: ;; diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index 57067936a90..95a68673b8c 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el @@ -36,7 +36,7 @@ nil (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap)) - ;; Basic featuers. + ;; Basic features. (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line) (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info) ) diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 50de8e4f57f..2aae39d4b21 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el @@ -119,7 +119,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ;; completions. ;; ;; This is a way of making this fcn more useful since - ;; the smart completion engine sometimes failes. + ;; the smart completion engine sometimes fails. (semantic-complete-symbol)) ;; Use try completion to seek a common substring. (let ((tc (try-completion (or pre "") syms))) diff --git a/lisp/desktop.el b/lisp/desktop.el index f4991c5bcc6..8a61bec0eea 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder ;; Keywords: convenience -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; This file is part of GNU Emacs. diff --git a/lisp/follow.el b/lisp/follow.el index aa40c27a7a9..92efc8d8cfa 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -652,7 +652,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is selected if the original window is the first one in the frame. To bind this command to a hotkey, place the following line -in your `~/.emacs' file, replacing [f7] by your favourite key: +in your `~/.emacs' file, replacing [f7] by your favorite key: (global-set-key [f7] 'follow-delete-other-windows-and-split)" (interactive "P") (let ((other (or (and (null arg) diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 779c84296f4..e52f898b184 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -5562,7 +5562,7 @@ 2003-01-14 Kevin Greiner * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the - fictious headers generated by nnagent (ie. Undownloaded Article + fictitious headers generated by nnagent (ie. Undownloaded Article ####) in the list of articles that have not been downloaded. * gnus-int.el (): Added require declarations to resolve diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 32e40f68fc2..71f8cf82d39 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1130,7 +1130,7 @@ article's mark is toggled." (setq alist (cdr alist))) ((> a h) ;; Headers that are not in the alist should be - ;; fictious (see nnagent-retrieve-headers); they + ;; fictitious (see nnagent-retrieve-headers); they ;; imply that this article isn't in the agent. (gnus-agent-append-to-list tail-undownloaded h) (gnus-agent-append-to-list tail-unfetched h) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 4c0f6069373..dd41947a2af 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -535,7 +535,7 @@ that the symbol of the saver function, which is specified by ;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before. (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail - "A function to save articles in your favourite format. + "A function to save articles in your favorite format. The function will be called by way of the `gnus-summary-save-article' command, and friends such as `gnus-summary-save-article-rmail'. diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 2111d34eac5..a44a03b6913 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -21,7 +21,7 @@ ;;; Commentary: -;; This file contain utilities to facilate upload, download and +;; This file contain utilities to facilitate upload, download and ;; general management of sieve scripts. Currently only the ;; Managesieve protocol is supported (using sieve-manage.el), but when ;; (useful) alternatives become available, they might be supported as diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 56859269e02..cd9f1fa6b43 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -360,7 +360,7 @@ commands in `hfy-etags-cmd-alist'." :type '(repeat symbol)) (defun hfy-which-etags () - "Return a string indicating which flavour of etags we are using." + "Return a string indicating which flavor of etags we are using." (let ((v (shell-command-to-string (concat hfy-etags-bin " --version")))) (cond ((string-match "exube" v) "exuberant ctags") ((string-match "GNU E" v) "emacs etags" )) )) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 83386f2e852..008eb92dbbc 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -371,7 +371,7 @@ consonant. It is a list vowel characters or 0. The element 0 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 +following a consonant and preceding a maa-sakod character. If it is nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always appended at the tail. diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index e723e154dc1..4034566afca 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -84,7 +84,7 @@ (documentation . "\ For Vietnamese, Emacs uses special charsets internally. They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR -and windows-1258. VSCII is deprecated in favour of TCVN-5712. The +and windows-1258. VSCII is deprecated in favor of TCVN-5712. The Current setting gives higher priority to the coding system VISCII than TCVN-5712. If you prefer TCVN-5712, please do: (prefer-coding-system 'vietnamese-tcvn). There are two Vietnamese input methods: VIQR and diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 744560a8223..7f595db4814 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -11099,7 +11099,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is selected if the original window is the first one in the frame. To bind this command to a hotkey, place the following line -in your `~/.emacs' file, replacing [f7] by your favourite key: +in your `~/.emacs' file, replacing [f7] by your favorite key: (global-set-key [f7] 'follow-delete-other-windows-and-split) \(fn &optional ARG)" t nil) @@ -26109,7 +26109,7 @@ That's all. Here's the board after two moves: o o o -Pick your favourite shortcuts: +Pick your favorite shortcuts: \\{solitaire-mode-map} diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 2bc0248506a..14a76746797 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -554,4 +554,4 @@ checks to see if the old format is used, and updates it if necessary." (provide 'rmail-spam-filter) -;;; rmail-spam-fitler ends here +;;; rmail-spam-filter ends here diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 5a3f57720f4..b12c47e7f1f 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -691,7 +691,7 @@ variable `mh-scan-date-regexp'. * mh-customize.el (mh-auto-fields-prompt-flag): Made reference to - `mh-auto-fileds-lists'. + `mh-auto-fields-lists'. (mh-forward-hook): Fixed docstring typo. 2004-08-07 Bill Wohler @@ -832,7 +832,7 @@ and byte-compiles all the source files with a single instance of XEmacs. (dist): Added $(MH-E-XEMACS-SRC) to tarball. - (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and + (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and 'AUTOLOAD_FILE'. (AUTOLOAD_PACKAGE_NAME): New. (AUTOLOAD_FILE): New. @@ -1257,7 +1257,7 @@ * Makefile (XEMACS_OPTIONS): Add '-no-autoloads' to give a cleaner build environment. - (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and + (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and 'AUTOLOAD_FILE'. (AUTOLOAD_PACKAGE_NAME): New. (AUTOLOAD_FILE): New. @@ -1469,7 +1469,7 @@ * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Add an optional dontsign argument to remove an existing secure message directive. - Update the docstring -- this fuction does not allow for + Update the docstring -- this function does not allow for encrypt/sign, just sign directives. * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Use @@ -5130,7 +5130,7 @@ * mh-utils.el (mh-face-display-function): Fix bug that was corrupting xface images when displayed with XEmacs' internal - xface image support. Also make XEmacs honour 'mh-show-xface-face' + xface image support. Also make XEmacs honor 'mh-show-xface-face' when using internal xface image support. 2003-02-12 Peter S Galbraith @@ -8048,7 +8048,7 @@ 2002-10-26 Peter S Galbraith * mh-comp.el (mh-search-addr-regexp, mh-re-search-to-cc): Remove - `mh-re-search-to-cc' in favour of more generalized new function + `mh-re-search-to-cc' in favor of more generalized new function `mh-search-addr-regexp'. (mh-insert-mail-followup-to): Use it. diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index 8c4bbb4a785..68a0a6a85d4 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el @@ -51,7 +51,7 @@ ;; Currently, RMail, Gnus (with mbox files), and VM are supported as ;; mail programs, but it is pretty easy to interface it with other ;; ones as well. Please see the docs and the source for details. -;; In a nutshell: include your favourite mail program in +;; In a nutshell: include your favorite mail program in ;; `mairix-mail-program' and write functions for ;; `mairix-display-functions' and `mairix-get-mail-header-functions'. ;; If you have written such functions for your Emacs mail program of @@ -945,4 +945,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n") (provide 'mairix) ;;; mairix.el ends here - diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 906044079cd..16b36df07f8 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -783,11 +783,11 @@ Return new buffer position." (newsticker--buffer-set-uptodate nil) (newsticker--ticker-text-setup) (newsticker-buffer-update) - ;; go back to where we came frome + ;; Go back to where we came from. (goto-char pos) (end-of-line) (newsticker--buffer-goto '(feed) nil t)))) - + (defun newsticker-mark-all-items-at-point-as-read () "Mark all items as read and clear ticker contents." (interactive) diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index 3a2cf3f04f7..0a1e07e63f1 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -106,7 +106,7 @@ ;; asynchronous download of headlines. The modeline in the `*newsticker*' ;; buffer informs whenever new headlines have arrived. Clicking ;; mouse-button 2 or pressing RET in this buffer on a headline will call -;; browse-url to load the corresponding news story in your favourite web +;; browse-url to load the corresponding news story in your favorite web ;; browser. ;; The scrolling, or flashing of headlines in the echo area, can be started diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el index b06861c0efc..8fb6703aa25 100644 --- a/lisp/obsolete/s-region.el +++ b/lisp/obsolete/s-region.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder ;; Keywords: terminals -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; Obsolete-since: 24.1 ;; This file is part of GNU Emacs. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index bcc708ae6e3..b946d147e5b 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -8074,7 +8074,7 @@ 2010-11-11 Nicolas Goaziou * org-list.el (org-insert-item-internal): Guessing of blank lines - number is made by looking at neighbours items, if any. + number is made by looking at neighboring items, if any. 2010-11-11 Nicolas Goaziou @@ -15571,7 +15571,7 @@ * org.el (org-agenda-tags-todo-honor-ignore-options): Declare variable. - * org-table.el (org-table-insert-hline): Fix typo in fuction call + * org-table.el (org-table-insert-hline): Fix typo in function call to `backward-char'. * org-exp.el (org-export-as-html): Remove the initial space from diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 9f40c5bd9d5..d5f9beea337 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el @@ -411,7 +411,7 @@ the value will be inserted right after the documentclass statement." ;; Functions to initialize and post-process -;; These fuctions will be hooked into various places in the export process +;; These functions will be hooked into various places in the export process (defun org-beamer-initialize-open-trackers () "Reset variables that track if certain environments are open during export." diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index bd2b168f2bc..138d99a36d9 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -221,7 +221,7 @@ (defcustom org-bibtex-prefix nil "Optional prefix for all bibtex property names. -For example setting to 'BIB_' would allow interoperability with fireforg." +For example setting to 'BIB_' would allow interoperability with Fireforg." :group 'org-bibtex :type 'string) diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 1a14c71d510..9184f0c3d54 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -1177,7 +1177,7 @@ some heuristics to guess the result." ;; When `org-blank-before-new-entry' says so, it is 1. ((eq insert-blank-p t) 1) ;; `plain-list-item' is 'auto. Count blank lines separating - ;; neighbours items in list. + ;; neighboring items in list. (t (let ((next-p (org-list-get-next-item item struct prevs))) (cond ;; Is there a next item? diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index e15debfd90c..8819f416f1d 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -63,7 +63,7 @@ and `org-remember-default-headline'. To force prompting anyway, use \\[universal-argument] \\[org-remember-finalize] to file the note. When this variable is nil, \\[org-remember-finalize] gives you the prompts, and -\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." +\\[universal-argument] \\[org-remember-finalize] triggers the fast track." :group 'org-remember :type 'boolean) diff --git a/lisp/org/org.el b/lisp/org/org.el index f88ed3c7ebc..25bfb8a78e8 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1480,7 +1480,7 @@ When nil, the link search tries to match a phrase with all words in the search text." :group 'org-link-follow :type '(choice - (const :tag "Use fuzy text search" nil) + (const :tag "Use fuzzy text search" nil) (const :tag "Match only exact headline" t) (const :tag "Match exact headline or query to create it" query-to-create))) diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el index 168d528ecb1..a41d5a3d3d1 100644 --- a/lisp/play/bruce.el +++ b/lisp/play/bruce.el @@ -110,7 +110,7 @@ :group 'games) (defcustom bruce-phrases-file "~/bruce.lines" - "Keep your favourite phrases here." + "Keep your favorite phrases here." :type 'file :group 'bruce) diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index 55b0a564fef..a46c2ba8171 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -52,7 +52,7 @@ ;; (lambda () ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) ;; which allows marking a region and then pressing "i" so that the marked -;; region will be automatically added to my favourite fortune-file. +;; region will be automatically added to my favorite fortune-file. ;;; Code: diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 722c3b43033..b52ade6fdb7 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -190,7 +190,7 @@ That's all. Here's the board after two moves: o o o -Pick your favourite shortcuts: +Pick your favorite shortcuts: \\{solitaire-mode-map}" diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 007203a8b21..ce04d8b390e 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1837,7 +1837,7 @@ after indenting." (and (< (point) pos) (goto-char pos)) (if auto-fill-function - ;; GM NO-UPDATE not honoured, since this calls f90-update-line. + ;; GM NO-UPDATE not honored, since this calls f90-update-line. (f90-do-auto-fill) (or no-update (f90-update-line))) (set-marker pos nil))) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 009400504b2..e98ca58f3e0 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -571,7 +571,7 @@ in the Fortran entry in `hs-special-modes-alist'.") ;; An alternative is to match on THEN at a line end, eg: ;; ".*)[ \t]*then[ \t]*\\($\\|!\\)" ;; This would also match ELSE branches, though. This does not seem - ;; right to me, because then one has neighbouring blocks that are + ;; right to me, because then one has neighboring blocks that are ;; not nested in each other. "\\(if[ \t]*(\\(.*\\|" ".*\n\\([^if]*\\([^i].\\|.[^f]\\|.\\>\\)\\)\\)\\ escape.file -;; # or by using your favourite editor +;; # or by using your favorite editor ;; ;; foreach temp (cd pushd) ;; alias $temp "$temp \!* ; echo 'AnSiTc' $cwd_hack" diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 6f9e7e1bdb0..81e92487eb0 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -1534,7 +1534,7 @@ is a regular expression for matching the lines with items." (defvar rst-preferred-bullets '(?- ?* ?+) - "List of favourite bullets to set for straightening bullets.") + "List of favorite bullets to set for straightening bullets.") (defun rst-straighten-bullets-region (beg end) "Make all the bulleted list items in the region consistent. diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index ac85a3cec47..8a2c112715c 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -36,7 +36,7 @@ ;; So, to get the value: ;; (when (url-future-completed-p future) (url-future-value future)) -;; See the ERT tests and the code for futher details. +;; See the ERT tests and the code for further details. ;;; Code: diff --git a/nt/gmake.defs b/nt/gmake.defs index 46d4acf76dd..a1ff7af853e 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -95,7 +95,7 @@ THISDIR = . ifdef USING_SH sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) sh_output := $(shell echo foo") -# This single quote " is to fix fintification due to previous line +# This single quote " is to fix fontification due to previous line ifeq "$(sh_output)" "" NEW_CYGWIN = 1 endif @@ -311,4 +311,3 @@ export XMFLAGS $(BLD)/%.o: %.c $(CC) $(CFLAGS) $(CC_OUT)$@ $< - diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index b40b5ca7084..5d04eea75d4 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -167,7 +167,7 @@ 2007-02-25 Glenn Morris * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: - * XMakeAssoc.c: Remove license text in favour of including + * XMakeAssoc.c: Remove license text in favor of including copyright.h, as was done in original X11 source. 2004-12-27 Jan Djärv diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index beb66847253..181b11b5a2b 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -20702,11 +20702,11 @@ (free_frame_menubar): Only compile if not USE_GTK. GTK version is in gtkutil.c. (popup_selection_callback): New version for USE_GTK. - (create_and_show_popup_menu): New fuction, one USE_GTK version and + (create_and_show_popup_menu): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xmenu_show): Call create_and_show_popup_menu. (dialog_selection_callback): New version for USE_GTK. - (create_and_show_dialog): New fuction, one USE_GTK version and + (create_and_show_dialog): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xdialog_show): Call create_and_show_dialog. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index f9372aa666a..141a570040c 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -1138,7 +1138,7 @@ ntproc.c and simplified to match other changes (all handles are already non-inheritable). - (get_emacs_configuration): Detect Windows flavour (Windows 95 or + (get_emacs_configuration): Detect Windows flavor (Windows 95 or NT) at run-time. Change OS name for Windows 95 to be "win95". (fd_info): New variable. Array of extra info for file descriptors diff --git a/src/dispnew.c b/src/dispnew.c index 7b594c5b4e8..6ba834ba339 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3491,7 +3491,7 @@ redraw_overlapping_rows (struct window *w, int yb) if (row->used[RIGHT_MARGIN_AREA]) rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); - /* Record in neighbour rows that ROW overwrites part of + /* Record in neighbor rows that ROW overwrites part of their display. */ if (overlaps & OVERLAPS_PRED) MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; diff --git a/src/font.c b/src/font.c index 3fc5fc944b4..9559c65e7ed 100644 --- a/src/font.c +++ b/src/font.c @@ -954,7 +954,7 @@ font_expand_wildcards (Lisp_Object *field, int n) } } - /* Decide all fileds from restrictions in RANGE. */ + /* Decide all fields from restrictions in RANGE. */ for (i = j = 0; i < n ; i++) { if (j < range[i].from) diff --git a/src/keymap.c b/src/keymap.c index 739dfd8f2de..6f9cf288f6d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -998,7 +998,7 @@ copy_keymap_item (Lisp_Object elt) } else { - /* It may be an old fomat menu item. + /* It may be an old format menu item. Skip the optional menu string. */ if (STRINGP (XCAR (tem))) { diff --git a/src/process.c b/src/process.c index 9b15e4c56c0..53382d804f2 100644 --- a/src/process.c +++ b/src/process.c @@ -3120,7 +3120,7 @@ usage: (make-network-process &rest ARGS) */) { struct hostent *host_info_ptr; - /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, + /* gethostbyname may fail with TRY_AGAIN, but we don't honor that, as it may `hang' Emacs for a very long time. */ immediate_quit = 1; QUIT; diff --git a/src/w32proc.c b/src/w32proc.c index c2020b40241..279816bcc3e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -174,7 +174,7 @@ delete_child (child_process *cp) cp->status = STATUS_READ_ERROR; SetEvent (cp->char_consumed); #if 0 - /* We used to forceably terminate the thread here, but it + /* We used to forcibly terminate the thread here, but it is normally unnecessary, and in abnormal cases, the worst that will happen is we have an extra idle thread hanging around waiting for the zombie process. */ diff --git a/src/w32term.h b/src/w32term.h index 710394583e4..02392133837 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -637,7 +637,7 @@ extern void x_delete_display (struct w32_display_info *dpyinfo); /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard - fuction keys), so we define our own. */ + function keys), so we define our own. */ #define VK_NUMPAD_BEGIN 0x92 #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) -- 2.39.2