diff options
| author | Glenn Morris | 2008-06-27 02:41:14 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-27 02:41:14 +0000 |
| commit | 6772c8e169a6a56ee387373a00a65bd3a3070725 (patch) | |
| tree | 4f0d9a8f0be905ba92b3420ad2832ffaad05a3b2 | |
| parent | 04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8 (diff) | |
| download | emacs-6772c8e169a6a56ee387373a00a65bd3a3070725.tar.gz emacs-6772c8e169a6a56ee387373a00a65bd3a3070725.zip | |
American English spelling fix.
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 | |||
| 151 | enough to not need license. | 151 | enough to not need license. |
| 152 | 152 | ||
| 153 | etc/future-bug | 153 | etc/future-bug |
| 154 | - doesn't need a humourless disclaimer, because Karl Fogel says we | 154 | - doesn't need a humorless disclaimer, because Karl Fogel says we |
| 155 | can consider it part of Emacs, and he has a blanker disclaimer for | 155 | can consider it part of Emacs, and he has a blanker disclaimer for |
| 156 | Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", | 156 | Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", |
| 157 | 2007028) | 157 | 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. | |||
| 12766 | Displayed when Gnus has treated overstrike characters in the article buffer. | 12766 | Displayed when Gnus has treated overstrike characters in the article buffer. |
| 12767 | 12767 | ||
| 12768 | @item e | 12768 | @item e |
| 12769 | Displayed when Gnus has treated emphasised strings in the article buffer. | 12769 | Displayed when Gnus has treated emphasized strings in the article buffer. |
| 12770 | 12770 | ||
| 12771 | @end table | 12771 | @end table |
| 12772 | 12772 | ||
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 | |||
| 174 | single server redirects new connections to a random server in the | 174 | single server redirects new connections to a random server in the |
| 175 | network. @code{irc.freenode.net} is such a server for the Freenode | 175 | network. @code{irc.freenode.net} is such a server for the Freenode |
| 176 | network. Freenode provides the network ``for the Free and Open Source | 176 | network. Freenode provides the network ``for the Free and Open Source |
| 177 | Software communities, for not-for-profit organisations and for related | 177 | Software communities, for not-for-profit organizations and for related |
| 178 | communities and organizations.'' | 178 | communities and organizations.'' |
| 179 | 179 | ||
| 180 | @cindex port, connecting | 180 | @cindex port, connecting |
| @@ -890,7 +890,7 @@ because @code{defun-rcirc-command} is not yet available, and without | |||
| 890 | 890 | ||
| 891 | If you're chatting from a laptop, then you might be familiar with this | 891 | If you're chatting from a laptop, then you might be familiar with this |
| 892 | problem: When your laptop falls asleep and wakes up later, your IRC | 892 | problem: When your laptop falls asleep and wakes up later, your IRC |
| 893 | client doesn't realise that it has been disconnected. It takes several | 893 | client doesn't realize that it has been disconnected. It takes several |
| 894 | minutes until the client decides that the connection has in fact been | 894 | minutes until the client decides that the connection has in fact been |
| 895 | lost. The simple solution is to use @kbd{M-x rcirc}. The problem is | 895 | lost. The simple solution is to use @kbd{M-x rcirc}. The problem is |
| 896 | that this opens an @emph{additional} connection, so you'll have two | 896 | 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 @@ | |||
| 1880 | 1880 | ||
| 1881 | 2005-10-25 Nick Roberts <nickrob@snap.net.nz> | 1881 | 2005-10-25 Nick Roberts <nickrob@snap.net.nz> |
| 1882 | 1882 | ||
| 1883 | * images/gud/until.xpm: Colour correction. | 1883 | * images/gud/until.xpm: Color correction. |
| 1884 | 1884 | ||
| 1885 | 2005-10-23 Richard M. Stallman <rms@gnu.org> | 1885 | 2005-10-23 Richard M. Stallman <rms@gnu.org> |
| 1886 | 1886 | ||
| @@ -2728,7 +2728,7 @@ | |||
| 2728 | 2728 | ||
| 2729 | 2003-04-01 Dave Love <fx@gnu.org> | 2729 | 2003-04-01 Dave Love <fx@gnu.org> |
| 2730 | 2730 | ||
| 2731 | * letter.xpm: Use transparent/opaque `colours'. | 2731 | * letter.xpm: Use transparent/opaque `colors'. |
| 2732 | 2732 | ||
| 2733 | * letter.xbm: Deleted. | 2733 | * letter.xbm: Deleted. |
| 2734 | 2734 | ||
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 | |||
| 1953 | window system is used. Two new user options Man-overstrike-face | 1953 | window system is used. Two new user options Man-overstrike-face |
| 1954 | (default 'bold) and Man-underline-face (default 'underline) can be set | 1954 | (default 'bold) and Man-underline-face (default 'underline) can be set |
| 1955 | to the preferred faces to be used for the words that man overstrikes | 1955 | to the preferred faces to be used for the words that man overstrikes |
| 1956 | and underlines. Useful for those who like coloured man pages. | 1956 | and underlines. Useful for those who like colored man pages. |
| 1957 | 1957 | ||
| 1958 | Two new interactive functions are provided: Man-cleanup-manpage and | 1958 | Two new interactive functions are provided: Man-cleanup-manpage and |
| 1959 | Man-fontify-manpage. Both can be used on a buffer that contains the | 1959 | Man-fontify-manpage. Both can be used on a buffer that contains the |
| @@ -526,8 +526,8 @@ when the body only calls primitives. | |||
| 526 | probably in separate manual. | 526 | probably in separate manual. |
| 527 | 527 | ||
| 528 | ** Convert the XPM bitmaps to PPM, replace the PBMs with them and scrap | 528 | ** Convert the XPM bitmaps to PPM, replace the PBMs with them and scrap |
| 529 | the XPMs so that the colour versions work generally. (Requires care | 529 | the XPMs so that the color versions work generally. (Requires care |
| 530 | with the colour used for the transparent regions.) | 530 | with the color used for the transparent regions.) |
| 531 | 531 | ||
| 532 | ** Convenient access to the `values' variable. It would be nice to have an | 532 | ** Convenient access to the `values' variable. It would be nice to have an |
| 533 | interface that would show you the printed reps of the elements of the | 533 | 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. | |||
| 739 | %\key{turn on/off fixed width sections}{::t} | 739 | %\key{turn on/off fixed width sections}{::t} |
| 740 | %\key{turn on/off tables}{|:t} | 740 | %\key{turn on/off tables}{|:t} |
| 741 | %\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t} | 741 | %\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t} |
| 742 | %\key{turn on/off emphasised text}{*:nil} | 742 | %\key{turn on/off emphasized text}{*:nil} |
| 743 | %\key{turn on/off \TeX\ macros}{TeX:t} | 743 | %\key{turn on/off \TeX\ macros}{TeX:t} |
| 744 | 744 | ||
| 745 | {\bf Comments: Text not being exported} | 745 | {\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:\ | |||
| 1257 | :co#132:li#50:\ | 1257 | :co#132:li#50:\ |
| 1258 | :is=\E[1;50r\E[50;1H:tc=pcvtXX: | 1258 | :is=\E[1;50r\E[50;1H:tc=pcvtXX: |
| 1259 | 1259 | ||
| 1260 | # Terminfo entries to enable the use of the ncurses library in colour on a | 1260 | # Terminfo entries to enable the use of the ncurses library in color on a |
| 1261 | # NetBSD-arm32 console (only tested on a RiscPC). | 1261 | # NetBSD-arm32 console (only tested on a RiscPC). |
| 1262 | # Created by Dave Millen <dmill@globalnet.co.uk> 22.07.98 | 1262 | # Created by Dave Millen <dmill@globalnet.co.uk> 22.07.98 |
| 1263 | # modified codes for setf/setb to setaf/setab, then to klone+color, corrected | 1263 | # modified codes for setf/setb to setaf/setab, then to klone+color, corrected |
| @@ -4973,7 +4973,7 @@ tvi803|televideo 803:\ | |||
| 4973 | # U send ^J | 4973 | # U send ^J |
| 4974 | # D send ^V | 4974 | # D send ^V |
| 4975 | # | 4975 | # |
| 4976 | # S2 7 Screen colour | 4976 | # S2 7 Screen color |
| 4977 | # U green on black | 4977 | # U green on black |
| 4978 | # D black on green | 4978 | # D black on green |
| 4979 | # | 4979 | # |
| @@ -5024,7 +5024,7 @@ tvi910|televideo model 910:\ | |||
| 5024 | # S2 4 Edit mode (U = local, D = duplex) | 5024 | # S2 4 Edit mode (U = local, D = duplex) |
| 5025 | # S2 5 Cursor type (U = underline, D = block) | 5025 | # S2 5 Cursor type (U = underline, D = block) |
| 5026 | # S2 6 Cursor down key (U = send ^J, D = send ^V) | 5026 | # S2 6 Cursor down key (U = send ^J, D = send ^V) |
| 5027 | # S2 7 Screen colour (U = green on black, D = black on green) | 5027 | # S2 7 Screen color (U = green on black, D = black on green) |
| 5028 | # S2 8 DSR status (pin 6) (U = disconnected, D = connected) | 5028 | # S2 8 DSR status (pin 6) (U = disconnected, D = connected) |
| 5029 | # S2 9 DCD status (pin 8) (U = disconnected, D = connected) | 5029 | # S2 9 DCD status (pin 8) (U = disconnected, D = connected) |
| 5030 | # S2 10 DTR status (pin 20) (U = disconnected, D = connected) | 5030 | # S2 10 DTR status (pin 20) (U = disconnected, D = connected) |
| @@ -11023,7 +11023,7 @@ infoton:\ | |||
| 11023 | #ESC D F set full duplex | 11023 | #ESC D F set full duplex |
| 11024 | #ESC D H set half duplex | 11024 | #ESC D H set half duplex |
| 11025 | #ESC E line insert | 11025 | #ESC E line insert |
| 11026 | #ESC F p1 p2 set page colour (p1 = f/grnd, p2 = b/grnd) | 11026 | #ESC F p1 p2 set page color (p1 = f/grnd, p2 = b/grnd) |
| 11027 | # 0 = black, 1 = red, 2 = green, 3 = yellow | 11027 | # 0 = black, 1 = red, 2 = green, 3 = yellow |
| 11028 | # 4 = blue, 5 = magenta, 6 = cyan, 7 = white | 11028 | # 4 = blue, 5 = magenta, 6 = cyan, 7 = white |
| 11029 | #ESC G n set serial field attribute (n = 30h - 3Fh) | 11029 | #ESC G n set serial field attribute (n = 30h - 3Fh) |
| @@ -11090,8 +11090,8 @@ infoton:\ | |||
| 11090 | # = = reverse underline blank | 11090 | # = = reverse underline blank |
| 11091 | # > = reverse underline blink | 11091 | # > = reverse underline blink |
| 11092 | # ? = reverse underline blink blank | 11092 | # ? = reverse underline blink blank |
| 11093 | # p2, p3: f/grnd, b/grnd colour | 11093 | # p2, p3: f/grnd, b/grnd color |
| 11094 | # (see ESC F for colours) | 11094 | # (see ESC F for colors) |
| 11095 | # use ZZ for mono, eg. | 11095 | # use ZZ for mono, eg. |
| 11096 | # ESC [ 0 Z Z for normal | 11096 | # ESC [ 0 Z Z for normal |
| 11097 | # ESC [ 4 Z Z for inverse etc. | 11097 | # ESC [ 4 Z Z for inverse etc. |
| @@ -11105,7 +11105,7 @@ infoton:\ | |||
| 11105 | # n = 0 normal (KDS7372) mode | 11105 | # n = 0 normal (KDS7372) mode |
| 11106 | # n = 1 Wordstar mode | 11106 | # n = 1 Wordstar mode |
| 11107 | # | 11107 | # |
| 11108 | #ESC b set foreground colour screen | 11108 | #ESC b set foreground color screen |
| 11109 | # | 11109 | # |
| 11110 | #ESC c n enter self-test mode: | 11110 | #ESC c n enter self-test mode: |
| 11111 | # n = 0 exit self test mode | 11111 | # n = 0 exit self test mode |
| @@ -11119,7 +11119,7 @@ infoton:\ | |||
| 11119 | # n = 8 graphics memory test | 11119 | # n = 8 graphics memory test |
| 11120 | # n = 9 display all 'E' | 11120 | # n = 9 display all 'E' |
| 11121 | # n = : display all 'H' | 11121 | # n = : display all 'H' |
| 11122 | #ESC d set background colour screen | 11122 | #ESC d set background color screen |
| 11123 | # | 11123 | # |
| 11124 | #ESC e n program insert char (n = insert char) | 11124 | #ESC e n program insert char (n = insert char) |
| 11125 | #ESC f text CR load user status line with 'text' | 11125 | #ESC f text CR load user status line with 'text' |
| @@ -12282,7 +12282,7 @@ pe7000m|perkin elmer 7000 series monochrome monitor:\ | |||
| 12282 | :k7=\E!^G:k8=\E!^H:k9=\E!^I:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:\ | 12282 | :k7=\E!^G:k8=\E!^H:k9=\E!^I:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:\ |
| 12283 | :kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7\s:nd=\EC:sf=^J:\ | 12283 | :kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7\s:nd=\EC:sf=^J:\ |
| 12284 | :sr=\ER:up=\EA: | 12284 | :sr=\ER:up=\EA: |
| 12285 | pe7000c|perkin elmer 7000 series colour monitor:\ | 12285 | pe7000c|perkin elmer 7000 series color monitor:\ |
| 12286 | :i1=\E!\0\EW 7o\Egf\Eb0\Ec7\ES7\s:se=\Eb0:so=\Eb2:\ | 12286 | :i1=\E!\0\EW 7o\Egf\Eb0\Ec7\ES7\s:se=\Eb0:so=\Eb2:\ |
| 12287 | :ue=\E!\0:us=\E!\s:tc=pe7000m: | 12287 | :ue=\E!\0:us=\E!\s:tc=pe7000m: |
| 12288 | 12288 | ||
| @@ -13981,7 +13981,7 @@ mai|basic4|MAI Basic Four in ansi mode:\ | |||
| 13981 | # Mikrocomputer GmbH" in Munster, Germany (the company still exists today, | 13981 | # Mikrocomputer GmbH" in Munster, Germany (the company still exists today, |
| 13982 | # about 1,5 km from where I live, but doesn't build own computers any | 13982 | # about 1,5 km from where I live, but doesn't build own computers any |
| 13983 | # more). A Basis 108 featured a really heavy (cast aluminum?) case, was | 13983 | # more). A Basis 108 featured a really heavy (cast aluminum?) case, was |
| 13984 | # equipped with one or two 5.25" disk drives, had a monochrome and colour | 13984 | # equipped with one or two 5.25" disk drives, had a monochrome and color |
| 13985 | # video output for a TV set or a dedicated monitor and several slots for | 13985 | # video output for a TV set or a dedicated monitor and several slots for |
| 13986 | # Apple II cards. Basis 108 were quite popular at german schools before | 13986 | # Apple II cards. Basis 108 were quite popular at german schools before |
| 13987 | # the advent of the IBM PC. They run, for example, the UCSD Pascal | 13987 | # the advent of the IBM PC. They run, for example, the UCSD Pascal |
| @@ -14219,7 +14219,7 @@ bg1.25|bbn bitgraph 1.25:\ | |||
| 14219 | # Typical firmware identification F5 "etat 6": | 14219 | # Typical firmware identification F5 "etat 6": |
| 14220 | # P287.02.04b (AZERTY) | 14220 | # P287.02.04b (AZERTY) |
| 14221 | # P297.11.04 (24-pin: 2732) or P798.11.04 (28-pin: 2764) | 14221 | # P297.11.04 (24-pin: 2732) or P798.11.04 (28-pin: 2764) |
| 14222 | # P298.03.03 (monochrome) or P374.03.02 (colour) | 14222 | # P298.03.03 (monochrome) or P374.03.02 (color) |
| 14223 | # | 14223 | # |
| 14224 | # SM SDP mode (VIP command): ^[[?=h | 14224 | # SM SDP mode (VIP command): ^[[?=h |
| 14225 | # RIS (erases screen): ^[c | 14225 | # RIS (erases screen): ^[c |
| @@ -14289,7 +14289,7 @@ dku7102-old|BULL Questar 200 DKU7102 (microcode version < 6):\ | |||
| 14289 | :AL@:DL@:al@:ce=\E[K\E[m:cl=\E[2J\E[H:cm@:dl@:\ | 14289 | :AL@:DL@:al@:ce=\E[K\E[m:cl=\E[2J\E[H:cm@:dl@:\ |
| 14290 | :ds=\EPY99\:98\E\\\E[0;98v\E[2J\E[H\E[v:\ | 14290 | :ds=\EPY99\:98\E\\\E[0;98v\E[2J\E[H\E[v:\ |
| 14291 | :ts=\EPY99\:98\E\\\E[0;98v\E[H\E[2;7m:tc=tws-generic: | 14291 | :ts=\EPY99\:98\E\\\E[0;98v\E[H\E[2;7m:tc=tws-generic: |
| 14292 | dku7202|BULL Questar 200 DKU7202 (colour/character attributes):\ | 14292 | dku7202|BULL Questar 200 DKU7202 (color/character attributes):\ |
| 14293 | :i2=\E[?3h\Eb:mb=\E[0;2;4m:mh=\E[0;5m:so=\E[0;4;5;7m:\ | 14293 | :i2=\E[?3h\Eb:mb=\E[0;2;4m:mh=\E[0;5m:so=\E[0;4;5;7m:\ |
| 14294 | :ta=^I:us=\E[0;2m:tc=tws-generic: | 14294 | :ta=^I:us=\E[0;2m:tc=tws-generic: |
| 14295 | 14295 | ||
| @@ -14874,7 +14874,7 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator:\ | |||
| 14874 | # Approximate date of release was 1982 (early 80s, anyway), and it had several | 14874 | # Approximate date of release was 1982 (early 80s, anyway), and it had several |
| 14875 | # evolutions including (limited) color versions such as the PS330C. PS300s | 14875 | # evolutions including (limited) color versions such as the PS330C. PS300s |
| 14876 | # were effectively obsolete by the late 80s, replaced by raster graphics | 14876 | # were effectively obsolete by the late 80s, replaced by raster graphics |
| 14877 | # systems, although specialized applications like molecular modelling | 14877 | # systems, although specialized applications like molecular modeling |
| 14878 | # hung onto them for a while longer. AFAIK all E&S vector graphics systems | 14878 | # hung onto them for a while longer. AFAIK all E&S vector graphics systems |
| 14879 | # are out of production, though of course E&S is very much alive (in 1996). | 14879 | # are out of production, though of course E&S is very much alive (in 1996). |
| 14880 | # (ps300: changed ":pt@:" to "it@" -- esr) | 14880 | # (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 @@ | |||
| 1533 | 1533 | ||
| 1534 | * etags.c (add_regex): Better check for null regexps. | 1534 | * etags.c (add_regex): Better check for null regexps. |
| 1535 | (readline): Check for regex matching null string. | 1535 | (readline): Check for regex matching null string. |
| 1536 | (find_entries): Reorganisation. | 1536 | (find_entries): Reorganization. |
| 1537 | 1537 | ||
| 1538 | 2002-06-07 Francesco Potortì <pot@gnu.org> | 1538 | 2002-06-07 Francesco Potortì <pot@gnu.org> |
| 1539 | 1539 | ||
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. */ | |||
| 65 | * 1985 Emacs TAGS format by Richard Stallman. | 65 | * 1985 Emacs TAGS format by Richard Stallman. |
| 66 | * 1989 Sam Kendall added C++. | 66 | * 1989 Sam Kendall added C++. |
| 67 | * 1992 Joseph B. Wells improved C and C++ parsing. | 67 | * 1992 Joseph B. Wells improved C and C++ parsing. |
| 68 | * 1993 Francesco Potortì reorganised C and C++. | 68 | * 1993 Francesco Potortì reorganized C and C++. |
| 69 | * 1994 Line-by-line regexp tags by Tom Tromey. | 69 | * 1994 Line-by-line regexp tags by Tom Tromey. |
| 70 | * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba). | 70 | * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba). |
| 71 | * 2002 #line directives by Francesco Potortì. | 71 | * 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 @@ | |||
| 8103 | * tooltip.el (tooltip-gud-print-command): Add server prefix to the | 8103 | * tooltip.el (tooltip-gud-print-command): Add server prefix to the |
| 8104 | print command for gdb to keep it out of the command history. | 8104 | print command for gdb to keep it out of the command history. |
| 8105 | 8105 | ||
| 8106 | * gdb-ui.el: Major re-organisation. Simplify legacy gdba | 8106 | * gdb-ui.el: Major re-organization. Simplify legacy gdba |
| 8107 | code to allow only one gdb process. | 8107 | code to allow only one gdb process. |
| 8108 | 8108 | ||
| 8109 | 2002-11-23 Markus Rost <rost@math.ohio-state.edu> | 8109 | 2002-11-23 Markus Rost <rost@math.ohio-state.edu> |
| @@ -10404,7 +10404,7 @@ | |||
| 10404 | `file-exists-p. | 10404 | `file-exists-p. |
| 10405 | (tramp-completion-handle-file-exists-p): New function. | 10405 | (tramp-completion-handle-file-exists-p): New function. |
| 10406 | (tramp-completion-handle-file-name-completion): Simplified. | 10406 | (tramp-completion-handle-file-name-completion): Simplified. |
| 10407 | (tramp-completion-dissect-file-name): Regexp's reorganised. | 10407 | (tramp-completion-dissect-file-name): Regexp's reorganized. |
| 10408 | (tramp-completion-handle-file-name-all-completions): | 10408 | (tramp-completion-handle-file-name-all-completions): |
| 10409 | Call completion-function only if `user' or `host' is given. | 10409 | Call completion-function only if `user' or `host' is given. |
| 10410 | (tramp-get-completion-user-host): New function. | 10410 | (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 @@ | |||
| 18817 | (gdb-goto-breakpoint): Try to force display in source buffer. | 18817 | (gdb-goto-breakpoint): Try to force display in source buffer. |
| 18818 | (gdb-frame-gdb-buffer): Copy other similar functions. | 18818 | (gdb-frame-gdb-buffer): Copy other similar functions. |
| 18819 | (gdb-restore-windows): Don't display source if not asked for. | 18819 | (gdb-restore-windows): Don't display source if not asked for. |
| 18820 | (gdb-assembler-buffer-name): Don't capitalise. | 18820 | (gdb-assembler-buffer-name): Don't capitalize. |
| 18821 | 18821 | ||
| 18822 | 2005-11-03 Richard M. Stallman <rms@gnu.org> | 18822 | 2005-11-03 Richard M. Stallman <rms@gnu.org> |
| 18823 | 18823 | ||
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 @@ | |||
| 11224 | (server-execute, server-return-error): New functions extracted from | 11224 | (server-execute, server-return-error): New functions extracted from |
| 11225 | server-process-filter. | 11225 | server-process-filter. |
| 11226 | (server-execute-continuation): New functions. | 11226 | (server-execute-continuation): New functions. |
| 11227 | (server-process-filter): Restructure so that all arguments are analysed | 11227 | (server-process-filter): Restructure so that all arguments are analyzed |
| 11228 | first and then acted upon in a subsequent stage. This way | 11228 | first and then acted upon in a subsequent stage. This way |
| 11229 | server-goto-toplevel can be executed later, when we know if | 11229 | server-goto-toplevel can be executed later, when we know if |
| 11230 | it's necessary. | 11230 | 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 @@ | |||
| 4591 | 1995-12-13 Simon Marshall <simon@duality.gnu.ai.mit.edu> | 4591 | 1995-12-13 Simon Marshall <simon@duality.gnu.ai.mit.edu> |
| 4592 | 4592 | ||
| 4593 | * faces.el (modify-face): Take extra optional arg FRAME. | 4593 | * faces.el (modify-face): Take extra optional arg FRAME. |
| 4594 | Use face-try-color-list to change foreground and background colours. | 4594 | Use face-try-color-list to change foreground and background colors. |
| 4595 | If BOLD-P, ITALIC-P or UNDERLINE-P not nil or t, don't change the | 4595 | If BOLD-P, ITALIC-P or UNDERLINE-P not nil or t, don't change the |
| 4596 | display attribute corresponding to that arg. Doc fix. | 4596 | display attribute corresponding to that arg. Doc fix. |
| 4597 | 4597 | ||
| @@ -5477,7 +5477,7 @@ | |||
| 5477 | 5477 | ||
| 5478 | 1995-10-26 Simon Marshall <simon@duality.gnu.ai.mit.edu> | 5478 | 1995-10-26 Simon Marshall <simon@duality.gnu.ai.mit.edu> |
| 5479 | 5479 | ||
| 5480 | * font-lock.el: General reorganisation. | 5480 | * font-lock.el: General reorganization. |
| 5481 | (font-lock-fontify-syntactically-region): Renamed from | 5481 | (font-lock-fontify-syntactically-region): Renamed from |
| 5482 | font-lock-fontify-region. Assume that region end-points are at bol. | 5482 | font-lock-fontify-region. Assume that region end-points are at bol. |
| 5483 | Don't bother wrapping with save-excursion; caller does this. | 5483 | 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 @@ | |||
| 3881 | (frame-delete-all): Moved to subr.el as `assoc-delete-all'. | 3881 | (frame-delete-all): Moved to subr.el as `assoc-delete-all'. |
| 3882 | Callers changed. | 3882 | Callers changed. |
| 3883 | (set-background-color, set-foreground-color, set-cursor-color) | 3883 | (set-background-color, set-foreground-color, set-cursor-color) |
| 3884 | (set-mouse-color, set-border-color): Offer completion of colours. | 3884 | (set-mouse-color, set-border-color): Offer completion of colors. |
| 3885 | (cursor): Add :version to defgroup. | 3885 | (cursor): Add :version to defgroup. |
| 3886 | 3886 | ||
| 3887 | * facemenu.el (list-colors-display): Make it work on ttys. | 3887 | * facemenu.el (list-colors-display): Make it work on ttys. |
| @@ -6146,7 +6146,7 @@ | |||
| 6146 | correctly between an object declared via a constructor and a method. | 6146 | correctly between an object declared via a constructor and a method. |
| 6147 | (font-lock-defaults-alist): Don't give `.' word syntax for Java. | 6147 | (font-lock-defaults-alist): Don't give `.' word syntax for Java. |
| 6148 | (java-font-lock-keywords-1): Fontify package names individually. | 6148 | (java-font-lock-keywords-1): Fontify package names individually. |
| 6149 | (java-font-lock-extra-types): Ensure regexp matches capitalised only. | 6149 | (java-font-lock-extra-types): Ensure regexp matches capitalized only. |
| 6150 | (java-font-lock-keywords-2): Simplify type fontification. | 6150 | (java-font-lock-keywords-2): Simplify type fontification. |
| 6151 | (java-font-lock-keywords-3): Likewise. | 6151 | (java-font-lock-keywords-3): Likewise. |
| 6152 | 6152 | ||
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 @@ | |||
| 10523 | * toolbar/open.xpm, toolbar/undo.xpm, toolbar/home.xpm: | 10523 | * toolbar/open.xpm, toolbar/undo.xpm, toolbar/home.xpm: |
| 10524 | * toolbar/paste.xpm, toolbar/up_arrow.xpm, toolbar/index.xpm: | 10524 | * toolbar/paste.xpm, toolbar/up_arrow.xpm, toolbar/index.xpm: |
| 10525 | * toolbar/preferences.xpm, toolbar/info.xpm, toolbar/print.xpm: | 10525 | * toolbar/preferences.xpm, toolbar/info.xpm, toolbar/print.xpm: |
| 10526 | Reduce colour requirements to 25 overall. (Probably wants | 10526 | Reduce color requirements to 25 overall. (Probably wants |
| 10527 | revisiting from the originals to reduce further.) | 10527 | revisiting from the originals to reduce further.) |
| 10528 | 10528 | ||
| 10529 | 2000-10-11 Eli Zaretskii <eliz@is.elta.co.il> | 10529 | 2000-10-11 Eli Zaretskii <eliz@is.elta.co.il> |
| @@ -17047,7 +17047,7 @@ | |||
| 17047 | (widget-leave-text, widget-children-value-delete): Use mapc. | 17047 | (widget-leave-text, widget-children-value-delete): Use mapc. |
| 17048 | (widget-keymap): Remove XEmacs stuff. | 17048 | (widget-keymap): Remove XEmacs stuff. |
| 17049 | (widget-field-keymap, widget-text-keymap): Define all inside defvar. | 17049 | (widget-field-keymap, widget-text-keymap): Define all inside defvar. |
| 17050 | (widget-button-click): Don't set point at the click, but re-centre | 17050 | (widget-button-click): Don't set point at the click, but re-center |
| 17051 | if we scroll out of window. Rewritten for images v. glyphs &c. | 17051 | if we scroll out of window. Rewritten for images v. glyphs &c. |
| 17052 | (widget-tabable-at): Use POS arg, not point. | 17052 | (widget-tabable-at): Use POS arg, not point. |
| 17053 | (widget-beginning-of-line, widget-end-of-line) | 17053 | (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." | |||
| 1415 | ;; Put in the days of the month. | 1415 | ;; Put in the days of the month. |
| 1416 | (dotimes (i last) | 1416 | (dotimes (i last) |
| 1417 | (setq day (1+ i)) | 1417 | (setq day (1+ i)) |
| 1418 | ;; TODO should numbers be left-justified, centred...? | 1418 | ;; TODO should numbers be left-justified, centered...? |
| 1419 | (insert (format (format "%%%dd%%s" calendar-day-digit-width) day | 1419 | (insert (format (format "%%%dd%%s" calendar-day-digit-width) day |
| 1420 | (make-string | 1420 | (make-string |
| 1421 | (- calendar-column-width calendar-day-digit-width) ?\s))) | 1421 | (- 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 @@ | |||
| 209 | ;; the end of the loop and you will insert your item just before | 209 | ;; the end of the loop and you will insert your item just before |
| 210 | ;; that point. If you set the threshold to, e.g. 8, it will stop | 210 | ;; that point. If you set the threshold to, e.g. 8, it will stop |
| 211 | ;; as soon as the window size drops below that amount and will | 211 | ;; as soon as the window size drops below that amount and will |
| 212 | ;; insert the item in the approximate centre of that window. I | 212 | ;; insert the item in the approximate center of that window. I |
| 213 | ;; got the idea for this feature after reading a very helpful | 213 | ;; got the idea for this feature after reading a very helpful |
| 214 | ;; e-mail reply from Trey Jackson <trey@cs.berkeley.edu> who | 214 | ;; e-mail reply from Trey Jackson <trey@cs.berkeley.edu> who |
| 215 | ;; corrected some of my awful coding and pointed me towards some | 215 | ;; 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 @@ | |||
| 1474 | 1474 | ||
| 1475 | * erc.el: | 1475 | * erc.el: |
| 1476 | erc-error-face: setting a background doesn't work so well with multi-line | 1476 | erc-error-face: setting a background doesn't work so well with multi-line |
| 1477 | messages, so we don't. fg colour is negotiable ;-) | 1477 | messages, so we don't. fg color is negotiable ;-) |
| 1478 | (erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it | 1478 | (erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it |
| 1479 | (erc-send-current-line): allow multi-line messages provided they don't start | 1479 | (erc-send-current-line): allow multi-line messages provided they don't start |
| 1480 | with a slash - there's no need to prohibit them if the slash isn't the | 1480 | 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 @@ | |||
| 43 | ;; From freenode.net's web site (not there anymore) on how to mark | 43 | ;; From freenode.net's web site (not there anymore) on how to mark |
| 44 | ;; unidentified users: | 44 | ;; unidentified users: |
| 45 | ;; "We recommend that you add an asterisk before the nick, and | 45 | ;; "We recommend that you add an asterisk before the nick, and |
| 46 | ;; optionally either highlight or colourize the line in some | 46 | ;; optionally either highlight or colorize the line in some |
| 47 | ;; appropriate fashion, if the user is not identified." | 47 | ;; appropriate fashion, if the user is not identified." |
| 48 | 48 | ||
| 49 | ;;; Usage: | 49 | ;;; 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 @@ | |||
| 195 | ;; i.e., (b) above, all modes that have items that can be thought of as, say, | 195 | ;; i.e., (b) above, all modes that have items that can be thought of as, say, |
| 196 | ;; keywords, should be highlighted with the same face, etc. | 196 | ;; keywords, should be highlighted with the same face, etc. |
| 197 | ;; - Make the face attributes fit the concept as far as possible. | 197 | ;; - Make the face attributes fit the concept as far as possible. |
| 198 | ;; i.e., function names might be a bold colour such as blue, comments might | 198 | ;; i.e., function names might be a bold color such as blue, comments might |
| 199 | ;; be a bright colour such as red, character strings might be brown, because, | 199 | ;; be a bright color such as red, character strings might be brown, because, |
| 200 | ;; err, strings are brown (that was not the reason, please believe me). | 200 | ;; err, strings are brown (that was not the reason, please believe me). |
| 201 | ;; - Don't use a non-nil OVERRIDE unless you have a good reason. | 201 | ;; - Don't use a non-nil OVERRIDE unless you have a good reason. |
| 202 | ;; Only use OVERRIDE for special things that are easy to define, such as the | 202 | ;; 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 | |||
| 1824 | (setq font-lock-keywords | 1824 | (setq font-lock-keywords |
| 1825 | (font-lock-compile-keywords font-lock-keywords)))))) | 1825 | (font-lock-compile-keywords font-lock-keywords)))))) |
| 1826 | 1826 | ||
| 1827 | ;;; Colour etc. support. | 1827 | ;;; Color etc. support. |
| 1828 | 1828 | ||
| 1829 | ;; Note that `defface' will not overwrite any faces declared above via | 1829 | ;; Note that `defface' will not overwrite any faces declared above via |
| 1830 | ;; `custom-declare-face'. | 1830 | ;; `custom-declare-face'. |
| @@ -1981,7 +1981,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using | |||
| 1981 | "Font Lock mode face used to highlight grouping constructs in Lisp regexps." | 1981 | "Font Lock mode face used to highlight grouping constructs in Lisp regexps." |
| 1982 | :group 'font-lock-faces) | 1982 | :group 'font-lock-faces) |
| 1983 | 1983 | ||
| 1984 | ;;; End of Colour etc. support. | 1984 | ;;; End of Color etc. support. |
| 1985 | 1985 | ||
| 1986 | ;;; Menu support. | 1986 | ;;; Menu support. |
| 1987 | 1987 | ||
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 @@ | |||
| 2390 | 2390 | ||
| 2391 | 2003-05-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | 2391 | 2003-05-10 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2392 | 2392 | ||
| 2393 | * gnus.el (gnus-logo-color-alist): Added no colours. | 2393 | * gnus.el (gnus-logo-color-alist): Added no colors. |
| 2394 | 2394 | ||
| 2395 | 2003-05-09 Dave Love <fx@gnu.org> | 2395 | 2003-05-09 Dave Love <fx@gnu.org> |
| 2396 | 2396 | ||
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 | |||
| 133 | 'never)) | 133 | 'never)) |
| 134 | cipher | 134 | cipher |
| 135 | (result-buffer (get-buffer-create "*GPG Result*"))) | 135 | (result-buffer (get-buffer-create "*GPG Result*"))) |
| 136 | ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED | 136 | ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED |
| 137 | (goto-char (point-min)) | 137 | (goto-char (point-min)) |
| 138 | (while (looking-at "^Content[^ ]+:") (forward-line)) | 138 | (while (looking-at "^Content[^ ]+:") (forward-line)) |
| 139 | (unless (bobp) | 139 | (unless (bobp) |
| @@ -213,7 +213,7 @@ Whether the passphrase is cached at all is controlled by | |||
| 213 | (let ((text (current-buffer)) | 213 | (let ((text (current-buffer)) |
| 214 | cipher | 214 | cipher |
| 215 | (result-buffer (get-buffer-create "*GPG Result*"))) | 215 | (result-buffer (get-buffer-create "*GPG Result*"))) |
| 216 | ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED | 216 | ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED |
| 217 | (goto-char (point-min)) | 217 | (goto-char (point-min)) |
| 218 | (while (looking-at "^Content[^ ]+:") (forward-line)) | 218 | (while (looking-at "^Content[^ ]+:") (forward-line)) |
| 219 | (unless (bobp) | 219 | (unless (bobp) |
| @@ -303,7 +303,7 @@ Whether the passphrase is cached at all is controlled by | |||
| 303 | (let ((cte (save-restriction | 303 | (let ((cte (save-restriction |
| 304 | (narrow-to-region (point-min) (point)) | 304 | (narrow-to-region (point-min) (point)) |
| 305 | (mail-fetch-field "content-transfer-encoding")))) | 305 | (mail-fetch-field "content-transfer-encoding")))) |
| 306 | ;; Strip MIME headers since it will be ASCII armoured. | 306 | ;; Strip MIME headers since it will be ASCII armored. |
| 307 | (forward-line 1) | 307 | (forward-line 1) |
| 308 | (delete-region (point-min) (point)) | 308 | (delete-region (point-min) (point)) |
| 309 | (when cte | 309 | (when cte |
| @@ -424,7 +424,7 @@ If no one is selected, default secret key is used. " | |||
| 424 | (let ((cte (save-restriction | 424 | (let ((cte (save-restriction |
| 425 | (narrow-to-region (point-min) (point)) | 425 | (narrow-to-region (point-min) (point)) |
| 426 | (mail-fetch-field "content-transfer-encoding")))) | 426 | (mail-fetch-field "content-transfer-encoding")))) |
| 427 | ;; Strip MIME headers since it will be ASCII armoured. | 427 | ;; Strip MIME headers since it will be ASCII armored. |
| 428 | (forward-line 1) | 428 | (forward-line 1) |
| 429 | (delete-region (point-min) (point)) | 429 | (delete-region (point-min) (point)) |
| 430 | (when cte | 430 | (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 @@ | |||
| 63 | ;; | 63 | ;; |
| 64 | ;; Now you should be able to sign messages! Create a buffer and write | 64 | ;; Now you should be able to sign messages! Create a buffer and write |
| 65 | ;; something and run M-x smime-sign-buffer RET RET and you should see | 65 | ;; something and run M-x smime-sign-buffer RET RET and you should see |
| 66 | ;; your message MIME armoured and a signature. Encryption, M-x | 66 | ;; your message MIME armored and a signature. Encryption, M-x |
| 67 | ;; smime-encrypt-buffer, should also work. | 67 | ;; smime-encrypt-buffer, should also work. |
| 68 | ;; | 68 | ;; |
| 69 | ;; To be able to verify messages you need to build up trust with | 69 | ;; 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 @@ | |||
| 38 | ;; local mode behave like the global mode. | 38 | ;; local mode behave like the global mode. |
| 39 | 39 | ||
| 40 | ;; You probably don't really want to use the global mode; if the | 40 | ;; You probably don't really want to use the global mode; if the |
| 41 | ;; cursor is difficult to spot, try changing its colour, relying on | 41 | ;; cursor is difficult to spot, try changing its color, relying on |
| 42 | ;; `blink-cursor-mode' or both. The hookery used might affect | 42 | ;; `blink-cursor-mode' or both. The hookery used might affect |
| 43 | ;; response noticeably on a slow machine. The local mode may be | 43 | ;; response noticeably on a slow machine. The local mode may be |
| 44 | ;; useful in non-editing buffers such as Gnus or PCL-CVS though. | 44 | ;; 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 @@ | |||
| 10443 | 2001-12-04 Peter S Galbraith <psg@debian.org> | 10443 | 2001-12-04 Peter S Galbraith <psg@debian.org> |
| 10444 | 10444 | ||
| 10445 | * mh-e.el (mh-folder-subject-face et al.): Yet another attempt at | 10445 | * mh-e.el (mh-folder-subject-face et al.): Yet another attempt at |
| 10446 | colours for folder-mode. Still themed, but fewer and darker | 10446 | colors for folder-mode. Still themed, but fewer and darker |
| 10447 | colours (Blame Eric this time!). I'll get to underlining tomorrow | 10447 | colors (Blame Eric this time!). I'll get to underlining tomorrow |
| 10448 | night. | 10448 | night. |
| 10449 | 10449 | ||
| 10450 | * mh-e.el (mh-folder-tool-bar-map): Renamed all icons so they | 10450 | * 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." | |||
| 1864 | (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field)) | 1864 | (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field)) |
| 1865 | (push (cons field v) org-table-local-parameters) | 1865 | (push (cons field v) org-table-local-parameters) |
| 1866 | (push (list field line col) org-table-named-field-locations)))) | 1866 | (push (list field line col) org-table-named-field-locations)))) |
| 1867 | ;; Analyse the line types | 1867 | ;; Analyze the line types |
| 1868 | (goto-char beg) | 1868 | (goto-char beg) |
| 1869 | (setq org-table-current-begin-line (org-current-line) | 1869 | (setq org-table-current-begin-line (org-current-line) |
| 1870 | org-table-current-begin-pos (point) | 1870 | 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 @@ | |||
| 33 | ;; o The code for updating the grid needs to be re-done. At the moment it | 33 | ;; o The code for updating the grid needs to be re-done. At the moment it |
| 34 | ;; simply re-draws the grid every time a move is made. | 34 | ;; simply re-draws the grid every time a move is made. |
| 35 | ;; | 35 | ;; |
| 36 | ;; o Look into tarting up the display with colour. gamegrid.el looks | 36 | ;; o Look into tarting up the display with color. gamegrid.el looks |
| 37 | ;; interesting, perhaps that is the way to go? | 37 | ;; interesting, perhaps that is the way to go? |
| 38 | 38 | ||
| 39 | ;;; Thanks: | 39 | ;;; 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 @@ | |||
| 26 | 26 | ||
| 27 | ;; This file contains (most of) the adaptations to cc-mode required for the | 27 | ;; This file contains (most of) the adaptations to cc-mode required for the |
| 28 | ;; integration of AWK Mode. | 28 | ;; integration of AWK Mode. |
| 29 | ;; It is organised thusly, the sections being separated by page breaks: | 29 | ;; It is organized thusly, the sections being separated by page breaks: |
| 30 | ;; 1. The AWK Mode syntax table. | 30 | ;; 1. The AWK Mode syntax table. |
| 31 | ;; 2. Regular expressions for analysing AWK code. | 31 | ;; 2. Regular expressions for analyzing AWK code. |
| 32 | ;; 3. Indentation calculation stuff ("c-awk-NL-prop text-property"). | 32 | ;; 3. Indentation calculation stuff ("c-awk-NL-prop text-property"). |
| 33 | ;; 4. Syntax-table property/font-locking stuff, including the | 33 | ;; 4. Syntax-table property/font-locking stuff, including the |
| 34 | ;; font-lock-keywords setting. | 34 | ;; font-lock-keywords setting. |
| @@ -710,7 +710,7 @@ | |||
| 710 | ;; | 710 | ;; |
| 711 | ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a | 711 | ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a |
| 712 | ;; division sign (value t) or a regexp opener (value nil). The idea is that | 712 | ;; division sign (value t) or a regexp opener (value nil). The idea is that |
| 713 | ;; we analyse the line from ANCHOR up till point to determine what the / at | 713 | ;; we analyze the line from ANCHOR up till point to determine what the / at |
| 714 | ;; point is. | 714 | ;; point is. |
| 715 | ;; | 715 | ;; |
| 716 | ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left. | 716 | ;; 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'.") | |||
| 875 | "Face to show a here-document" | 875 | "Face to show a here-document" |
| 876 | :group 'sh-indentation) | 876 | :group 'sh-indentation) |
| 877 | 877 | ||
| 878 | ;; These colours are probably icky. It's just a placeholder though. | 878 | ;; These colors are probably icky. It's just a placeholder though. |
| 879 | (defface sh-quoted-exec | 879 | (defface sh-quoted-exec |
| 880 | '((((class color) (background dark)) | 880 | '((((class color) (background dark)) |
| 881 | (:foreground "salmon")) | 881 | (: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 @@ | |||
| 138 | ;;;###autoload (load "vc-hg") | 138 | ;;;###autoload (load "vc-hg") |
| 139 | ;;;###autoload (vc-hg-registered file)))) | 139 | ;;;###autoload (vc-hg-registered file)))) |
| 140 | 140 | ||
| 141 | ;; Modelled after the similar function in vc-bzr.el | 141 | ;; Modeled after the similar function in vc-bzr.el |
| 142 | (defun vc-hg-registered (file) | 142 | (defun vc-hg-registered (file) |
| 143 | "Return non-nil if FILE is registered with hg." | 143 | "Return non-nil if FILE is registered with hg." |
| 144 | (when (vc-hg-root file) ; short cut | 144 | (when (vc-hg-root file) ; short cut |
| @@ -272,7 +272,7 @@ | |||
| 272 | (split-string | 272 | (split-string |
| 273 | (buffer-substring-no-properties (point-min) (point-max)))))) | 273 | (buffer-substring-no-properties (point-min) (point-max)))))) |
| 274 | 274 | ||
| 275 | ;; Modelled after the similar function in vc-cvs.el | 275 | ;; Modeled after the similar function in vc-cvs.el |
| 276 | (defun vc-hg-revision-completion-table (files) | 276 | (defun vc-hg-revision-completion-table (files) |
| 277 | (lexical-let ((files files) | 277 | (lexical-let ((files files) |
| 278 | table) | 278 | table) |
| @@ -330,7 +330,7 @@ Optional arg REVISION is a revision to annotate from." | |||
| 330 | (when (<= newrev tip-revision) | 330 | (when (<= newrev tip-revision) |
| 331 | (number-to-string newrev)))) | 331 | (number-to-string newrev)))) |
| 332 | 332 | ||
| 333 | ;; Modelled after the similar function in vc-bzr.el | 333 | ;; Modeled after the similar function in vc-bzr.el |
| 334 | (defun vc-hg-delete-file (file) | 334 | (defun vc-hg-delete-file (file) |
| 335 | "Delete FILE and delete it in the hg repository." | 335 | "Delete FILE and delete it in the hg repository." |
| 336 | (condition-case () | 336 | (condition-case () |
| @@ -338,7 +338,7 @@ Optional arg REVISION is a revision to annotate from." | |||
| 338 | (file-error nil)) | 338 | (file-error nil)) |
| 339 | (vc-hg-command nil 0 file "remove" "--after" "--force")) | 339 | (vc-hg-command nil 0 file "remove" "--after" "--force")) |
| 340 | 340 | ||
| 341 | ;; Modelled after the similar function in vc-bzr.el | 341 | ;; Modeled after the similar function in vc-bzr.el |
| 342 | (defun vc-hg-rename-file (old new) | 342 | (defun vc-hg-rename-file (old new) |
| 343 | "Rename file from OLD to NEW using `hg mv'." | 343 | "Rename file from OLD to NEW using `hg mv'." |
| 344 | (vc-hg-command nil 0 new "mv" old)) | 344 | (vc-hg-command nil 0 new "mv" old)) |
| @@ -355,7 +355,7 @@ COMMENT is ignored." | |||
| 355 | 355 | ||
| 356 | (defalias 'vc-hg-responsible-p 'vc-hg-root) | 356 | (defalias 'vc-hg-responsible-p 'vc-hg-root) |
| 357 | 357 | ||
| 358 | ;; Modelled after the similar function in vc-bzr.el | 358 | ;; Modeled after the similar function in vc-bzr.el |
| 359 | (defun vc-hg-could-register (file) | 359 | (defun vc-hg-could-register (file) |
| 360 | "Return non-nil if FILE could be registered under hg." | 360 | "Return non-nil if FILE could be registered under hg." |
| 361 | (and (vc-hg-responsible-p file) ; shortcut | 361 | (and (vc-hg-responsible-p file) ; shortcut |
| @@ -383,7 +383,7 @@ REV is ignored." | |||
| 383 | (vc-hg-command buffer 0 file "cat" "-r" rev) | 383 | (vc-hg-command buffer 0 file "cat" "-r" rev) |
| 384 | (vc-hg-command buffer 0 file "cat")))) | 384 | (vc-hg-command buffer 0 file "cat")))) |
| 385 | 385 | ||
| 386 | ;; Modelled after the similar function in vc-bzr.el | 386 | ;; Modeled after the similar function in vc-bzr.el |
| 387 | (defun vc-hg-checkout (file &optional editable rev) | 387 | (defun vc-hg-checkout (file &optional editable rev) |
| 388 | "Retrieve a revision of FILE. | 388 | "Retrieve a revision of FILE. |
| 389 | EDITABLE is ignored. | 389 | EDITABLE is ignored. |
| @@ -395,11 +395,11 @@ REV is the revision to check out into WORKFILE." | |||
| 395 | (vc-hg-command t 0 file "cat" "-r" rev) | 395 | (vc-hg-command t 0 file "cat" "-r" rev) |
| 396 | (vc-hg-command t 0 file "cat"))))) | 396 | (vc-hg-command t 0 file "cat"))))) |
| 397 | 397 | ||
| 398 | ;; Modelled after the similar function in vc-bzr.el | 398 | ;; Modeled after the similar function in vc-bzr.el |
| 399 | (defun vc-hg-workfile-unchanged-p (file) | 399 | (defun vc-hg-workfile-unchanged-p (file) |
| 400 | (eq 'up-to-date (vc-hg-state file))) | 400 | (eq 'up-to-date (vc-hg-state file))) |
| 401 | 401 | ||
| 402 | ;; Modelled after the similar function in vc-bzr.el | 402 | ;; Modeled after the similar function in vc-bzr.el |
| 403 | (defun vc-hg-revert (file &optional contents-done) | 403 | (defun vc-hg-revert (file &optional contents-done) |
| 404 | (unless contents-done | 404 | (unless contents-done |
| 405 | (with-temp-buffer (vc-hg-command t 0 file "revert")))) | 405 | (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." | |||
| 2800 | "Process .de/am xx yy -- (re)define/append macro xx; end at `..'. | 2800 | "Process .de/am xx yy -- (re)define/append macro xx; end at `..'. |
| 2801 | \(Should be up to call of yy, which defaults to `.') | 2801 | \(Should be up to call of yy, which defaults to `.') |
| 2802 | Optional argument APPEND, if non-nil, means append macro." | 2802 | Optional argument APPEND, if non-nil, means append macro." |
| 2803 | ;; Modelled on woman-strings. BEWARE: Processing of .am is a hack! | 2803 | ;; Modeled on woman-strings. BEWARE: Processing of .am is a hack! |
| 2804 | ;; Add support for .rm? | 2804 | ;; Add support for .rm? |
| 2805 | ;; (skip-chars-forward " \t") | 2805 | ;; (skip-chars-forward " \t") |
| 2806 | (if (eolp) ; ignore if no argument | 2806 | (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 @@ | |||
| 2683 | * emacs.c, dispnew.c: | 2683 | * emacs.c, dispnew.c: |
| 2684 | Rename inhibit_x_windows inhibit_window_system. | 2684 | Rename inhibit_x_windows inhibit_window_system. |
| 2685 | Understand "-nw" command-line option. | 2685 | Understand "-nw" command-line option. |
| 2686 | Reorganise init_display a little to make other window-system | 2686 | Reorganize init_display a little to make other window-system |
| 2687 | code easier to accommodate. | 2687 | code easier to accommodate. |
| 2688 | 2688 | ||
| 2689 | * editfns.c (Fformat): | 2689 | * 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 @@ | |||
| 4587 | (Fframep #2) [MSDOS]: Return 'pc for when termcap is not used. | 4587 | (Fframep #2) [MSDOS]: Return 'pc for when termcap is not used. |
| 4588 | (Fmouse_position #2) [HAVE_MOUSE]: Return useful information. | 4588 | (Fmouse_position #2) [HAVE_MOUSE]: Return useful information. |
| 4589 | (Fframe_parameters #2): Show "font" as "default". | 4589 | (Fframe_parameters #2): Show "font" as "default". |
| 4590 | (Fframe_parameters #2) [MSDOS]: Show fore- and background colours. | 4590 | (Fframe_parameters #2) [MSDOS]: Show fore- and background colors. |
| 4591 | (Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters. | 4591 | (Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters. |
| 4592 | (Fframe_list #2): New stub function. | 4592 | (Fframe_list #2): New stub function. |
| 4593 | (syms_of_frame #2): defsubr frame_list. | 4593 | (syms_of_frame #2): defsubr frame_list. |
| @@ -4671,7 +4671,7 @@ | |||
| 4671 | * sysdep.c (init_sys_modes): Make sure that internal_terminal_init | 4671 | * sysdep.c (init_sys_modes): Make sure that internal_terminal_init |
| 4672 | is only called once. | 4672 | is only called once. |
| 4673 | (init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional. | 4673 | (init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional. |
| 4674 | (reset_sys_modes) [MSDOS]: Change to MSDOG's default colours. | 4674 | (reset_sys_modes) [MSDOS]: Change to MSDOG's default colors. |
| 4675 | (kbd_input_ast): Use just XSETFRAME. | 4675 | (kbd_input_ast): Use just XSETFRAME. |
| 4676 | 4676 | ||
| 4677 | * window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and | 4677 | * window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and |
| @@ -4691,7 +4691,7 @@ | |||
| 4691 | stubs. | 4691 | stubs. |
| 4692 | (load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version. | 4692 | (load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version. |
| 4693 | (Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify | 4693 | (Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify |
| 4694 | font setting, mask away 0x08 (the blink bit) from background colour. | 4694 | font setting, mask away 0x08 (the blink bit) from background color. |
| 4695 | (syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p. | 4695 | (syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p. |
| 4696 | (Fmake_face_internal): Use FOR_EACH_FRAME. | 4696 | (Fmake_face_internal): Use FOR_EACH_FRAME. |
| 4697 | (init_frame_faces): Guard multi-frame stuff with MULTI_FRAME. | 4697 | (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 @@ | |||
| 11455 | 11455 | ||
| 11456 | 1999-05-15 Andrew Innes <andrewi@gnu.org> | 11456 | 1999-05-15 Andrew Innes <andrewi@gnu.org> |
| 11457 | 11457 | ||
| 11458 | * w32term.c (dumpglyphs): Use correct colours for drawing | 11458 | * w32term.c (dumpglyphs): Use correct colors for drawing |
| 11459 | rectangles in place of missing fonts, and make them the right | 11459 | rectangles in place of missing fonts, and make them the right size. |
| 11460 | size. | ||
| 11461 | 11460 | ||
| 11462 | 1999-05-14 Dave Love <fx@gnu.org> | 11461 | 1999-05-14 Dave Love <fx@gnu.org> |
| 11463 | 11462 | ||
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) | |||
| 1025 | } | 1025 | } |
| 1026 | 1026 | ||
| 1027 | /* Change background color of a frame. | 1027 | /* Change background color of a frame. |
| 1028 | Since GTK uses the background colour to clear the window, we must | 1028 | Since GTK uses the background color to clear the window, we must |
| 1029 | keep the GTK and X colors in sync. | 1029 | keep the GTK and X colors in sync. |
| 1030 | F is the frame to change, | 1030 | F is the frame to change, |
| 1031 | BG is the pixel value to change to. */ | 1031 | 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 */ | |||
| 200 | #define FLOAT_CHECK_DOMAIN | 200 | #define FLOAT_CHECK_DOMAIN |
| 201 | 201 | ||
| 202 | /* When $TERM is "internal" then this is substituted: */ | 202 | /* When $TERM is "internal" then this is substituted: */ |
| 203 | #define INTERNAL_TERMINAL "pc|bios|IBM PC with colour display:\ | 203 | #define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ |
| 204 | :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\ | 204 | :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\ |
| 205 | :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ | 205 | :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ |
| 206 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" | 206 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" |