diff options
37 files changed, 75 insertions, 76 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 47414baedea..f29aca7b437 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -151,7 +151,7 @@ etc/emacs.csh enough to not need license. etc/future-bug - - doesn't need a humourless disclaimer, because Karl Fogel says we + - doesn't need a humorless disclaimer, because Karl Fogel says we can consider it part of Emacs, and he has a blanker disclaimer for Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", 2007028) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index f1d57236355..dcdb5540ee1 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -12766,7 +12766,7 @@ Displayed when the signature has been hidden in the Article buffer. Displayed when Gnus has treated overstrike characters in the article buffer. @item e -Displayed when Gnus has treated emphasised strings in the article buffer. +Displayed when Gnus has treated emphasized strings in the article buffer. @end table diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index 9aa7ffc9221..01e86fb01fd 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -174,7 +174,7 @@ network are equivalent. Some networks use a round-robin system where a single server redirects new connections to a random server in the network. @code{irc.freenode.net} is such a server for the Freenode network. Freenode provides the network ``for the Free and Open Source -Software communities, for not-for-profit organisations and for related +Software communities, for not-for-profit organizations and for related communities and organizations.'' @cindex port, connecting @@ -890,7 +890,7 @@ because @code{defun-rcirc-command} is not yet available, and without If you're chatting from a laptop, then you might be familiar with this problem: When your laptop falls asleep and wakes up later, your IRC -client doesn't realise that it has been disconnected. It takes several +client doesn't realize that it has been disconnected. It takes several minutes until the client decides that the connection has in fact been lost. The simple solution is to use @kbd{M-x rcirc}. The problem is that this opens an @emph{additional} connection, so you'll have two diff --git a/etc/ChangeLog b/etc/ChangeLog index 4a4d0d34da9..8788493de37 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1880,7 +1880,7 @@ 2005-10-25 Nick Roberts <nickrob@snap.net.nz> - * images/gud/until.xpm: Colour correction. + * images/gud/until.xpm: Color correction. 2005-10-23 Richard M. Stallman <rms@gnu.org> @@ -2728,7 +2728,7 @@ 2003-04-01 Dave Love <fx@gnu.org> - * letter.xpm: Use transparent/opaque `colours'. + * letter.xpm: Use transparent/opaque `colors'. * letter.xbm: Deleted. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 5976a836d2c..9099b4e89ea 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1953,7 +1953,7 @@ A new user option Man-fontify-manpage-flag disables fontification window system is used. Two new user options Man-overstrike-face (default 'bold) and Man-underline-face (default 'underline) can be set to the preferred faces to be used for the words that man overstrikes -and underlines. Useful for those who like coloured man pages. +and underlines. Useful for those who like colored man pages. Two new interactive functions are provided: Man-cleanup-manpage and Man-fontify-manpage. Both can be used on a buffer that contains the @@ -526,8 +526,8 @@ when the body only calls primitives. probably in separate manual. ** Convert the XPM bitmaps to PPM, replace the PBMs with them and scrap - the XPMs so that the colour versions work generally. (Requires care - with the colour used for the transparent regions.) + the XPMs so that the color versions work generally. (Requires care + with the color used for the transparent regions.) ** Convenient access to the `values' variable. It would be nice to have an interface that would show you the printed reps of the elements of the diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 17617430cb6..933a8119435 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -739,7 +739,7 @@ some other place. %\key{turn on/off fixed width sections}{::t} %\key{turn on/off tables}{|:t} %\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t} -%\key{turn on/off emphasised text}{*:nil} +%\key{turn on/off emphasized text}{*:nil} %\key{turn on/off \TeX\ macros}{TeX:t} {\bf Comments: Text not being exported} diff --git a/etc/termcap.src b/etc/termcap.src index ae7a3e390a3..aeb41745540 100644 --- a/etc/termcap.src +++ b/etc/termcap.src @@ -1257,7 +1257,7 @@ pcvt50w|dec vt220 emulation with 50 lines and 132 cols:\ :co#132:li#50:\ :is=\E[1;50r\E[50;1H:tc=pcvtXX: -# Terminfo entries to enable the use of the ncurses library in colour on a +# Terminfo entries to enable the use of the ncurses library in color on a # NetBSD-arm32 console (only tested on a RiscPC). # Created by Dave Millen <dmill@globalnet.co.uk> 22.07.98 # modified codes for setf/setb to setaf/setab, then to klone+color, corrected @@ -4973,7 +4973,7 @@ tvi803|televideo 803:\ # U send ^J # D send ^V # -# S2 7 Screen colour +# S2 7 Screen color # U green on black # D black on green # @@ -5024,7 +5024,7 @@ tvi910|televideo model 910:\ # S2 4 Edit mode (U = local, D = duplex) # S2 5 Cursor type (U = underline, D = block) # S2 6 Cursor down key (U = send ^J, D = send ^V) -# S2 7 Screen colour (U = green on black, D = black on green) +# S2 7 Screen color (U = green on black, D = black on green) # S2 8 DSR status (pin 6) (U = disconnected, D = connected) # S2 9 DCD status (pin 8) (U = disconnected, D = connected) # S2 10 DTR status (pin 20) (U = disconnected, D = connected) @@ -11023,7 +11023,7 @@ infoton:\ #ESC D F set full duplex #ESC D H set half duplex #ESC E line insert -#ESC F p1 p2 set page colour (p1 = f/grnd, p2 = b/grnd) +#ESC F p1 p2 set page color (p1 = f/grnd, p2 = b/grnd) # 0 = black, 1 = red, 2 = green, 3 = yellow # 4 = blue, 5 = magenta, 6 = cyan, 7 = white #ESC G n set serial field attribute (n = 30h - 3Fh) @@ -11090,8 +11090,8 @@ infoton:\ # = = reverse underline blank # > = reverse underline blink # ? = reverse underline blink blank -# p2, p3: f/grnd, b/grnd colour -# (see ESC F for colours) +# p2, p3: f/grnd, b/grnd color +# (see ESC F for colors) # use ZZ for mono, eg. # ESC [ 0 Z Z for normal # ESC [ 4 Z Z for inverse etc. @@ -11105,7 +11105,7 @@ infoton:\ # n = 0 normal (KDS7372) mode # n = 1 Wordstar mode # -#ESC b set foreground colour screen +#ESC b set foreground color screen # #ESC c n enter self-test mode: # n = 0 exit self test mode @@ -11119,7 +11119,7 @@ infoton:\ # n = 8 graphics memory test # n = 9 display all 'E' # n = : display all 'H' -#ESC d set background colour screen +#ESC d set background color screen # #ESC e n program insert char (n = insert char) #ESC f text CR load user status line with 'text' @@ -12282,7 +12282,7 @@ pe7000m|perkin elmer 7000 series monochrome monitor:\ :k7=\E!^G:k8=\E!^H:k9=\E!^I:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:\ :kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7\s:nd=\EC:sf=^J:\ :sr=\ER:up=\EA: -pe7000c|perkin elmer 7000 series colour monitor:\ +pe7000c|perkin elmer 7000 series color monitor:\ :i1=\E!\0\EW 7o\Egf\Eb0\Ec7\ES7\s:se=\Eb0:so=\Eb2:\ :ue=\E!\0:us=\E!\s:tc=pe7000m: @@ -13981,7 +13981,7 @@ mai|basic4|MAI Basic Four in ansi mode:\ # Mikrocomputer GmbH" in Munster, Germany (the company still exists today, # about 1,5 km from where I live, but doesn't build own computers any # more). A Basis 108 featured a really heavy (cast aluminum?) case, was -# equipped with one or two 5.25" disk drives, had a monochrome and colour +# equipped with one or two 5.25" disk drives, had a monochrome and color # video output for a TV set or a dedicated monitor and several slots for # Apple II cards. Basis 108 were quite popular at german schools before # the advent of the IBM PC. They run, for example, the UCSD Pascal @@ -14219,7 +14219,7 @@ bg1.25|bbn bitgraph 1.25:\ # Typical firmware identification F5 "etat 6": # P287.02.04b (AZERTY) # P297.11.04 (24-pin: 2732) or P798.11.04 (28-pin: 2764) -# P298.03.03 (monochrome) or P374.03.02 (colour) +# P298.03.03 (monochrome) or P374.03.02 (color) # # SM SDP mode (VIP command): ^[[?=h # RIS (erases screen): ^[c @@ -14289,7 +14289,7 @@ dku7102-old|BULL Questar 200 DKU7102 (microcode version < 6):\ :AL@:DL@:al@:ce=\E[K\E[m:cl=\E[2J\E[H:cm@:dl@:\ :ds=\EPY99\:98\E\\\E[0;98v\E[2J\E[H\E[v:\ :ts=\EPY99\:98\E\\\E[0;98v\E[H\E[2;7m:tc=tws-generic: -dku7202|BULL Questar 200 DKU7202 (colour/character attributes):\ +dku7202|BULL Questar 200 DKU7202 (color/character attributes):\ :i2=\E[?3h\Eb:mb=\E[0;2;4m:mh=\E[0;5m:so=\E[0;4;5;7m:\ :ta=^I:us=\E[0;2m:tc=tws-generic: @@ -14874,7 +14874,7 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator:\ # Approximate date of release was 1982 (early 80s, anyway), and it had several # evolutions including (limited) color versions such as the PS330C. PS300s # were effectively obsolete by the late 80s, replaced by raster graphics -# systems, although specialized applications like molecular modelling +# systems, although specialized applications like molecular modeling # hung onto them for a while longer. AFAIK all E&S vector graphics systems # are out of production, though of course E&S is very much alive (in 1996). # (ps300: changed ":pt@:" to "it@" -- esr) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 991031daedd..ae247d96cfe 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1533,7 +1533,7 @@ * etags.c (add_regex): Better check for null regexps. (readline): Check for regex matching null string. - (find_entries): Reorganisation. + (find_entries): Reorganization. 2002-06-07 Francesco Potortì <pot@gnu.org> diff --git a/lib-src/etags.c b/lib-src/etags.c index 23eefd6865a..f577c751a28 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -65,7 +65,7 @@ University of California, as described above. */ * 1985 Emacs TAGS format by Richard Stallman. * 1989 Sam Kendall added C++. * 1992 Joseph B. Wells improved C and C++ parsing. - * 1993 Francesco Potortì reorganised C and C++. + * 1993 Francesco Potortì reorganized C and C++. * 1994 Line-by-line regexp tags by Tom Tromey. * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba). * 2002 #line directives by Francesco Potortì. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 9918be38212..bd0703de132 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -8103,7 +8103,7 @@ * tooltip.el (tooltip-gud-print-command): Add server prefix to the print command for gdb to keep it out of the command history. - * gdb-ui.el: Major re-organisation. Simplify legacy gdba + * gdb-ui.el: Major re-organization. Simplify legacy gdba code to allow only one gdb process. 2002-11-23 Markus Rost <rost@math.ohio-state.edu> @@ -10404,7 +10404,7 @@ `file-exists-p. (tramp-completion-handle-file-exists-p): New function. (tramp-completion-handle-file-name-completion): Simplified. - (tramp-completion-dissect-file-name): Regexp's reorganised. + (tramp-completion-dissect-file-name): Regexp's reorganized. (tramp-completion-handle-file-name-all-completions): Call completion-function only if `user' or `host' is given. (tramp-get-completion-user-host): New function. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 1ab643c9ff5..db12cac619c 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -18817,7 +18817,7 @@ (gdb-goto-breakpoint): Try to force display in source buffer. (gdb-frame-gdb-buffer): Copy other similar functions. (gdb-restore-windows): Don't display source if not asked for. - (gdb-assembler-buffer-name): Don't capitalise. + (gdb-assembler-buffer-name): Don't capitalize. 2005-11-03 Richard M. Stallman <rms@gnu.org> diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 43ccb0b4ff8..a7246c3ab57 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -11224,7 +11224,7 @@ (server-execute, server-return-error): New functions extracted from server-process-filter. (server-execute-continuation): New functions. - (server-process-filter): Restructure so that all arguments are analysed + (server-process-filter): Restructure so that all arguments are analyzed first and then acted upon in a subsequent stage. This way server-goto-toplevel can be executed later, when we know if it's necessary. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index f39682479bc..c4c00ffb082 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -4591,7 +4591,7 @@ 1995-12-13 Simon Marshall <simon@duality.gnu.ai.mit.edu> * faces.el (modify-face): Take extra optional arg FRAME. - Use face-try-color-list to change foreground and background colours. + Use face-try-color-list to change foreground and background colors. If BOLD-P, ITALIC-P or UNDERLINE-P not nil or t, don't change the display attribute corresponding to that arg. Doc fix. @@ -5477,7 +5477,7 @@ 1995-10-26 Simon Marshall <simon@duality.gnu.ai.mit.edu> - * font-lock.el: General reorganisation. + * font-lock.el: General reorganization. (font-lock-fontify-syntactically-region): Renamed from font-lock-fontify-region. Assume that region end-points are at bol. Don't bother wrapping with save-excursion; caller does this. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index f4f8e291933..d74795ecfe1 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -3881,7 +3881,7 @@ (frame-delete-all): Moved to subr.el as `assoc-delete-all'. Callers changed. (set-background-color, set-foreground-color, set-cursor-color) - (set-mouse-color, set-border-color): Offer completion of colours. + (set-mouse-color, set-border-color): Offer completion of colors. (cursor): Add :version to defgroup. * facemenu.el (list-colors-display): Make it work on ttys. @@ -6146,7 +6146,7 @@ correctly between an object declared via a constructor and a method. (font-lock-defaults-alist): Don't give `.' word syntax for Java. (java-font-lock-keywords-1): Fontify package names individually. - (java-font-lock-extra-types): Ensure regexp matches capitalised only. + (java-font-lock-extra-types): Ensure regexp matches capitalized only. (java-font-lock-keywords-2): Simplify type fontification. (java-font-lock-keywords-3): Likewise. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 7134dcbb6b1..51f29b94b48 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -10523,7 +10523,7 @@ * toolbar/open.xpm, toolbar/undo.xpm, toolbar/home.xpm: * toolbar/paste.xpm, toolbar/up_arrow.xpm, toolbar/index.xpm: * toolbar/preferences.xpm, toolbar/info.xpm, toolbar/print.xpm: - Reduce colour requirements to 25 overall. (Probably wants + Reduce color requirements to 25 overall. (Probably wants revisiting from the originals to reduce further.) 2000-10-11 Eli Zaretskii <eliz@is.elta.co.il> @@ -17047,7 +17047,7 @@ (widget-leave-text, widget-children-value-delete): Use mapc. (widget-keymap): Remove XEmacs stuff. (widget-field-keymap, widget-text-keymap): Define all inside defvar. - (widget-button-click): Don't set point at the click, but re-centre + (widget-button-click): Don't set point at the click, but re-center if we scroll out of window. Rewritten for images v. glyphs &c. (widget-tabable-at): Use POS arg, not point. (widget-beginning-of-line, widget-end-of-line) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 9ffac71fe73..dc2f8ce9079 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1415,7 +1415,7 @@ line." ;; Put in the days of the month. (dotimes (i last) (setq day (1+ i)) - ;; TODO should numbers be left-justified, centred...? + ;; TODO should numbers be left-justified, centered...? (insert (format (format "%%%dd%%s" calendar-day-digit-width) day (make-string (- calendar-column-width calendar-day-digit-width) ?\s))) diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 2a47173f9e6..2e246bfcf5a 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -209,7 +209,7 @@ ;; the end of the loop and you will insert your item just before ;; that point. If you set the threshold to, e.g. 8, it will stop ;; as soon as the window size drops below that amount and will -;; insert the item in the approximate centre of that window. I +;; insert the item in the approximate center of that window. I ;; got the idea for this feature after reading a very helpful ;; e-mail reply from Trey Jackson <trey@cs.berkeley.edu> who ;; corrected some of my awful coding and pointed me towards some diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 30e6664dd27..526042ea08d 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -1474,7 +1474,7 @@ * erc.el: erc-error-face: setting a background doesn't work so well with multi-line - messages, so we don't. fg colour is negotiable ;-) + messages, so we don't. fg color is negotiable ;-) (erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it (erc-send-current-line): allow multi-line messages provided they don't start with a slash - there's no need to prohibit them if the slash isn't the diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el index e153e0185d2..2a6e2811a0d 100644 --- a/lisp/erc/erc-capab.el +++ b/lisp/erc/erc-capab.el @@ -43,7 +43,7 @@ ;; From freenode.net's web site (not there anymore) on how to mark ;; unidentified users: ;; "We recommend that you add an asterisk before the nick, and -;; optionally either highlight or colourize the line in some +;; optionally either highlight or colorize the line in some ;; appropriate fashion, if the user is not identified." ;;; Usage: diff --git a/lisp/font-lock.el b/lisp/font-lock.el index e139b5975c7..9206da2875c 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -195,8 +195,8 @@ ;; i.e., (b) above, all modes that have items that can be thought of as, say, ;; keywords, should be highlighted with the same face, etc. ;; - Make the face attributes fit the concept as far as possible. -;; i.e., function names might be a bold colour such as blue, comments might -;; be a bright colour such as red, character strings might be brown, because, +;; i.e., function names might be a bold color such as blue, comments might +;; be a bright color such as red, character strings might be brown, because, ;; err, strings are brown (that was not the reason, please believe me). ;; - Don't use a non-nil OVERRIDE unless you have a good reason. ;; Only use OVERRIDE for special things that are easy to define, such as the @@ -1824,7 +1824,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using (setq font-lock-keywords (font-lock-compile-keywords font-lock-keywords)))))) -;;; Colour etc. support. +;;; Color etc. support. ;; Note that `defface' will not overwrite any faces declared above via ;; `custom-declare-face'. @@ -1981,7 +1981,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using "Font Lock mode face used to highlight grouping constructs in Lisp regexps." :group 'font-lock-faces) -;;; End of Colour etc. support. +;;; End of Color etc. support. ;;; Menu support. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index f74f8d634d9..c1f8769a6b9 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -2390,7 +2390,7 @@ 2003-05-10 Lars Magne Ingebrigtsen <larsi@gnus.org> - * gnus.el (gnus-logo-color-alist): Added no colours. + * gnus.el (gnus-logo-color-alist): Added no colors. 2003-05-09 Dave Love <fx@gnu.org> diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 17793b2a4b0..1a7588b4349 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -133,7 +133,7 @@ Whether the passphrase is cached at all is controlled by 'never)) cipher (result-buffer (get-buffer-create "*GPG Result*"))) - ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED + ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (unless (bobp) @@ -213,7 +213,7 @@ Whether the passphrase is cached at all is controlled by (let ((text (current-buffer)) cipher (result-buffer (get-buffer-create "*GPG Result*"))) - ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED + ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (unless (bobp) @@ -303,7 +303,7 @@ Whether the passphrase is cached at all is controlled by (let ((cte (save-restriction (narrow-to-region (point-min) (point)) (mail-fetch-field "content-transfer-encoding")))) - ;; Strip MIME headers since it will be ASCII armoured. + ;; Strip MIME headers since it will be ASCII armored. (forward-line 1) (delete-region (point-min) (point)) (when cte @@ -424,7 +424,7 @@ If no one is selected, default secret key is used. " (let ((cte (save-restriction (narrow-to-region (point-min) (point)) (mail-fetch-field "content-transfer-encoding")))) - ;; Strip MIME headers since it will be ASCII armoured. + ;; Strip MIME headers since it will be ASCII armored. (forward-line 1) (delete-region (point-min) (point)) (when cte diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index 712880d486c..c7d32e47792 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -63,7 +63,7 @@ ;; ;; Now you should be able to sign messages! Create a buffer and write ;; something and run M-x smime-sign-buffer RET RET and you should see -;; your message MIME armoured and a signature. Encryption, M-x +;; your message MIME armored and a signature. Encryption, M-x ;; smime-encrypt-buffer, should also work. ;; ;; To be able to verify messages you need to build up trust with diff --git a/lisp/hl-line.el b/lisp/hl-line.el index 0071dfe3315..dae21af0b84 100644 --- a/lisp/hl-line.el +++ b/lisp/hl-line.el @@ -38,7 +38,7 @@ ;; local mode behave like the global mode. ;; You probably don't really want to use the global mode; if the -;; cursor is difficult to spot, try changing its colour, relying on +;; cursor is difficult to spot, try changing its color, relying on ;; `blink-cursor-mode' or both. The hookery used might affect ;; response noticeably on a slow machine. The local mode may be ;; useful in non-editing buffers such as Gnus or PCL-CVS though. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 8bc2bb69f0f..3609b0683c5 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -10443,8 +10443,8 @@ 2001-12-04 Peter S Galbraith <psg@debian.org> * mh-e.el (mh-folder-subject-face et al.): Yet another attempt at - colours for folder-mode. Still themed, but fewer and darker - colours (Blame Eric this time!). I'll get to underlining tomorrow + colors for folder-mode. Still themed, but fewer and darker + colors (Blame Eric this time!). I'll get to underlining tomorrow night. * mh-e.el (mh-folder-tool-bar-map): Renamed all icons so they diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 45981776c43..7050ecaabac 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -1864,7 +1864,7 @@ For all numbers larger than LIMIT, shift them by DELTA." (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field)) (push (cons field v) org-table-local-parameters) (push (list field line col) org-table-named-field-locations)))) - ;; Analyse the line types + ;; Analyze the line types (goto-char beg) (setq org-table-current-begin-line (org-current-line) org-table-current-begin-pos (point) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index bb2cb0d4c21..30a13cba927 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -33,7 +33,7 @@ ;; o The code for updating the grid needs to be re-done. At the moment it ;; simply re-draws the grid every time a move is made. ;; -;; o Look into tarting up the display with colour. gamegrid.el looks +;; o Look into tarting up the display with color. gamegrid.el looks ;; interesting, perhaps that is the way to go? ;;; Thanks: diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 136b233208a..48dc7a4f47f 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -26,9 +26,9 @@ ;; This file contains (most of) the adaptations to cc-mode required for the ;; integration of AWK Mode. -;; It is organised thusly, the sections being separated by page breaks: +;; It is organized thusly, the sections being separated by page breaks: ;; 1. The AWK Mode syntax table. -;; 2. Regular expressions for analysing AWK code. +;; 2. Regular expressions for analyzing AWK code. ;; 3. Indentation calculation stuff ("c-awk-NL-prop text-property"). ;; 4. Syntax-table property/font-locking stuff, including the ;; font-lock-keywords setting. @@ -710,7 +710,7 @@ ;; ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a ;; division sign (value t) or a regexp opener (value nil). The idea is that - ;; we analyse the line from ANCHOR up till point to determine what the / at + ;; we analyze the line from ANCHOR up till point to determine what the / at ;; point is. ;; ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 48bfd1ceacb..f733ccb788d 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -875,7 +875,7 @@ See `sh-feature'.") "Face to show a here-document" :group 'sh-indentation) -;; These colours are probably icky. It's just a placeholder though. +;; These colors are probably icky. It's just a placeholder though. (defface sh-quoted-exec '((((class color) (background dark)) (:foreground "salmon")) diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 7d4150fbb20..2b3e8db2cae 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -138,7 +138,7 @@ ;;;###autoload (load "vc-hg") ;;;###autoload (vc-hg-registered file)))) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." (when (vc-hg-root file) ; short cut @@ -272,7 +272,7 @@ (split-string (buffer-substring-no-properties (point-min) (point-max)))))) -;; Modelled after the similar function in vc-cvs.el +;; Modeled after the similar function in vc-cvs.el (defun vc-hg-revision-completion-table (files) (lexical-let ((files files) table) @@ -330,7 +330,7 @@ Optional arg REVISION is a revision to annotate from." (when (<= newrev tip-revision) (number-to-string newrev)))) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-delete-file (file) "Delete FILE and delete it in the hg repository." (condition-case () @@ -338,7 +338,7 @@ Optional arg REVISION is a revision to annotate from." (file-error nil)) (vc-hg-command nil 0 file "remove" "--after" "--force")) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-rename-file (old new) "Rename file from OLD to NEW using `hg mv'." (vc-hg-command nil 0 new "mv" old)) @@ -355,7 +355,7 @@ COMMENT is ignored." (defalias 'vc-hg-responsible-p 'vc-hg-root) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-could-register (file) "Return non-nil if FILE could be registered under hg." (and (vc-hg-responsible-p file) ; shortcut @@ -383,7 +383,7 @@ REV is ignored." (vc-hg-command buffer 0 file "cat" "-r" rev) (vc-hg-command buffer 0 file "cat")))) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-checkout (file &optional editable rev) "Retrieve a revision of FILE. EDITABLE is ignored. @@ -395,11 +395,11 @@ REV is the revision to check out into WORKFILE." (vc-hg-command t 0 file "cat" "-r" rev) (vc-hg-command t 0 file "cat"))))) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-workfile-unchanged-p (file) (eq 'up-to-date (vc-hg-state file))) -;; Modelled after the similar function in vc-bzr.el +;; Modeled after the similar function in vc-bzr.el (defun vc-hg-revert (file &optional contents-done) (unless contents-done (with-temp-buffer (vc-hg-command t 0 file "revert")))) diff --git a/lisp/woman.el b/lisp/woman.el index 18cb2319c04..faf0a1c1793 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2800,7 +2800,7 @@ Replaces || by |, but | by \, where | denotes the internal escape." "Process .de/am xx yy -- (re)define/append macro xx; end at `..'. \(Should be up to call of yy, which defaults to `.') Optional argument APPEND, if non-nil, means append macro." - ;; Modelled on woman-strings. BEWARE: Processing of .am is a hack! + ;; Modeled on woman-strings. BEWARE: Processing of .am is a hack! ;; Add support for .rm? ;; (skip-chars-forward " \t") (if (eolp) ; ignore if no argument diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 72dd7a89e46..8165842f616 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -2683,7 +2683,7 @@ * emacs.c, dispnew.c: Rename inhibit_x_windows inhibit_window_system. Understand "-nw" command-line option. - Reorganise init_display a little to make other window-system + Reorganize init_display a little to make other window-system code easier to accommodate. * editfns.c (Fformat): diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 8b003decef0..dd4ba75089d 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -4587,7 +4587,7 @@ (Fframep #2) [MSDOS]: Return 'pc for when termcap is not used. (Fmouse_position #2) [HAVE_MOUSE]: Return useful information. (Fframe_parameters #2): Show "font" as "default". - (Fframe_parameters #2) [MSDOS]: Show fore- and background colours. + (Fframe_parameters #2) [MSDOS]: Show fore- and background colors. (Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters. (Fframe_list #2): New stub function. (syms_of_frame #2): defsubr frame_list. @@ -4671,7 +4671,7 @@ * sysdep.c (init_sys_modes): Make sure that internal_terminal_init is only called once. (init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional. - (reset_sys_modes) [MSDOS]: Change to MSDOG's default colours. + (reset_sys_modes) [MSDOS]: Change to MSDOG's default colors. (kbd_input_ast): Use just XSETFRAME. * window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and @@ -4691,7 +4691,7 @@ stubs. (load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version. (Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify - font setting, mask away 0x08 (the blink bit) from background colour. + font setting, mask away 0x08 (the blink bit) from background color. (syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p. (Fmake_face_internal): Use FOR_EACH_FRAME. (init_frame_faces): Guard multi-frame stuff with MULTI_FRAME. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 5e12b506a36..49d6f09257c 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -11455,9 +11455,8 @@ 1999-05-15 Andrew Innes <andrewi@gnu.org> - * w32term.c (dumpglyphs): Use correct colours for drawing - rectangles in place of missing fonts, and make them the right - size. + * w32term.c (dumpglyphs): Use correct colors for drawing + rectangles in place of missing fonts, and make them the right size. 1999-05-14 Dave Love <fx@gnu.org> diff --git a/src/gtkutil.c b/src/gtkutil.c index fb766c445a4..996d3f49892 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1025,7 +1025,7 @@ x_wm_set_size_hint (f, flags, user_position) } /* Change background color of a frame. - Since GTK uses the background colour to clear the window, we must + Since GTK uses the background color to clear the window, we must keep the GTK and X colors in sync. F is the frame to change, BG is the pixel value to change to. */ diff --git a/src/s/msdos.h b/src/s/msdos.h index ea940e5383c..73e62ecad6c 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -200,7 +200,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #define FLOAT_CHECK_DOMAIN /* When $TERM is "internal" then this is substituted: */ -#define INTERNAL_TERMINAL "pc|bios|IBM PC with colour display:\ +#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\ :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" |