[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106406: Spelling fixes.
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106406: Spelling fixes. |
|
Date: |
Thu, 17 Nov 2011 09:40:48 -0800 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106406
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2011-11-17 09:40:48 -0800
message:
Spelling fixes.
modified:
doc/emacs/ChangeLog
doc/emacs/msdog.texi
doc/lispref/spellfile
doc/misc/ada-mode.texi
doc/misc/cc-mode.texi
doc/misc/faq.texi
doc/misc/newsticker.texi
etc/NEWS.1-17
lib-src/ChangeLog
lisp/ChangeLog.12
lisp/ChangeLog.13
lisp/ChangeLog.14
lisp/ChangeLog.15
lisp/ChangeLog.7
lisp/ChangeLog.9
lisp/allout-widgets.el
lisp/allout.el
lisp/arc-mode.el
lisp/calendar/timeclock.el
lisp/cedet/semantic/complete.el
lisp/cedet/semantic/ia-sb.el
lisp/cedet/semantic/ia.el
lisp/desktop.el
lisp/follow.el
lisp/gnus/ChangeLog.2
lisp/gnus/gnus-agent.el
lisp/gnus/gnus-art.el
lisp/gnus/sieve.el
lisp/htmlfontify.el
lisp/language/lao-util.el
lisp/language/vietnamese.el
lisp/ldefs-boot.el
lisp/mail/rmail-spam-filter.el
lisp/mh-e/ChangeLog.1
lisp/net/mairix.el
lisp/net/newst-plainview.el
lisp/net/newsticker.el
lisp/obsolete/s-region.el
lisp/org/ChangeLog
lisp/org/org-beamer.el
lisp/org/org-bibtex.el
lisp/org/org-list.el
lisp/org/org-remember.el
lisp/org/org.el
lisp/play/bruce.el
lisp/play/fortune.el
lisp/play/solitaire.el
lisp/progmodes/f90.el
lisp/progmodes/fortran.el
lisp/progmodes/idlw-help.el
lisp/progmodes/make-mode.el
lisp/progmodes/python.el
lisp/progmodes/sh-script.el
lisp/term.el
lisp/textmodes/rst.el
lisp/url/url-future.el
nt/gmake.defs
oldXMenu/ChangeLog
src/ChangeLog.10
src/ChangeLog.6
src/dispnew.c
src/font.c
src/keymap.c
src/process.c
src/w32proc.c
src/w32term.h
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2011-11-17 03:23:50 +0000
+++ b/doc/emacs/ChangeLog 2011-11-17 17:40:48 +0000
@@ -1239,7 +1239,8 @@
2010-03-27 Nick Roberts <address@hidden>
- doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed
by r99212.
+ doc/emacs/building.texi: Describe restored GDB/MI functionality
+ removed by r99212.
doc/emacs/emacs.texi: Update node names for building.texi.
2010-03-24 Glenn Morris <address@hidden>
=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi 2011-11-16 17:47:25 +0000
+++ b/doc/emacs/msdog.texi 2011-11-17 17:40:48 +0000
@@ -322,7 +322,7 @@
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
=== modified file 'doc/lispref/spellfile'
--- a/doc/lispref/spellfile 2011-11-15 07:55:13 +0000
+++ b/doc/lispref/spellfile 2011-11-17 17:40:48 +0000
@@ -331,7 +331,6 @@
formfeed
forms'
forw
-forwa
found'
frob
from'
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2011-11-17 09:09:20 +0000
+++ b/doc/misc/ada-mode.texi 2011-11-17 17:40:48 +0000
@@ -1357,7 +1357,7 @@
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:
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2011-11-14 23:59:56 +0000
+++ b/doc/misc/cc-mode.texi 2011-11-17 17:40:48 +0000
@@ -1173,7 +1173,7 @@
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.
=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2011-03-12 19:19:47 +0000
+++ b/doc/misc/faq.texi 2011-11-17 17:40:48 +0000
@@ -80,7 +80,7 @@
@ifnottex
@insertcopying
address@hidden ifnottex
address@hidden ifnottex
@menu
* FAQ notation::
@@ -368,7 +368,7 @@
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.
=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi 2011-02-19 19:40:59 +0000
+++ b/doc/misc/newsticker.texi 2011-11-17 17:40:48 +0000
@@ -52,7 +52,7 @@
@node Top
@top Newsticker
address@hidden
address@hidden
@end ifnottex
@@ -112,9 +112,9 @@
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},
address@hidden, version 1.5},
address@hidden, version 1.5},
@uref{newsticker-1.4.png, version 1.4}
address@hidden, version 1.3},
address@hidden, version 1.3},
@uref{newsticker-1.0.png, version 1.0}.
@end ifhtml
@@ -163,7 +163,7 @@
@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 @@
@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 @@
@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 @@
@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 @@
@printindex cp
@bye
-
-
=== modified file 'etc/NEWS.1-17'
--- a/etc/NEWS.1-17 2011-11-17 09:09:20 +0000
+++ b/etc/NEWS.1-17 2011-11-17 17:40:48 +0000
@@ -996,7 +996,7 @@
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.
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-11-16 17:47:25 +0000
+++ b/lib-src/ChangeLog 2011-11-17 17:40:48 +0000
@@ -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 <address@hidden>
=== modified file 'lisp/ChangeLog.12'
--- a/lisp/ChangeLog.12 2011-11-17 09:09:20 +0000
+++ b/lisp/ChangeLog.12 2011-11-17 17:40:48 +0000
@@ -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.
=== modified file 'lisp/ChangeLog.13'
--- a/lisp/ChangeLog.13 2011-11-16 17:47:25 +0000
+++ b/lisp/ChangeLog.13 2011-11-17 17:40:48 +0000
@@ -10127,7 +10127,7 @@
2007-10-08 Richard Stallman <address@hidden>
* wid-edit.el (widget-specify-button): Don't merge mouse-face with
- neighbouring buttons.
+ neighboring buttons.
2007-10-08 Andreas Schwab <address@hidden>
@@ -10151,7 +10151,7 @@
2007-10-08 Stefan Monnier <address@hidden>
* 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.
=== modified file 'lisp/ChangeLog.14'
--- a/lisp/ChangeLog.14 2011-11-16 17:47:25 +0000
+++ b/lisp/ChangeLog.14 2011-11-17 17:40:48 +0000
@@ -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.
=== modified file 'lisp/ChangeLog.15'
--- a/lisp/ChangeLog.15 2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.15 2011-11-17 17:40:48 +0000
@@ -12221,7 +12221,7 @@
2010-03-27 Nick Roberts <address@hidden>
- Restore GDB/MI fuctionality removed by r99212.
+ Restore GDB/MI functionality removed by r99212.
* progmodes/gdb-mi.el: Restore.
* progmodes/gdb-ui.el: Remove.
* progmodes/gud.el: Re-accommodate for gdb-mi.el.
=== modified file 'lisp/ChangeLog.7'
--- a/lisp/ChangeLog.7 2011-11-16 17:47:25 +0000
+++ b/lisp/ChangeLog.7 2011-11-17 17:40:48 +0000
@@ -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.
=== modified file 'lisp/ChangeLog.9'
--- a/lisp/ChangeLog.9 2011-11-16 17:47:25 +0000
+++ b/lisp/ChangeLog.9 2011-11-17 17:40:48 +0000
@@ -10569,7 +10569,7 @@
2000-10-10 Dave Love <address@hidden>
* 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:
=== modified file 'lisp/allout-widgets.el'
--- a/lisp/allout-widgets.el 2011-11-17 09:09:20 +0000
+++ b/lisp/allout-widgets.el 2011-11-17 17:40:48 +0000
@@ -810,7 +810,7 @@
(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:
=== modified file 'lisp/allout.el'
--- a/lisp/allout.el 2011-11-17 09:09:20 +0000
+++ b/lisp/allout.el 2011-11-17 17:40:48 +0000
@@ -3557,7 +3557,7 @@
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
=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el 2011-11-14 23:59:56 +0000
+++ b/lisp/arc-mode.el 2011-11-17 17:40:48 +0000
@@ -4,7 +4,7 @@
;; Author: Morten Welinder <address@hidden>
;; 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
=== modified file 'lisp/calendar/timeclock.el'
--- a/lisp/calendar/timeclock.el 2011-07-01 00:20:59 +0000
+++ b/lisp/calendar/timeclock.el 2011-11-17 17:40:48 +0000
@@ -407,7 +407,7 @@
(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 @@
(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 @@
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
=== modified file 'lisp/cedet/semantic/complete.el'
--- a/lisp/cedet/semantic/complete.el 2011-11-17 09:09:20 +0000
+++ b/lisp/cedet/semantic/complete.el 2011-11-17 17:40:48 +0000
@@ -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:
;;
=== modified file 'lisp/cedet/semantic/ia-sb.el'
--- a/lisp/cedet/semantic/ia-sb.el 2011-01-26 08:36:39 +0000
+++ b/lisp/cedet/semantic/ia-sb.el 2011-11-17 17:40:48 +0000
@@ -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)
)
=== modified file 'lisp/cedet/semantic/ia.el'
--- a/lisp/cedet/semantic/ia.el 2011-11-15 17:37:37 +0000
+++ b/lisp/cedet/semantic/ia.el 2011-11-17 17:40:48 +0000
@@ -119,7 +119,7 @@
;; 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)))
=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el 2011-11-14 23:59:56 +0000
+++ b/lisp/desktop.el 2011-11-17 17:40:48 +0000
@@ -4,7 +4,7 @@
;; Author: Morten Welinder <address@hidden>
;; 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.
=== modified file 'lisp/follow.el'
--- a/lisp/follow.el 2011-11-17 09:09:20 +0000
+++ b/lisp/follow.el 2011-11-17 17:40:48 +0000
@@ -652,7 +652,7 @@
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)
=== modified file 'lisp/gnus/ChangeLog.2'
--- a/lisp/gnus/ChangeLog.2 2011-07-14 01:09:00 +0000
+++ b/lisp/gnus/ChangeLog.2 2011-11-17 17:40:48 +0000
@@ -5562,7 +5562,7 @@
2003-01-14 Kevin Greiner <address@hidden>
* 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
=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el 2011-11-16 12:34:47 +0000
+++ b/lisp/gnus/gnus-agent.el 2011-11-17 17:40:48 +0000
@@ -1130,7 +1130,7 @@
(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)
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2011-11-15 17:37:37 +0000
+++ b/lisp/gnus/gnus-art.el 2011-11-17 17:40:48 +0000
@@ -535,7 +535,7 @@
;; 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'.
=== modified file 'lisp/gnus/sieve.el'
--- a/lisp/gnus/sieve.el 2011-03-01 12:20:17 +0000
+++ b/lisp/gnus/sieve.el 2011-11-17 17:40:48 +0000
@@ -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
=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el 2011-11-17 09:09:20 +0000
+++ b/lisp/htmlfontify.el 2011-11-17 17:40:48 +0000
@@ -360,7 +360,7 @@
: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" )) ))
=== modified file 'lisp/language/lao-util.el'
--- a/lisp/language/lao-util.el 2011-11-14 23:59:56 +0000
+++ b/lisp/language/lao-util.el 2011-11-17 17:40:48 +0000
@@ -371,7 +371,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
+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.
=== modified file 'lisp/language/vietnamese.el'
--- a/lisp/language/vietnamese.el 2011-11-14 20:23:26 +0000
+++ b/lisp/language/vietnamese.el 2011-11-17 17:40:48 +0000
@@ -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
=== modified file 'lisp/ldefs-boot.el'
--- a/lisp/ldefs-boot.el 2011-11-14 23:59:56 +0000
+++ b/lisp/ldefs-boot.el 2011-11-17 17:40:48 +0000
@@ -11099,7 +11099,7 @@
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 @@
o o o
-Pick your favourite shortcuts:
+Pick your favorite shortcuts:
\\{solitaire-mode-map}
=== modified file 'lisp/mail/rmail-spam-filter.el'
--- a/lisp/mail/rmail-spam-filter.el 2011-11-15 17:37:37 +0000
+++ b/lisp/mail/rmail-spam-filter.el 2011-11-17 17:40:48 +0000
@@ -554,4 +554,4 @@
(provide 'rmail-spam-filter)
-;;; rmail-spam-fitler ends here
+;;; rmail-spam-filter ends here
=== modified file 'lisp/mh-e/ChangeLog.1'
--- a/lisp/mh-e/ChangeLog.1 2011-11-16 12:34:47 +0000
+++ b/lisp/mh-e/ChangeLog.1 2011-11-17 17:40:48 +0000
@@ -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 <address@hidden>
@@ -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 <address@hidden>
@@ -8048,7 +8048,7 @@
2002-10-26 Peter S Galbraith <address@hidden>
* 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.
=== modified file 'lisp/net/mairix.el'
--- a/lisp/net/mairix.el 2011-01-25 04:08:28 +0000
+++ b/lisp/net/mairix.el 2011-11-17 17:40:48 +0000
@@ -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 @@
(provide 'mairix)
;;; mairix.el ends here
-
=== modified file 'lisp/net/newst-plainview.el'
--- a/lisp/net/newst-plainview.el 2011-10-01 20:32:01 +0000
+++ b/lisp/net/newst-plainview.el 2011-11-17 17:40:48 +0000
@@ -783,11 +783,11 @@
(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)
=== modified file 'lisp/net/newsticker.el'
--- a/lisp/net/newsticker.el 2011-01-26 08:36:39 +0000
+++ b/lisp/net/newsticker.el 2011-11-17 17:40:48 +0000
@@ -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
=== modified file 'lisp/obsolete/s-region.el'
--- a/lisp/obsolete/s-region.el 2011-01-25 04:08:28 +0000
+++ b/lisp/obsolete/s-region.el 2011-11-17 17:40:48 +0000
@@ -4,7 +4,7 @@
;; Author: Morten Welinder <address@hidden>
;; 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.
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2011-11-16 17:47:25 +0000
+++ b/lisp/org/ChangeLog 2011-11-17 17:40:48 +0000
@@ -8074,7 +8074,7 @@
2010-11-11 Nicolas Goaziou <address@hidden>
* 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 <address@hidden>
@@ -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
=== modified file 'lisp/org/org-beamer.el'
--- a/lisp/org/org-beamer.el 2011-11-14 23:59:56 +0000
+++ b/lisp/org/org-beamer.el 2011-11-17 17:40:48 +0000
@@ -411,7 +411,7 @@
;; 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."
=== modified file 'lisp/org/org-bibtex.el'
--- a/lisp/org/org-bibtex.el 2011-11-16 12:34:47 +0000
+++ b/lisp/org/org-bibtex.el 2011-11-17 17:40:48 +0000
@@ -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)
=== modified file 'lisp/org/org-list.el'
--- a/lisp/org/org-list.el 2011-11-17 09:09:20 +0000
+++ b/lisp/org/org-list.el 2011-11-17 17:40:48 +0000
@@ -1177,7 +1177,7 @@
;; 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?
=== modified file 'lisp/org/org-remember.el'
--- a/lisp/org/org-remember.el 2011-11-15 17:37:37 +0000
+++ b/lisp/org/org-remember.el 2011-11-17 17:40:48 +0000
@@ -63,7 +63,7 @@
\\[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)
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2011-11-17 09:09:20 +0000
+++ b/lisp/org/org.el 2011-11-17 17:40:48 +0000
@@ -1480,7 +1480,7 @@
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)))
=== modified file 'lisp/play/bruce.el'
--- a/lisp/play/bruce.el 2011-01-25 04:08:28 +0000
+++ b/lisp/play/bruce.el 2011-11-17 17:40:48 +0000
@@ -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)
=== modified file 'lisp/play/fortune.el'
--- a/lisp/play/fortune.el 2011-07-03 19:30:01 +0000
+++ b/lisp/play/fortune.el 2011-11-17 17:40:48 +0000
@@ -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:
=== modified file 'lisp/play/solitaire.el'
--- a/lisp/play/solitaire.el 2011-04-21 12:24:46 +0000
+++ b/lisp/play/solitaire.el 2011-11-17 17:40:48 +0000
@@ -190,7 +190,7 @@
o o o
-Pick your favourite shortcuts:
+Pick your favorite shortcuts:
\\{solitaire-mode-map}"
=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el 2011-10-11 07:27:46 +0000
+++ b/lisp/progmodes/f90.el 2011-11-17 17:40:48 +0000
@@ -1837,7 +1837,7 @@
(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)))
=== modified file 'lisp/progmodes/fortran.el'
--- a/lisp/progmodes/fortran.el 2011-11-14 23:59:56 +0000
+++ b/lisp/progmodes/fortran.el 2011-11-17 17:40:48 +0000
@@ -571,7 +571,7 @@
;; 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]\\|.\\>\\)\\)\\)\\<then\\|"
=== modified file 'lisp/progmodes/idlw-help.el'
--- a/lisp/progmodes/idlw-help.el 2011-11-17 09:09:20 +0000
+++ b/lisp/progmodes/idlw-help.el 2011-11-17 17:40:48 +0000
@@ -991,7 +991,7 @@
same or the next line. When KEYWORD is non-nil, looks first for a
`KEYWORDS' section. It is amazing how inconsisten this is through
some IDL libraries I have seen. We settle for a line containing an
-upper case \"KEYWORD\" string. If this line is not fould we search
+upper case \"KEYWORD\" string. If this line is not found we search
for the keyword anyway to increase the hit-rate
When one of these sections exists we check for a line starting with any of
=== modified file 'lisp/progmodes/make-mode.el'
--- a/lisp/progmodes/make-mode.el 2011-06-20 16:02:31 +0000
+++ b/lisp/progmodes/make-mode.el 2011-11-17 17:40:48 +0000
@@ -532,7 +532,7 @@
;; should return an exit status of zero if the target `foo' is
;; up to date and a nonzero exit status otherwise.
;; Many makes can do this although the docs/manpages do not mention
-;; it. Try it with your favourite one. GNU make, System V make, and
+;; it. Try it with your favorite one. GNU make, System V make, and
;; Dennis Vadura's DMake have no problems.
;; Set the variable `makefile-brave-make' to the name of the
;; make utility that does this on your system.
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2011-11-17 09:09:20 +0000
+++ b/lisp/progmodes/python.el 2011-11-17 17:40:48 +0000
@@ -2553,7 +2553,7 @@
most recently visited python-mode buffer which either has the
name of the current function or class, or which defines the
function or class. This is to provide for scripts not in the
-local filesytem (e.g., Zope's 'Script \(Python)', but it's not
+local file system (e.g., Zope's 'Script \(Python)', but it's not
Zope specific). If you put a copy of the script in a buffer
named for the script and activate python-mode, then pdbtrack will
find it."
=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el 2011-11-17 02:38:54 +0000
+++ b/lisp/progmodes/sh-script.el 2011-11-17 17:40:48 +0000
@@ -985,7 +985,7 @@
subshells can nest."
;; FIXME: This can (and often does) match multiple lines, yet it makes no
;; effort to handle multiline cases correctly, so it ends up being
- ;; rather flakey.
+ ;; rather flaky.
(when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote.
;; bingo we have a $( or a ` inside a ""
(let (;; `state' can be: double-quote, backquote, code.
=== modified file 'lisp/term.el'
--- a/lisp/term.el 2011-11-13 07:48:23 +0000
+++ b/lisp/term.el 2011-11-17 17:40:48 +0000
@@ -294,7 +294,7 @@
;; # Notice that the ^[ character is an ESC, not two chars. You can
;; # get it in various ways, for example by typing
;; # echo -e '\033' > 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"
=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el 2011-11-15 07:55:13 +0000
+++ b/lisp/textmodes/rst.el 2011-11-17 17:40:48 +0000
@@ -1534,7 +1534,7 @@
(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.
=== modified file 'lisp/url/url-future.el'
--- a/lisp/url/url-future.el 2011-06-04 07:53:22 +0000
+++ b/lisp/url/url-future.el 2011-11-17 17:40:48 +0000
@@ -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:
=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs 2011-11-05 11:34:56 +0000
+++ b/nt/gmake.defs 2011-11-17 17:40:48 +0000
@@ -95,7 +95,7 @@
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 @@
$(BLD)/%.o: %.c
$(CC) $(CFLAGS) $(CC_OUT)$@ $<
-
=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog 2011-04-16 23:11:35 +0000
+++ b/oldXMenu/ChangeLog 2011-11-17 17:40:48 +0000
@@ -167,7 +167,7 @@
2007-02-25 Glenn Morris <address@hidden>
* 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 <address@hidden>
=== modified file 'src/ChangeLog.10'
--- a/src/ChangeLog.10 2011-11-14 21:00:24 +0000
+++ b/src/ChangeLog.10 2011-11-17 17:40:48 +0000
@@ -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.
=== modified file 'src/ChangeLog.6'
--- a/src/ChangeLog.6 2011-07-14 01:09:00 +0000
+++ b/src/ChangeLog.6 2011-11-17 17:40:48 +0000
@@ -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
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2011-11-12 11:56:57 +0000
+++ b/src/dispnew.c 2011-11-17 17:40:48 +0000
@@ -3491,7 +3491,7 @@
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;
=== modified file 'src/font.c'
--- a/src/font.c 2011-11-14 23:59:56 +0000
+++ b/src/font.c 2011-11-17 17:40:48 +0000
@@ -954,7 +954,7 @@
}
}
- /* 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)
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2011-10-01 18:46:45 +0000
+++ b/src/keymap.c 2011-11-17 17:40:48 +0000
@@ -998,7 +998,7 @@
}
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)))
{
=== modified file 'src/process.c'
--- a/src/process.c 2011-11-15 07:55:13 +0000
+++ b/src/process.c 2011-11-17 17:40:48 +0000
@@ -3120,7 +3120,7 @@
{
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;
=== modified file 'src/w32proc.c'
--- a/src/w32proc.c 2011-11-17 09:09:20 +0000
+++ b/src/w32proc.c 2011-11-17 17:40:48 +0000
@@ -174,7 +174,7 @@
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. */
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2011-09-09 01:06:52 +0000
+++ b/src/w32term.h 2011-11-17 17:40:48 +0000
@@ -637,7 +637,7 @@
/* 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)
- [Emacs-diffs] /srv/bzr/emacs/trunk r106406: Spelling fixes.,
Paul Eggert <=