upstream i think

11 files changed, 137 insertions, 113 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index f8ab274e136..b7929dbf453 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -31,6 +31,8 @@ Adam Sjøgren: changed spam.el blink.xpm braindamaged.xpm cry.xpm dead.xpm
   reverse-smile.xpm sad.xpm smile.xpm wry.xpm xterm.c gnus-html.el
   gnus-start.el gnus-sum.el gnus.el gtkutil.c shr.el xterm.h
 
+Adam W: changed mail-source.el
+
 Aditya Siram: changed ob.el
 
 Adrian Aichner: changed erc-log.el erc.el erc-autojoin.el erc-backend.el
@@ -193,9 +195,9 @@ Andreas Politz: changed editfns.c elp.el ido.el term.el
 Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
 
 Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c alloc.c
-  process.c coding.c files.el xterm.c editfns.c fns.c keyboard.c print.c
+  process.c coding.c files.el xterm.c editfns.c keyboard.c fns.c print.c
   emacs.c eval.c fileio.c lread.c sysdep.c dired.el xfns.c buffer.c
-  and 568 other files
+  and 571 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el
   gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el
@@ -497,8 +499,8 @@ Chong Yidong: wrote compile-tests.el dichromacy-theme.el
 and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed xdisp.c simple.el files.el display.texi frames.texi
   cus-edit.el files.texi keyboard.c startup.el package.el custom.el
-  emacs.texi xterm.c subr.el faces.el image.c mouse.el misc.texi
-  text.texi progmodes/compile.el xfns.c and 826 other files
+  emacs.texi xterm.c subr.el text.texi faces.el image.c mouse.el
+  misc.texi progmodes/compile.el xfns.c and 830 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -561,10 +563,11 @@ Christoph Bauer: changed configure.in
 Christoph Conrad: changed gnus-agent.el gnus-score.el makefile.w32-in
   qp.el
 
-Christoph Scholtes: changed makefile.w32-in progmodes/python.el INSTALL
-  README.W32 maintaining.texi zipdist.bat admin.el bookmark.el
-  configure.bat cua-base.el help-mode.el help.el ido.el makedist.bat
-  menu.c minibuf.c process.c progmodes/grep.el stdint.h vc.el window.c
+Christoph Scholtes: changed makefile.w32-in progmodes/python.el stdint.h
+  INSTALL README.W32 maintaining.texi zipdist.bat admin.el bookmark.el
+  config.nt configure.bat control.texi cua-base.el help-mode.el help.el
+  ido.el makedist.bat menu.c minibuf.c process.c progmodes/grep.el
+  and 3 other files
 
 Christoph Wedler: wrote antlr-mode.el
 and changed format.el gnus-art.el gnus-picon.el message.el register.el
@@ -759,9 +762,11 @@ David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
   mml2015.el nnfolder.el nnimap.el nnml.el
 
 David Engster: wrote mairix.el nnmairix.el
-and changed gnus.texi registry.el gnus-msg.el bovine-grammar.el
-  display.texi files.el gnus-registry.el gnus-sum.el hideshow.el
-  mairix-el.texi mm-view.el mml-smime.el nnimap.el
+and changed gnus.texi registry.el gnus-msg.el insert.el
+  analyze/complete.el base.el bovine-grammar.el cedet/srecode.el
+  cpp-root.el custom.el db-find.el db-typecache.el db.el dictionary.el
+  display.texi document.el ede-grammar.el files.el generic.el
+  gnus-registry.el gnus-sum.el and 21 other files
 
 David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el
   calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el
@@ -908,7 +913,7 @@ Derek Upham: changed nxml-mode.el
 
 Detlev Zundel: wrote re-builder.el
 
-Devon Sean McCullough: changed comint.el
+Devon Sean Mccullough: changed comint.el
 
 Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c
   sound.c w32proc.c
@@ -940,8 +945,8 @@ Dirk-Jan C. Binnema: changed org-agenda.el
 Dmitri Paduchikh: changed advice.el
 
 Dmitry Antipov: changed alloc.c keyboard.c buffer.c ccl.c editfns.c
-  emacs.c fontset.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c lwlib-utils.c
-  lwlib.c macmenu.c w32menu.c xlwmenu.c xmenu.c
+  emacs.c fontset.c keymap.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c
+  lwlib-utils.c lwlib.c macmenu.c w32menu.c xdisp.c xlwmenu.c xmenu.c
 
 Dmitry Bolshakov: changed hideshow.el
 
@@ -1018,8 +1023,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c] bidi.c rxvt.el
   tty-colors.el
 and changed makefile.w32-in msdos.c xdisp.c Makefile.in files.el
   config.bat fileio.c msdos.h simple.el mainmake.v2 sed1v2.inp info.el
-  rmail.el w32.c display.texi process.c pc-win.el startup.el dired.c
-  dispextern.h emacs.c and 695 other files
+  display.texi rmail.el w32.c process.c pc-win.el startup.el dispextern.h
+  dispnew.c dired.c and 697 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
   gnus.el
@@ -1162,7 +1167,8 @@ Fabian Ezequiel Gallina: changed progmodes/python.el
 
 Fabrice Bauzac: changed dired-aux.el
 
-Fabrice Popineau: changed etags.c fileio.c gnus-cache.el
+Fabrice Popineau: changed config.nt etags.c fileio.c gnus-cache.el
+  inttypes.h lisp.h ms-w32.h nmake.defs regex.c stdint.h w32.c
 
 Fan Kai: changed esh-arg.el
 
@@ -1320,8 +1326,8 @@ Giuseppe Scrivano: changed browse-url.el buffer.c configure.in sysdep.c
 Glenn Morris: wrote check-declare.el f90.el vc-bzr.el
 and changed Makefile.in configure.in calendar.el diary-lib.el rmail.el
   files.el cal-menu.el appt.el cal-hebrew.el fortran.el bytecomp.el
-  holidays.el make-dist calendar.texi emacs.texi sed1v2.inp simple.el
-  cal-islam.el cal-bahai.el startup.el ack.texi and 1202 other files
+  holidays.el make-dist calendar.texi emacs.texi simple.el sed1v2.inp
+  cal-islam.el cal-bahai.el startup.el ack.texi and 1208 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1552,7 +1558,7 @@ Jan Djärv: wrote dnd.el dynamic-setting.el x-dnd.el
 and changed gtkutil.c xterm.c xfns.c configure.in xmenu.c xterm.h
   gtkutil.h x-win.el keyboard.c Makefile.in nsterm.m frames.texi
   xsettings.c frame.c emacs.c xselect.c process.c xlwmenu.c config.in
-  cus-start.el xresources.texi and 302 other files
+  cus-start.el nsfns.m and 302 other files
 
 Jan Moringen: co-wrote srecode/cpp.el tango-dark-theme.el tango-theme.el
 and changed dbus.el dbus.texi dbusbind.c eieio.el log-edit.el zeroconf.el
@@ -1734,10 +1740,10 @@ Joel Ray Holveck: changed gnus-sum.el info.el
 Joev Dubach: changed nntp.el
 
 Johan Bockgård: changed erc.el cl-macs.el erc-backend.el erc-button.el
-  erc-match.el browse-url.el bytecomp.el custom.el display.texi
+  erc-match.el xdisp.c browse-url.el bytecomp.el custom.el display.texi
   erc-compat.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el
-  help-fns.el icomplete.el mouse-sel.el simple.el subr.el xdisp.c
-  xterm.el and 48 other files
+  help-fns.el icomplete.el mouse-sel.el simple.el subr.el xterm.el
+  and 48 other files
 
 Johan Euphrosine: changed ibuf-ext.el
 
@@ -1863,8 +1869,8 @@ and changed ob-octave.el
 Juanma Barranquero: wrote emacs-lock.el
 and changed makefile.w32-in subr.el w32fns.c files.el server.el bs.el
   emacsclient.c help-fns.el faces.el org.el simple.el buffer.c xdisp.c
-  keyboard.c process.c w32term.c desktop.el ido.el eval.c mule-cmds.el
-  w32.c and 1036 other files
+  keyboard.c process.c w32term.c window.c desktop.el ido.el allout.el
+  eval.c and 1084 other files
 
 Juergen Kreileder: changed imap.el nnimap.el
 
@@ -1895,7 +1901,7 @@ and changed info.el isearch.el simple.el replace.el progmodes/grep.el
   dired-aux.el progmodes/compile.el dired.el startup.el faces.el files.el
   display.texi menu-bar.el descr-text.el bindings.el cus-edit.el
   image-mode.el ispell.el man.el dired-x.el log-view.el
-  and 334 other files
+  and 335 other files
 
 Justin Bogner: changed fortune.el
 
@@ -2001,7 +2007,7 @@ Keith Gabryelski: wrote hexl.c hexl.el
 Keith Packard: changed font.c
 
 Ken Brown: changed configure.in cygwin.h sheap.c browse-url.el gmalloc.c
-  vm-limit.c dired.c emacs.c loadup.el mem-limits.h unexcw.c
+  vm-limit.c dired.c emacs.c gdb-mi.el loadup.el mem-limits.h unexcw.c
 
 Ken Brush: changed emacsclient.c
 
@@ -2169,7 +2175,8 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
 and changed gnus.texi gnus-cite.el pop3.el gnus-xmas.el smtpmail.el
   proto-stream.el auth-source.el xml.c dired.el editfns.c nnultimate.el
   subr.el gnus-nocem.el gnutls.c imap.el nnkiboze.el nnrss.el
-  nnslashdot.el spam-report.el gnus-cus.el simple.el and 205 other files
+  nnslashdot.el spam-report.el url-http.el gnus-cus.el
+  and 206 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -2323,7 +2330,7 @@ Mark Hood: changed gnus-uu.el
 
 Mark Lambert: changed process.c process.h
 
-Mark Lillibridge: changed mail-utils.el rmail.el
+Mark Lillibridge: changed rmail.el mail-utils.el unrmail.el
 
 Mark Mitchell: changed font-lock.el
 
@@ -2390,7 +2397,7 @@ Martin Neitzel: changed supercite.el
 Martin Pohlack: changed iimage.el pc-select.el
 
 Martin Rudalics: changed window.el window.c windows.texi frame.c buffer.c
-  frame.el help.el cus-edit.el cus-start.el files.el window.h
+  help.el window.h cus-start.el frame.el cus-edit.el files.el
   buffers.texi dired.el subr.el add-log.el xdisp.c font-lock.el
   help-fns.el lisp.h mouse.el wid-edit.el and 135 other files
 
@@ -2479,7 +2486,7 @@ and changed tramp.texi dbusbind.c trampver.texi dbus.texi trampver.el
   ange-ftp.el tramp-fish.el files.el tramp-imap.el files.texi Makefile.in
   tramp-vc.el tramp-util.el tramp-uu.el simple.el auth-source.el
   dired-aux.el configure.in em-unix.el fileio.c keyboard.c
-  and 64 other files
+  and 65 other files
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
@@ -2581,6 +2588,8 @@ Mikael Fornius: changed org.el org-habit.el
 
 Mike Haertel: changed 7300.h
 
+Mike Kazantsev: changed erc-dcc.el
+
 Mike Kupfer: changed mh-e.el mh-utils.el
 
 Mike Long: changed b2m.c make-dist make-mode.el netbsd.h view.el vms.h
@@ -2804,9 +2813,9 @@ and changed imenu.el make-mode.el
 Paul Eggert: wrote rcs2log vcdiff
 and co-wrote cal-dst.el
 and changed lisp.h Makefile.in editfns.c alloc.c xdisp.c configure.in
-  image.c fileio.c process.c fns.c xterm.c keyboard.c data.c dispextern.h
+  fileio.c image.c process.c fns.c xterm.c dispextern.h keyboard.c data.c
   lread.c sysdep.c xfns.c eval.c emacs.c config.in print.c
-  and 563 other files
+  and 564 other files
 
 Paul Fisher: changed fns.c
 
@@ -3356,9 +3365,9 @@ Stefan Monnier: wrote bibtex-style.el bzrmerge.el css-mode.el
   pcvs-util.el reveal.el smerge-mode.el smie.el vc-mtn.el
 and co-wrote font-lock.el
 and changed vc.el subr.el simple.el lisp.h keyboard.c files.el
-  Makefile.in bytecomp.el keymap.c xdisp.c pcvs.el alloc.c
-  progmodes/compile.el newcomment.el vc-hooks.el tex-mode.el buffer.c
-  sh-script.el eval.c fileio.c fill.el and 1030 other files
+  bytecomp.el Makefile.in keymap.c progmodes/compile.el xdisp.c pcvs.el
+  alloc.c newcomment.el vc-hooks.el tex-mode.el buffer.c fileio.c
+  sh-script.el eval.c fill.el and 1032 other files
 
 Stefan Reichör: changed gnus-agent.el
 
@@ -3508,7 +3517,7 @@ and changed subword.el image-mode.el Makefile.in cc-cmds.el emacsbug.el
   gnus-art.el gnus.texi nnimap.el files.el gnus-sum.el info.el
   org-footnote.el org.el reftex-ref.el simple.el tsdh-dark-theme.el
   tsdh-light-theme.el ack.texi bindings.el bookmark.el cc-mode.el
-  and 21 other files
+  and 22 other files
 
 Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
@@ -3520,10 +3529,10 @@ Teemu Likonen: changed dired.el gnus-agent.el message.el
 
 Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el
   gnus-tests.el gnutls.el registry.el spam-report.el url-future.el
-and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el auth.texi
-  gnus-util.el netrc.el gnus-start.el gnutls.c message.el spam-stat.el
-  encrypt.el nnmail.el imap.el mail-source.el Makefile.in gnus-encrypt.el
-  gnus-html.el gnus-int.el gnutls.h and 97 other files
+and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el gnus-util.el
+  auth.texi netrc.el gnus-start.el gnutls.c message.el spam-stat.el
+  encrypt.el nnir.el nnmail.el imap.el mail-source.el nnmairix.el
+  Makefile.in gnus-encrypt.el gnus-html.el and 97 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -3839,8 +3848,8 @@ Yann Dirson: changed imenu.el
 
 Yann Hodique: changed rcirc.el
 
-Yavor Doganov: changed configure.in Info-gnustep.plist emacs.1 etags.1
-  make-dist nsfont.m
+Yavor Doganov: changed configure.in Info-gnustep.plist Makefile.in
+  emacs.1 etags.1 make-dist nsfont.m
 
 Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
 
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 4ab75dcfc45..f02b795a6b9 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1584,7 +1584,7 @@ message (closes SF #701756).
 MH-E now supports several spam filters including Bogofilter,
 SpamProbe, and SpamAssassin. Spam that is mistakenly considered to be
 good mail can be reclassified as spam with "J b (mh-junk-blacklist)".
-Conversely, good mail that is accidently considered to be spam can be
+Conversely, good mail that is accidentally considered to be spam can be
 reclassified with "J w (mh-junk-whitelist)" (closes SF #669518).
 
 If a message is blacklisted, and `mh-junk-mail-folder' is a string,
diff --git a/etc/NEWS b/etc/NEWS
index b9192c72b5e..fe481c4ed8f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -253,6 +253,7 @@ off by customizing x-gtk-use-system-tooltips.
 ** New basic faces `error', `warning', `success' are available to
 highlight strings that indicate failure, caution or successful operation.
 
+---
 ** Lucid menus and dialogs can display antialiased fonts if Emacs is built
 with Xft.  To change font, use the X resource font, for example:
 Emacs.pane.menubar.font:  Courier-12
@@ -379,7 +380,7 @@ The elisp implementation sha1.el is removed. Feature sha1 is provided
 by default.
 
 ** Menu-bar changes
-
+---
 *** `menu-bar-select-buffer-function' lets you choose another operation
 instead of `switch-to-buffer' when selecting an item in the Buffers menu.
 
@@ -550,6 +551,13 @@ at high rate, e.g. if you lean on some key, because stopping redisplay
 in the middle (when this variable is nil) forces more expensive
 updates later on, and Emacs appears to be unable to keep up.
 
++++
+** The behavior of <TAB> for active regions in Text mode has changed.
+In Text and related modes, typing <TAB> (`indent-for-tab-command')
+when the region is active causes Emacs to indent all the lines in the
+region, aligning them with the line previous to the first line in the
+region (or with the left margin if there is no previous line).
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
@@ -725,6 +733,11 @@ more variants, including Mercury, and a lot more.
 *** The command `rmail-epa-decrypt' decrypts OpenPGP data
 in the Rmail incoming message.
 
+---
+*** The variable `rmail-message-filter' no longer has any effect.
+This change was made in Emacs 23.1 but was not advertised at the time.
+Try using `rmail-show-message-hook' instead.
+
 ** Shell mode
 
 *** Shell mode uses pcomplete rules, with the standard completion UI.
@@ -1327,6 +1340,8 @@ as well as those in the -*- line.
 
 ** keymaps can inherit from multiple parents.
 
+** `debug-on-event' lets you debug Emacs when stuck because of inhibit-quit.
+
 +++
 ** New reader macro ## which stands for the empty symbol.
 This means that the empty symbol can now be read back.  Also, #: by itself
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index dc9922ed989..8b861cca875 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1198,7 +1198,7 @@ them with `\='.  For example, "\\=\\= is the way to quote \\=\\["
 will come out as `\= is the way to quote \['.
 
 The new function `substitute-command-keys' takes a string possibly
-contaning \[...] constructs and replaces those constructs with
+containing \[...] constructs and replaces those constructs with
 the key sequences they currently stand for.
 
 * Primitives `find-line-comment' and `find-line-comment-body' flushed.
@@ -1630,7 +1630,7 @@ Changes in Emacs 1.12
  read-char now returns a value in the range 128-255 if
  a Meta character is typed.  When interpreted as command
  input, a Meta character is equivalent to a two character
- sequence, the meta prefix character followed by the un-metized
+ sequence, the meta prefix character followed by the unmetized
  character (Meta-G unmetized is G).
 
  The meta prefix character
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 5e95e40b04c..87d77cf52fc 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -163,7 +163,7 @@ delimiters will appear to be fontified (in the new face
 customize `font-lock-comment-face'. Another alternative is to use a
 newer terminal emulator that supports more colors (256 is now common).
 For example, for xterm compatible emulators that support 256 colors,
-you can run emacs like this: 
+you can run emacs like this:
 env TERM=xterm-256color emacs -nw
 (This was new in Emacs 22.1, but was not described.  In Emacs 22.1
 this also happened for terminals with a light background, that is not
@@ -280,13 +280,13 @@ the files mac/README and mac/INSTALL for build instructions.
 ** Support for FreeBSD/Alpha has been added.
 
 ** New translations of the Emacs Tutorial are available in the
-following languages: Brasilian Portuguese, Bulgarian, Chinese (both
+following languages: Brazilian Portuguese, Bulgarian, Chinese (both
 with simplified and traditional characters), French, Russian, and
 Italian.  Type `C-u C-h t' to choose one of them in case your language
 setup doesn't automatically select the right one.
 
 ** New translations of the Emacs reference card are available in the
-Brasilian Portuguese and Russian.  The corresponding PostScript files
+Brazilian Portuguese and Russian.  The corresponding PostScript files
 are also included.
 
 ** A French translation of the `Emacs Survival Guide' is available.
@@ -1026,7 +1026,7 @@ parts of the mode line.
 
 *** `shadow' face defines the appearance of the "shadowed" text, i.e.
 the text which should be less noticeable than the surrounding text.
-This can be achieved by using shades of grey in contrast with either
+This can be achieved by using shades of gray in contrast with either
 black or white default foreground color.  This generic shadow face
 allows customization of the appearance of shadowed text in one place,
 so package-specific faces can inherit from it.
@@ -2558,10 +2558,10 @@ is nil).
 
 *** Minor Improvements
 
-**** The STARTTLS wrapper (starttls.el) can now use GNUTLS
+**** The STARTTLS wrapper (starttls.el) can now use GnuTLS
 instead of the OpenSSL based `starttls' tool.  For backwards
 compatibility, it prefers `starttls', but you can toggle
-`starttls-use-gnutls' to switch to GNUTLS (or simply remove the
+`starttls-use-gnutls' to switch to GnuTLS (or simply remove the
 `starttls' tool).
 
 **** Do not allow debugger output history variable to grow without bounds.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 9b8909d794a..4e541c0deb3 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -793,7 +793,7 @@ starts the server.  Clients can connect and create graphical or
 terminal frames using emacsclient.
 
 **** emacsclient starts emacs in daemon mode and connects to it when
---alternate-editor="" is used (or when the evironment variable
+--alternate-editor="" is used (or when the environment variable
 ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an
 emacs server.
 
@@ -1027,8 +1027,8 @@ motion keys (e.g. S-left and S-down) activate and extend a temporary
 region, similar to mouse-selection.
 
 *** Temporarily active regions, created using shift-selection or
-mouse-selection, are not necessarily deactivated in the next command.
-They are only deactivated after point motion commands that are not
+mouse-selection, are not necessarily deactivated after the next command.
+They are deactivated only after point motion commands that are not
 shift-translated, or after commands that would ordinarily deactivate
 the mark in Transient Mark mode (e.g., any command that modifies the
 buffer).
diff --git a/etc/TODO b/etc/TODO
index f9d37c4b965..5acd8734ad0 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -841,7 +841,7 @@ more detailed diagnosis.
 
 **** Provide an Error Summary buffer showing all the validation errors.
 
-**** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
+**** Pop-up menu.  What is useful?  Tag a region (should be grayed out if
 the region is not balanced).  Suggestions based on error messages.
 
 **** Have configurable list of namespace URIs so that we can provide
diff --git a/etc/e/eterm-color.ti b/etc/e/eterm-color.ti
index 0ddb7ec5408..a6ef8149900 100644
--- a/etc/e/eterm-color.ti
+++ b/etc/e/eterm-color.ti
@@ -7,7 +7,7 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 # When updating this file, etc/e/eterm-color should be regenerated by 
 # running "make e/eterm-color" in the etc directory.
 # Any change to this file should be done at the same time with a
-# corresponding change to the TERMCAP evironment variable in term.el.
+# corresponding change to the TERMCAP environment variable in term.el.
 # Comments in term.el specify where each of these capabilities is implemented.
         colors#8,
         cols#80,
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index b164a28842e..9f13974584d 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -13,7 +13,7 @@
 %
 %   latex gnus-refcard.tex &&
 %   dvips -t letter -f gnus-refcard.dvi > gnus-refcard.ps
-%   
+%
 %   latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' &&
 %   mv gnus-refcard.dvi gnus-booklet.dvi &&
 %   dvips -t letter -f gnus-booklet.dvi > gnus-booklet.ps
@@ -35,16 +35,16 @@
 
 \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   % Reference Card
-  
+
   \def\Guide{Card}\def\guide{card}
   \def\logoscale{0.25}
-  
+
   % Page setup for the refcard:
-  
+
   % \setlength{\textwidth}{7.26in} \setlength{\textheight}{10in}
   % \setlength{\topmargin}{-1.0in}
   % % the same settings work for A4, although there is a bit of space at the
-  % % top and bottom of the page. 
+  % % top and bottom of the page.
   % \setlength{\oddsidemargin}{-0.5in} \setlength{\evensidemargin}{-0.5in}
 
   \ifthenelse{\isundefined{\letterpapertrue}}{
@@ -52,19 +52,19 @@
   }{
     \geometry{hmargin=20mm,tmargin=10mm,bmargin=12mm}
   }
-  
+
 }{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   % Reference Booklet
-  
+
   \def\Guide{Booklet}\def\guide{booklet}
   \def\logoscale{0.5}% FIXME: too large for 2up printing?  --rsteib
-  
+
   \ifthenelse{\isundefined{\letterpapertrue}}{
     \geometry{a5paper,hmargin=10mm,tmargin=10mm,bmargin=4mm}
   }{
     \geometry{a5paper,hmargin=20mm,tmargin=10mm,bmargin=4mm}
   }
-  
+
   \def\sec{\section}
   \def\subsec{\subsection}
   \def\subsubsec{\subsubsection}
@@ -73,7 +73,7 @@
   \par\vspace*{\fill}\pagebreak}
 }%ifbooklet% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %  
+% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %
 %% include file for the Gnus refcard and booklet
 
 \def\progver{5.11} % program version
@@ -218,7 +218,7 @@
       \hline
       \multicolumn{2}{|p{\markdblcolwidth}|}{{\bf ``Read'' Marks.}
         All these marks appear in the first column of the summary line, and so
-        are mutually exclusive.}\\ 
+        are mutually exclusive.}\\
       \hline
       ` ' & (M-u, M SPC, M c) Not read.\\
       !   & (!, M !, M t) Ticked (interesting).\\
@@ -284,7 +284,7 @@
               [Prefix: use group under point to find posting-style].\\
     b       & Find {\bf bogus} groups and delete them.\\
     c       & Mark all unticked articles in group as read ({\bf catch-up}).
-    [p/p]\\ 
+    [p/p]\\
     g       & Check the server for new articles ({\bf get}). [level]\\
     M-g     & Check the server for new articles in this group ({\bf get}). [p/p]\\
     j       & {\bf Jump} to a group.\\
@@ -292,14 +292,14 @@
               [Prefix: use group under point to find posting-style].\\
     n       & Go to the {\bf next} group with unread articles. [distance]\\
     M-n     & Go to the {\bf next} group on the same or lower level.
-    [distance]\\ 
+    [distance]\\
     p       & (DEL) Go to the {\bf previous} group with unread articles.
-    [distance]\\ 
-    M-p     & Go to the {\bf previous} group on the same or lower level. [distance]\\ 
+    [distance]\\
+    M-p     & Go to the {\bf previous} group on the same or lower level. [distance]\\
     q       & {\bf Quit} Gnus.\\
     r       & Re-read the init file ({\bf reset}).\\
     s       & {\bf Save} `.newsrc.eld' file (and `.newsrc' if
-    `gnus-save-newsrc-file').\\ 
+    `gnus-save-newsrc-file').\\
     z       & Suspend (kill all buffers of) Gnus.\\
     B       & {\bf Browse} a foreign server.\\
     C       & Mark all articles in this group as read ({\bf Catch-up}). [p/p]\\
@@ -312,7 +312,7 @@
     M-c     & Clear data from group (marks and list of read articles). \\
     C-c C-s & {\bf Sort} the groups by name, number of unread articles, or level
     (depending on `gnus-group-sort-function').\\
-    C-c C-x & Run all expirable articles in group through the {\bf expiry} 
+    C-c C-x & Run all expirable articles in group through the {\bf expiry}
     process.\\
     C-c M-C-x & Run all articles in all groups through the {\bf expiry} process.\\
     C-c M-g & Activate all {\bf groups}.\\
@@ -324,7 +324,7 @@
     ange-ftp). [Prefix: query for group]\\
     H v     & (V) Display the Gnus {\bf version} number.\\
     H d     & (C-c C-d) Show the {\bf description} of this group
-    [Prefix: re-read from server].\\ 
+    [Prefix: re-read from server].\\
     M-d     & {\bf Describe} all groups. [Prefix: re-read from server]\\
     D g     & Regenerate a Sieve script from group parameters.\\
     D u     & Regenerate Sieve script and {\bf upload} to server.\\
@@ -334,17 +334,17 @@
 \newcommand{\ListGroups}{%
   {\esamepage
     \begin{keys}{A M}
-      A d     & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\ 
+      A d     & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\
       A k     & (C-c C-l) List all {\bf killed} groups.
       [Prefix: look at active-file from server]\\
       A l     & List all groups on a specific level.
       [Prefix: also list groups with no unread articles]\\
       A a     & (C-c C-a) List all groups whose names match a regexp
-      ({\bf apropos}).\\ 
+      ({\bf apropos}).\\
       A A     & List the server's active-file.\\
       A M     & List groups that {\bf match} a regexp.\\
-      A m     & List groups that {\bf match} a regexp and have unread articles. 
-      [level]\\ 
+      A m     & List groups that {\bf match} a regexp and have unread articles.
+      [level]\\
       A s     & (l) List all {\bf subscribed} groups with unread articles.
       [level; 5 and lower is the default]\\
       A u     & (L) List all groups (including read and {\bf unsubscribed}).
@@ -354,7 +354,7 @@
       A ?     & List all groups with dormant articles. [level]\\
     \end{keys}
   }
-  
+
   \newcommand{\CreateEditGroups}{%
     {\esamepage
       The select methods are indicated in parentheses.\\*
@@ -404,8 +404,8 @@
       M m     & (\#) Set the process {\bf mark} on this group. [scope]\\
       M r     & Mark all groups matching regular expression.\\
       M u     & (M-\#) Remove process mark from this group ({\bf unmark}).
-      [scope]\\ 
-      M U     & Remove the process mark from all groups (\textbf{umark all}).\\
+      [scope]\\
+      M U     & Remove the process mark from all groups (\textbf{unmark all}).\\
       M w     & Mark all groups in the current region. [prefix: unmark]\\
       M b     & Mark all groups in the {\bf buffer}. [prefix: unmark]\\
     \end{keys}}
@@ -427,7 +427,7 @@
         T DEL   & Delete an empty topic.\\
         T \#    & Mark all groups in the current topic with the process-mark.\\
         T M-\#  & Remove the process-mark from all groups in the current topic.\\
-        T TAB   & (TAB) Indent current topic [Prefix: unindent].\\ 
+        T TAB   & (TAB) Indent current topic [Prefix: unindent].\\
         M-TAB   & Unindent the current topic.\\
         RET     & (SPC) Either unfold topic or enter group [level].\\
         T s     & {\bf Show} the current topic. [Prefix: show permanently]\\
@@ -478,7 +478,7 @@
     {\esamepage
       \begin{keys}{M-RET}
         SPC     & (A SPC, A n) Select an article, scroll it one page, move to the
-        next one.\\ 
+        next one.\\
         DEL     & (A DEL, A p, b) Scroll this article one page back. [distance]\\
         RET     & (A RET) Scroll this article one line forward. [distance]\\
         M-RET   & (A M-RET) Scroll this article one line backward. [distance]\\
@@ -490,9 +490,9 @@
         M-\&    & Execute a command on all articles having the process mark.\\
                                 %
         M-n     & (G M-n) Go to {\bf next} summary line of unread article.
-        [distance]\\ 
-        M-p     & (G M-p) Go to {\bf previous} summary line of an unread article. 
-        [distance]\\ 
+        [distance]\\
+        M-p     & (G M-p) Go to {\bf previous} summary line of an unread article.
+        [distance]\\
         M-s     & {\bf Search} through all subsequent articles for a regexp.\\
         M-r     & Search through all previous articles for a regexp.\\
                                 %
@@ -519,7 +519,7 @@
         M-C-d   & Like C-d, but open several documents in nndoc-groups, wrapped
         in an nnvirtual group [p/p]\\
                                 %
-        A g     & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ 
+        A g     & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\
         A r     & (\^{}, A \^{}) Fetch the parent(s) of this article.
         [Prefix: if positive fetch \textit{n} ancestors;
         negative: fetch only the \textit{n}th ancestor]\\
@@ -541,7 +541,7 @@
       prefix selects which part to operate on. If the point is placed over a
       MIME button in the article buffer, use the corresponding bindings for the
       article buffer instead.
-      
+
       \begin{keys}{W M w}
         K v      & (b, W M b) {\bf View} the MIME-part.\\
         K o      & {\bf Save} the MIME part.\\
@@ -597,7 +597,7 @@
         B t     & {\bf Trace} the fancy splitting patterns applied to this article.\\
         B w     & (e) Edit this article.\\
         B M-C-e & {\bf Expunge} (delete from disk) all expirable articles in this group
-        (!). [p/p]\\ 
+        (!). [p/p]\\
         K E     & {\bf Encrypt} article body. [p/p]\\
       \end{keys}
       }
@@ -665,7 +665,7 @@
         W 6     & Translate a base64 article.\\
         W a     & Strip certain {\bf headers} from body.\\
         W b     & Make Message-IDs and URLs in the article mouse-clickable
-        {\bf buttons}.\\  
+        {\bf buttons}.\\
         W c     & Translate CRLF-pairs to LF and then remaining CR's to LF's.\\
         W d     & Treat {\bf dumbquotes}.\\
         W e     & Treat {\bf emphasized} text.\\
@@ -698,7 +698,7 @@
       }
     }
 
-  \newcommand{\BlankAndWhitespace}{% 
+  \newcommand{\BlankAndWhitespace}{%
     {\esamepage
       \begin{keys}{W E w}
         W E l   & Strip blank {\bf lines} from the beginning of the article.\\
@@ -715,7 +715,7 @@
       }
     }
 
-  \newcommand{\Picons}{% 
+  \newcommand{\Picons}{%
     {\esamepage
       \begin{keys}{W D D}
         W D s   & (W g) Display {\bf smilies}.\\
@@ -729,7 +729,7 @@
       }
     }
 
-  \newcommand{\TimeAndDate}{% 
+  \newcommand{\TimeAndDate}{%
     {\esamepage
       \begin{keys}{W T u}
         W T u   & (W T z) Display the article timestamp in GMT ({\bf UT, ZULU}).\\
@@ -739,7 +739,7 @@
         W T e   & Display the time {\bf elapsed} since it was sent.\\
         W T o   & Display the {\bf original} timestamp.\\
         W T p   & Display the date in format that's {\bf
-          pronounceable} in English.\\        
+          pronounceable} in English.\\
       \end{keys}
       }
     }
@@ -793,26 +793,26 @@
     {\esamepage
       \begin{keys}{M M-C-r}
         d       & (M d, M r) Mark this article as read and move to the next one.
-        [scope]\\ 
+        [scope]\\
         D       & Mark this article as read and move to previous one. [scope]\\
         !       & (u, M !, M t) Tick this article (mark it as interesting) and move
         to the next one. [scope]\\
-        U       & Tick this article and move to the previous one. [scope]\\ 
+        U       & Tick this article and move to the previous one. [scope]\\
         M ?     & (?) Mark this article as dormant (only followups are
-        interesting). [scope]\\ 
+        interesting). [scope]\\
         M D     & Show all {\bf dormant} articles (normally they are hidden unless they
         have any followups).\\
         M M-D   & Hide all {\bf dormant} articles.\\
         C-w     & Mark all articles between point and mark as read.\\
         M-u     & (M SPC, M c) Clear all marks from this article and move to the next
-        one. [scope]\\ 
+        one. [scope]\\
         M-U     & Clear all marks from this article and move to the previous one.
         [scope]\\
                                 %
         M e     & (E, M x) Mark this article as {\bf expirable}. [scope]\\
                                 %
         M k     & (k) {\bf Kill} all articles with same subject, select
-        next unread one.\\ 
+        next unread one.\\
         M K     & (C-k) {\bf Kill} all articles with the same subject as this one.\\
                                 %
         M C     & {\bf Catch-up} the articles that are not ticked and not dormant.\\
@@ -842,7 +842,7 @@
   }
 
 \newcommand{\ProcessMark}{%
-  {\esamepage 
+  {\esamepage
     These commands set and remove the process mark (\#). You only need to use
     it if the set of articles you want to operate on is non-contiguous. Else
     use a numeric prefix.\\*
@@ -929,7 +929,7 @@
                                 %After
                                 %editing the article, send it by pressing C-c C-c.  If you are in a
                                 %foreign group and want to post the article using the foreign server, give
-                                %a prefix to C-c C-c.\\* 
+                                %a prefix to C-c C-c.\\*
     \begin{keys}{S O m}
       S p     & (a) {\bf Post} an article to this group.\\
       S f     & (f) Post a {\bf followup} to this article.\\
@@ -965,7 +965,7 @@
                                 %
       S O m   & Digest these series and forward by {\bf mail}. [p/p]\\
       S O p   & Digest these series and forward as a {\bf post} to a newsgroup.
-      [p/p]\\ 
+      [p/p]\\
                                 %
       S u     & {\bf Uuencode} a file and post it as a series.\\
     \end{keys}
@@ -1036,8 +1036,8 @@
     \quad \B{l}ifetime: t)emporary, p)ermanent, i)mmediate.
 
     If you type the second letter in uppercase, the remaining two are assumed
-    to be s)ubstring and t)emporary. 
-    If you type the third letter in uppercase, the last one is assumed to be 
+    to be s)ubstring and t)emporary.
+    If you type the third letter in uppercase, the last one is assumed to be
     t)emporary.
 
     \quad Extra keys for manual editing of a score file:\\*
@@ -1057,7 +1057,7 @@
     archives, they are expanded and gathered in a new group.\\*
     \begin{keys}{X p}
       X b     & Un-{\bf binhex} these series. [p/p]\\
-      X o     & Simply {\bf output} these series (no decoding). [p/p]\\ 
+      X o     & Simply {\bf output} these series (no decoding). [p/p]\\
       X p     & Unpack these {\bf postscript} series. [p/p]\\
       X s     & Un-{\bf shar} these series. [p/p]\\
       X u     & {\bf Uudecode} these series. [p/p]\\
@@ -1259,7 +1259,7 @@
     }
   }
 
-% end   {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %  
+% end   {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %
 
 
 % o some things might not be updated: scoring and server modes, maybe more
@@ -1333,7 +1333,7 @@
     \SortSummary
     \subsection*{Score (Value) Commands}
     \Scoring
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \subsection*{Output Articles}
   \OutputArticles
@@ -1343,7 +1343,7 @@
 
     \subsection*{MIME operations from the Summary-Buffer}
     \MIMESummary
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{}{% ifbooklet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \subsection*{Extract Series (Uudecode etc)}
   \ExtractSeries
@@ -1354,7 +1354,7 @@
 %
     \subsection*{Post, Followup, Reply, Forward, Cancel}
     \PostReplyetc
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{\newpage}{}% newpage ifcard
 
       \subsection*{Message Composition}
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 0fbd9496969..1a4ca82f438 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -22,7 +22,7 @@
 ;;; Code:
 
 (deftheme deeper-blue
-  "Face colors using a deep blue backgound.")
+  "Face colors using a deep blue background.")
 
 (let ((class '((class color) (min-colors 89))))
   (custom-theme-set-faces
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
index 98c74b268af..cf6ae543575 100644
--- a/etc/themes/light-blue-theme.el
+++ b/etc/themes/light-blue-theme.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (deftheme light-blue
-  "Face colors utilizing a light blue backgound.")
+  "Face colors utilizing a light blue background.")
 
 (let ((class '((class color) (min-colors 89))))
   (custom-theme-set-faces