Merged from miles@gnu.org--gnu-2005 (patch 470-473)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-470
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-471
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-472
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-473
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-376

14 files changed, 593 insertions, 456 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 747117a279b..a40afc7733a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,56 @@
+2005-07-07  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule.el (make-coding-system): Describe
+        `ascii-incompatible' property in the docstring.
+        (set-file-name-coding-system): Signal an error if coding-system is
+        ascii-incompatible.
+        (set-keyboard-coding-system): Likewise.
+
+        * international/mule-cmds.el (set-default-coding-systems): Don't
+        set default-file-name-coding-system and
+        default-keyboard-coding-system if coding-system is
+        ASCII-incompatible.
+
+        * international/utf-16.el: Declare that all UTF-16-based coding
+        systems ASCII-incompatible.
+
+2005-07-07  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el: Require font-lock for displaying errors.
+        Used by gdb-ui.el.
+
+2005-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * hi-lock.el (hi-lock-find-patterns): Protect also against invalid
+        values for the pattern lists which are `read'able but not
+        `append'able (like symbols).
+
+2005-07-06  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/flymake.el (flymake-float-time): Instead of
+        with-no-warnings, test for xemacs.
+        (flymake-replace-regexp-in-string): Test fboundp of replace-in-string
+        to avoid warning.
+
+2005-07-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32-vars.el (w32-fixed-font-alist): Fix typo in `defcustom' tag.
+
+2005-07-05  Lute Kamstra  <lute@gnu.org>
+
+        * battery.el: Add support for Darwin (with much debugging help
+        from Samuel Lauber <sam124@operamail.com>).
+        (battery-status-function, battery-echo-area-format)
+        (battery-mode-line-format): Add support for pmset on Darwin.
+        (battery-load-low, battery-load-critical): New user options.
+        (battery-pmset): New function.
+
+2005-07-05  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
+        * textmodes/page-ext.el: Update FSF's address.
+
 2005-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/lisp-mode.el (lisp-mode-variables): Prevent adaptive
@@ -352,7 +405,7 @@
         font-lock-regexp-backslash.  Doc fix.
         (font-lock-regexp-backslash-grouping-construct): Rename from
         font-lock-regexp-backslash-construct.  Doc fix.
-        (lisp-font-lock-keywords-2): Fix highlighting of ELisp regexp
+        (lisp-font-lock-keywords-2): Fix highlighting of Elisp regexp
         grouping constructs.
 
 2005-07-02  Eli Zaretskii  <eliz@gnu.org>
@@ -628,7 +681,7 @@
         (facemenu-get-face): Delete function.
         (facemenu-set-face-from-menu): Don't call facemenu-get-face.
         (facemenu-add-new-color): Make second argument mandatory.
-        Create the approprate face and return it.  Simplify.
+        Create the appropriate face and return it.  Simplify.
         (facemenu-set-foreground, facemenu-set-background): Don't check if
         color is defined.  Use return value of facemenu-add-new-color.
 
@@ -2338,7 +2391,7 @@
 
 2005-05-30  Juanma Barranquero  <lekktu@gmail.com>
 
-        * thumbs.el (thumbs-thumbname): The resulting thubname now
+        * thumbs.el (thumbs-thumbname): The resulting thumbname now
         includes a hash value to improve its uniqueness, and has a ".jpg"
         extension.  Also, it is now a valid filename on all systems.
         (thumbs-make-thumb): Use `let', not `let*'.
@@ -2704,7 +2757,7 @@
         (gdb-get-selected-frame): Rename from gdb-get-current-frame.
         (gdb-frame-number): Rename from gdb-current-stack-level.
         (gdb-ann3): Match new mode-name for disassembly buffer.
-        Extend initialisation of variables.
+        Extend initialization of variables.
         (gdb-post-prompt): Update disassembly from gdb-frame-handler.
         (gdb-memory-mode): Use mouse-face in header line.
         (gdb-assembler-buffer-name): Call it disassembly and give frame
@@ -3207,7 +3260,7 @@
         overlay initializations.
         (reftex-highlight): Use `reftex-move-overlay'.
         (reftex-unhighlight): Use `reftex-delete-overlay'.
-        (reftex-uniq): Funktion removed.  Use `reftex-uniquify' instead.
+        (reftex-uniq): Function removed.  Use `reftex-uniquify' instead.
         (reftex-access-search-path): Use `reftex-uniquify' instead of
         `reftex-uniq'
 
@@ -3866,7 +3919,7 @@
 
         * progmodes/gud.el: Move code for GUD tooltips from tooltip.el.
         (require): CL needed to compile case.
-        (gud-tooltip-mode): Use to toggle GUD tooltips unstead of
+        (gud-tooltip-mode): Use to toggle GUD tooltips instead of
         tooltip-gud-tips-p.  Make it a minor-mode.
         (gud-find-file): Only prepare GUD tooltips if gud-tooltip-mode is t.
         (gud-menu-map): GUD tooltips use gud-tooltip-mode now.
@@ -4011,7 +4064,7 @@
 
 2005-05-04  Nick Roberts  <nickrob@snap.net.nz>
 
-        * progmodes/cmacexp.el (c-macro-preprocessor): Update for Mac OSX.
+        * progmodes/cmacexp.el (c-macro-preprocessor): Update for Mac OS X.
 
 2005-05-04  Richard M. Stallman  <rms@gnu.org>
 
@@ -4208,7 +4261,7 @@
 2005-04-30  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/cc-mode.el (cc-create-define-alist): Check that file
-        exists.  Initialise cc-define-alist.
+        exists.  Initialize cc-define-alist.
         (c-mode): Add cc-create-define-alist locally to after-save-hook.
         If there is no file (Macroexpansion) don't create an alist.
 
@@ -4300,7 +4353,7 @@
 
         * progmodes/cc-mode.el (cc-create-define-alist): New function.
         (cc-define-alist): New variable.
-        (c-mode): Make it local and initialise it.
+        (c-mode): Make it local and initialize it.
 
         * progmodes/gdb-ui.el (gdb-active-process): New variable.
         (gdb-exited): New function.
@@ -4831,7 +4884,7 @@
         (org-last-todo-state-is-todo): New variable.
         (org-todo): Set `org-last-todo-state-is-todo'.
         (org-agenda-todo): Change face according to
-        `org-last-todo-state-is-todo'.  And change other lines refering to
+        `org-last-todo-state-is-todo'.  And change other lines referring to
         the same entry.
         (org-calendar-goto-agenda): New command.
         (org-calendar-to-agenda-key): New option.
@@ -5713,7 +5766,7 @@
 
 2005-03-30  Nick Roberts  <nickrob@snap.net.nz>
 
-        * progmodes/gud.el (gdb): (Re)-initialise gud-filter-pending-text.
+        * progmodes/gud.el (gdb): (Re)-initialize gud-filter-pending-text.
         (gud-filter-pending-text): Move in front of gdb.
         (gud-overlay-arrow-position): New variable.
         (gud-sentinel, gud-display-line): Use it in place of
@@ -6318,7 +6371,7 @@
 2005-03-19  Michael R. Mauger  <mmaug@yahoo.com>
 
         * recentf.el (recentf-cleanup-remote): New variable.
-        (recentf-cleanup): Use it to conditionally check availablity of
+        (recentf-cleanup): Use it to conditionally check availability of
         remote files.
 
 2005-03-19  Joe Edmonds  <joe-bugs-debian-org@elem.com>  (tiny change)
@@ -6595,7 +6648,7 @@
         * simple.el (next-line, previous-line): Add optional try-vscroll
         arg to recognize interactive use.  Pass it on to line-move.
         (line-move): Don't perform auto-window-vscroll when defining or
-        executing keyboard macro to ensure consistent behaviour.
+        executing keyboard macro to ensure consistent behavior.
 
 2005-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -6691,7 +6744,7 @@
         * tooltip.el (tooltip-mode): Use define-minor-mode and simplify.
         (tooltip-activate-mouse-motions-if-enabled): Use dolist.
         (tooltip-gud-tips): Simplify.
-        (tooltip-gud-tips-p): Remove superflouous :set.
+        (tooltip-gud-tips-p): Remove superfluous :set.
         (tooltip-gud-modes): Add fortran-mode.
         (gdb-tooltip-print): Remove newline for tooltip-use-echo-area.
 
@@ -7844,7 +7897,7 @@
         * progmodes/gdb-ui.el (gdb-info-breakpoints-custom)
         (gdb-goto-breakpoint): Make breakpoint handling work on template
         functions in C++.  Reported by Martin Reed <mjreed@essex.ac.uk>
-        (gdb-assembler-custom): Update to recognise breakpoint information
+        (gdb-assembler-custom): Update to recognize breakpoint information
         added on 2005-01-19.
 
 2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -8013,7 +8066,7 @@
 2005-01-19  Steven Tamm  <steventamm@mac.com>
 
         * term/mac-win.el (process-connection-type): Use new
-        operating-system-release variable to use ptys on Darwin 7 (OSX
+        operating-system-release variable to use ptys on Darwin 7 (OS X
         10.3) when using carbon build.
 
 2005-01-19  Jay Belanger  <belanger@truman.edu>
@@ -9502,7 +9555,7 @@
 
 2004-12-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * term.el (term-termcap-format): Synchronyze with terminfo.
+        * term.el (term-termcap-format): Synchronize with terminfo.
         (term-emulate-terminal): Handle reset.
         (term-reset-terminal): New function.
 
@@ -12610,7 +12663,7 @@
 
 2004-10-06  Nick Roberts  <nickrob@snap.net.nz>
 
-        * progmodes/gdb-ui.el (gdb-ann3): (Re-)initialise gdb-input-queue.
+        * progmodes/gdb-ui.el (gdb-ann3): (Re-)initialize gdb-input-queue.
 
 2004-10-06  John Paul Wallington  <jpw@gnu.org>
 
@@ -12773,7 +12826,7 @@
         (term-mode): Set `indent-tabs-mode' to nil.
         (term-paste): New function to be bound to S-insert.
         (term-send-del, term-send-backspace): Change the strings sent.
-        (term-termcap-format): Synchronyze with etc/e/eterm.ti.
+        (term-termcap-format): Synchronize with etc/e/eterm.ti.
         (term-handle-colors-array): Fix handling of underline and reverse.
         (term-handle-ansi-escape): Do not handle smcup/rmcup.  Add comments.
         (term-erase-in-line): Fix comparison.
@@ -12836,7 +12889,7 @@
         easter, not all easter holidays.  Various Easter holidays moved to
         `christian-holidays' variable in calendar.el.
         * calendar/calendar.el (christian-holidays): Adapt for new
-        behaviour of `holiday-advent' and `holiday-easter-etc' functions.
+        behavior of `holiday-advent' and `holiday-easter-etc' functions.
 
 2004-09-23  Kim F. Storm  <storm@cua.dk>
 
@@ -13003,14 +13056,14 @@
 
         * term.el (term-down): Perform vertical motion if DOWN is negative.
         (term-exec-1): Set both TERMCAP and TERMINFO unconditionally.
-        (term-termcap-format): Synchronyze with the eterm terminfo entry
+        (term-termcap-format): Synchronize with the eterm terminfo entry
         in etc/e/eterm.ti.
         (term-handle-colors-array): If the current foreground or
         background are zero (i.e. unspecified), use the foreground and
         background of the default face for reverse video.
         (term-ansi-at-eval-string, term-ansi-default-fg)
         (term-ansi-default-bg, term-ansi-current-temp): Delete unused variable.
-        (term-mem): Delete ununsed function.
+        (term-mem): Delete unused function.
         (term-protocol-version): Increment.
         (term-current-face): Set to default.
 
@@ -13282,7 +13335,7 @@
         length, ps-mule-string-char -> aref, ps-mule-next-index -> 1+,
         ps-mule-next-point -> 1+).
 
-        * composite.el (encode-composition-rule): Add autoload cooky.
+        * composite.el (encode-composition-rule): Add autoload cookie.
 
 2004-09-07  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -13669,7 +13722,7 @@
         * simple.el (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
         controls whether to display the error buffer.
 
-        * ps-mule.el: Delete compatibility code for old Emacses.
+        * ps-mule.el: Delete compatibility code for old Emacsen.
         (ps-mule-find-wrappoint): Don't use chars-in-region.
 
         * frame.el (display-mouse-p, display-selections-p):
@@ -13965,7 +14018,7 @@
         the buffer has no recorded last modification time.  Return t in
         case the visiting file doesn't exist.  Suggested by Luc Teirlinck
         <teirllm@auburn.edu>.
-        (tramp-handle-write-region): Pass modtime explicitely to
+        (tramp-handle-write-region): Pass modtime explicitly to
         `set-visited-file-modtime', because filename can be different
         from (buffer-file-name) if `file-precious-flag' is set.
         `set-visited-file-modtime' must be called always when `visit' is t
@@ -14221,7 +14274,7 @@
         since Emacs 22.1 only (XEmacs has it).  Implementation rewritten
         in order to avoid this function.
         (tramp-handle-write-region): Set current buffer.  If connection
-        wasn't open, `file-modes' has changed it accidently.  Reported by
+        wasn't open, `file-modes' has changed it accidentally.  Reported by
         David Kastrup <dak@gnu.org>.
         (tramp-enter-password, tramp-read-passwd): New arguments USER and
         HOST.
@@ -14381,11 +14434,11 @@
         number of symbols used.
         (xml-skip-dtd): Change to use xml-parse-dtd but set
         xml-validating-parsing to nil.
-        (xml-parse-dtd): Parse entity deleclarations in DOCTYPEs.
+        (xml-parse-dtd): Parse entity declarations in DOCTYPEs.
         (xml-substitute-entity): Remove in favor of new entity substitution.
         (xml-substitute-special): Rewrite in to substitute complex
         entities from DOCTYPE declarations.
-        (xml-parse-fragment): Parse fragments from entity deleclarations.
+        (xml-parse-fragment): Parse fragments from entity declarations.
         (xml-parse-region, xml-parse-tag, xml-parse-attlist)
         (xml-parse-dtd, xml-substitute-special): Make validity checks
         conditioned on xml-validating-parser.  Add "Not Well Formed" to
@@ -14448,7 +14501,7 @@
         * iimage.el (turn-on-iimage-mode, iimage-mode): Add autoload cookies.
         (iimage-mode-image-search-path): New user option to search the
         image file.
-        (iimage-locate-file): New funcion.  Emacs21.3 or earlier does not
+        (iimage-locate-file): New function.  Emacs21.3 or earlier does not
         have locate-file.
         (iimage-mode-buffer): Use it.
 
@@ -14828,7 +14881,7 @@
         (utf-8-post-read-conversion): Narrow to region properly.
         If utf-translate-cjk-mode is on, load tables if necessary.
         Call utf-8-compose with hash-table arg if necessary.
-        Call XXX-compose-region instead of XXX-post-read-convesion.
+        Call XXX-compose-region instead of XXX-post-read-conversion.
         (utf-8-pre-write-conversion): New function.
         (mule-utf-8): Include CJK charsets in safe-charsets if
         utf-translate-cjk-mode is on.  Add pre-write-conversion.
@@ -15102,7 +15155,7 @@
 
 2004-06-04  Mario Lang  <mlang@delysid.org>
 
-        * battery.el (battery-linux-proc-acpi): `mA' was hardcored, but some
+        * battery.el (battery-linux-proc-acpi): `mA' was hardcoded, but some
         systems appear to use mW, make the code handle this.  Fix a
         division-by-zero bug while at it, and handle kernels with
         a slightly different layout in /proc/acpi.
@@ -15246,7 +15299,7 @@
 2004-05-30  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (file-remote-p): Apply file name handler for operation
-        `file-remote-p'.  It isn' a property any longer.
+        `file-remote-p'.  It isn't a property any longer.
         (file-relative-name): `fh' and `fd' get the required value via
         `find-file-name-handler' already.
 
@@ -15573,7 +15626,7 @@
         (gdb-buffer-type, gdb-input-queue, gdb-prompting)
         (gdb-output-sink, gdb-current-item, gdb-pending-triggers):
         Change from local to global gdb variable set.
-        (gdb-ann3): Initialise above gdb variable set.
+        (gdb-ann3): Initialize above gdb variable set.
         (gdb-var-update, gdb-var-update-handler, gdb-enqueue-input)
         (gdb-dequeue-input, gdb-source, gdb-pre-prompt, gdb-prompt)
         (gdb-subprompt, gdb-starting, gdb-stopping, gdb-frame-begin)
@@ -15861,7 +15914,7 @@
 
 2004-05-12  Kenichi Handa  <handa@m17n.org>
 
-        * descr-text.el: Require quail at comile time.
+        * descr-text.el: Require quail at compile time.
         (describe-char): If an input method is on and it supports the
         character, show how to input it.
 
@@ -16247,7 +16300,7 @@
 
         * emacs/lisp/progmodes/sql.el (sql-xemacs-p, sql-emacs19-p)
         (sql-emacs20-p): Remove.
-        (sql-mode-syntax-table): Use shared GNU EMacs/XEmacs syntax.
+        (sql-mode-syntax-table): Use shared GNU Emacs/XEmacs syntax.
         (sql-builtin-face, sql-doc-face): Remove.
         (sql-mode-ansi-font-lock-keywords)
         (sql-mode-oracle-font-lock-keywords)
@@ -16685,7 +16738,7 @@
         either a character representation of an event or an event
         description list.
 
-        * type-break.el: Capitalise Emacs and Lisp.
+        * type-break.el: Capitalize Emacs and Lisp.
         (type-break-good-break-interval, type-break-demo-boring-stats)
         (type-break-terse-messages, type-break-file-name): New defcustoms.
         (type-break-post-command-hook)
@@ -16693,7 +16746,7 @@
         (type-break-interval-start, type-break-auto-save-file-name): New vars.
         (type-break-mode): Document type-break-good-break-interval and the
         "session" file.  Schedule break according to the session file.
-        Kill session file buffer on exit.  Organise for save-some-buffers
+        Kill session file buffer on exit.  Organize for save-some-buffers
         to always save the session file.
         (type-break-mode-line-message-mode, type-break-query-mode):
         Uppercase arguments.
@@ -17155,7 +17208,7 @@
         (gdb-frame-breakpoints-buffer, gdb-frame-stack-buffer)
         (gdb-frame-threads-buffer, gdb-frame-registers-buffer)
         (gdb-frame-locals-buffer, gdb-frame-gdb-buffer)
-        (gdb-frame-assembler-buffer): Improve behaviour with
+        (gdb-frame-assembler-buffer): Improve behavior with
         multiple frames.
         (gdb-display-buffer): Extend search to all visible frames.
 
@@ -17831,7 +17884,7 @@
 
 2004-03-31  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * autorevert.el: Delete obsolete autoload's and defvar's.
+        * autorevert.el: Delete obsolete autoloads and defvars.
         (auto-revert-check-vc-info): New user option.
         (auto-revert-vc-cvs-file-version, auto-revert-vc-buffer-p)
         (auto-revert-handler-vc): Delete.
@@ -17960,7 +18013,7 @@
 
         * strokes.el (strokes-global-set-stroke-string): New function.
         (strokes-list-strokes): Cope with strings, not just commands.
-        Set foreground colour of image.
+        Set foreground color of image.
         (strokes-global-set-stroke): Doc fix.
 
 2004-03-26  Luc Teirlinck  <teirllm@auburn.edu>
@@ -18061,7 +18114,7 @@
 
         * descr-text.el (describe-property-list): Add a button
         for `face' property that calls `describe-face'.
-        Suggested by luis fernandes <elf@ee.ryerson.ca>
+        Suggested by Luis Fernandes <elf@ee.ryerson.ca>
 
         * international/mule.el (keyboard-coding-system):
         * kmacro.el (kmacro-call-macro): Fix docstring.
@@ -18442,7 +18495,7 @@
         (ruler-mode-left-scroll-bar-cols): Use `scroll-bar-columns'.
         (ruler-mode-ruler-function): New variable.
         (ruler-mode-header-line-format): Call `ruler-mode-ruler-function'
-        if the value for `ruler-mode-ruler-function'is given.
+        if the value for `ruler-mode-ruler-function' is given.
 
         * hexl.el (hexl-mode-hook): Make the hook customizable.
         (hexl-address-area, hexl-ascii-area): New customize variables.
@@ -18816,7 +18869,7 @@
 
         * net/tramp.el (tramp-completion-mode) Don't check for 'xemacs' but
         `tramp-unified-filenames'.
-        (tramp-completion-mode): Make test for XEmacs explicitely.
+        (tramp-completion-mode): Make test for XEmacs explicitly.
         `event-to-character' can exists in Emacs packages too.
         Reported by Matt Swift <swift@alum.mit.edu>.
         (tramp-buffer-name): Buffer name must contain the user if exists.
@@ -19289,7 +19342,7 @@
         * ses.el: Use "ses--" prefixes for buffer-local variables.
         Use (point-min) instead of 1, even when we know the buffer
         is unnarrowed.
-        (ses-build-load-map): Delete.  Distribute its content to defconst's for
+        (ses-build-load-map): Delete.  Distribute its content to defconsts for
         the three maps.
         (ses-menu, ses-header-line-menu): New menus.
         (ses-mode-map): Use them.
@@ -19411,7 +19464,7 @@
         minibuffer windows.
 
         * progmodes/grep.el (grep-regexp-alist): Allow :, \t and (
-        in file names, as long as it is unabmiguous.
+        in file names, as long as it is unambiguous.
 
 2004-02-08  Andreas Schwab  <schwab@suse.de>
 
@@ -19884,7 +19937,7 @@
 
         * calendar/appt.el: Update copyright and commentary.
         (appt-issue-message): Make obsolete.
-        (appt-visible, appt-msg-window): Make obsolete, in favour of
+        (appt-visible, appt-msg-window): Make obsolete, in favor of
         appt-display-format.
         (appt-display-mode-line, appt-display-duration)
         (appt-display-diary, appt-time-msg-list, appt-mode-string)
@@ -20275,7 +20328,7 @@
 
         * gdb-ui.el (gdb-prompt): Change filter for level 3 annotations,
         if necessary.
-        (gdb-ann3): New function.  Initialise M-x gdb as for M-x gdba if
+        (gdb-ann3): New function.  Initialize M-x gdb as for M-x gdba if
         annotations are detected.
         (gud-gdba-marker-filter): Use global variable gud-marker-acc
         instead of a local one to allow transition from
@@ -22287,7 +22340,7 @@
         * calendar/calendar.el (diary-file, diary-file-name-prefix)
         (european-calendar-style, diary-date-forms)
         (calendar-day-name-array, calendar-month-name-array): Doc change.
-        (generate-calendar-month): Adapt for new behaviour of
+        (generate-calendar-month): Adapt for new behavior of
         `calendar-day-name' function.
         (calendar-abbrev-length, calendar-day-abbrev-array)
         (calendar-month-abbrev-array): New variables.
@@ -22295,39 +22348,39 @@
         (calendar-day-name, calendar-month-name): Use new abbrev arrays,
         rather than fixing abbrevs at some width.  Calling syntax change.
         (calendar-make-alist): Use abbrev arrays.  Calling syntax change.
-        (calendar-date-string): Adapt for new behaviours of
+        (calendar-date-string): Adapt for new behaviors of
         `calendar-day-name' and `calendar-month-name' functions.
 
         * calendar/diary-lib.el (list-diary-entries): Adapt for new
-        behaviour of `calendar-day-name' and `calendar-month-name' functions.
+        behavior of `calendar-day-name' and `calendar-month-name' functions.
         (diary-name-pattern): Use abbrev arrays, rather than fixing
         abbrevs at three chars.  Calling syntax change.
-        (mark-diary-entries): Adapt for new behaviours of
+        (mark-diary-entries): Adapt for new behaviors of
         `diary-name-pattern' and `calendar-make-alist' functions.
-        (fancy-diary-font-lock-keywords): Adapt for new behaviour of
+        (fancy-diary-font-lock-keywords): Adapt for new behavior of
         `diary-name-pattern' function.
         (font-lock-diary-date-forms): Use abbrev arrays, rather than
         fixing abbrevs at three chars.  Calling syntax change.
         (cal-hebrew, cal-islam): Require when compiling.
-        (diary-font-lock-keywords): Adapt for new behaviour of
+        (diary-font-lock-keywords): Adapt for new behavior of
         `font-lock-diary-date-forms' function.
 
         * calendar/cal-hebrew.el: Reposition some code so defined before used.
         (calendar-hebrew-month-name-array-common-year)
         (calendar-hebrew-month-name-array-leap-year): Add doc strings.
-        (list-hebrew-diary-entries): Adapt for new behaviours of
+        (list-hebrew-diary-entries): Adapt for new behaviors of
         `calendar-day-name' and `add-to-diary-list' functions.
-        (mark-hebrew-diary-entries): Adapt for new behaviours of
+        (mark-hebrew-diary-entries): Adapt for new behaviors of
         `diary-name-pattern' and `calendar-make-alist' functions.
 
         * calendar/cal-islam.el (calendar-islamic-month-name-array):
         Add doc string.
-        (list-islamic-diary-entries): Adapt for new behaviours of
+        (list-islamic-diary-entries): Adapt for new behaviors of
         `calendar-day-name' and `add-to-diary-list' functions.
-        (mark-islamic-diary-entries): Adapt for new behaviours of
+        (mark-islamic-diary-entries): Adapt for new behaviors of
         `diary-name-pattern' and `calendar-make-alist' functions.
 
-        * calendar/cal-menu.el (cal-menu-update): Adapt for new behaviour of
+        * calendar/cal-menu.el (cal-menu-update): Adapt for new behavior of
         `calendar-month-name' function.
 
         * calendar/cal-coptic.el (coptic-name): defvar rather than defconst.
diff --git a/lisp/battery.el b/lisp/battery.el
index cd6f7933c4e..2ae6607f8ef 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -25,9 +25,10 @@
 
 ;;; Commentary:
 
-;; There is at present support for interpreting the new `/proc/apm'
-;; file format of Linux version 1.3.58 or newer and for the `/proc/acpi/'
-;; directory structure of Linux 2.4.20 and 2.6.
+;; There is at present support for GNU/Linux and OS X.  This library
+;; supports both the `/proc/apm' file format of Linux version 1.3.58
+;; or newer and the `/proc/acpi/' directory structure of Linux 2.4.20
+;; and 2.6.  Darwin (OS X) is supported by using the `pmset' program.
 
 ;;; Code:
 
@@ -46,7 +47,13 @@
          'battery-linux-proc-apm)
         ((and (eq system-type 'gnu/linux)
               (file-directory-p "/proc/acpi/battery"))
-         'battery-linux-proc-acpi))
+         'battery-linux-proc-acpi)
+        ((and (eq system-type 'darwin)
+              (ignore-errors 
+                (with-temp-buffer 
+                  (and (eq (call-process "pmset" nil t nil "-g" "ps") 0)
+                       (> (buffer-size) 0)))))
+         'battery-pmset))
   "*Function for getting battery status information.
 The function has to return an alist of conversion definitions.
 Its cons cells are of the form
@@ -62,7 +69,9 @@ introduced by a `%' character in a control string."
   (cond ((eq battery-status-function 'battery-linux-proc-apm)
          "Power %L, battery %B (%p%% load, remaining time %t)")
         ((eq battery-status-function 'battery-linux-proc-acpi)
-         "Power %L, battery %B at %r (%p%% load, remaining time %t)"))
+         "Power %L, battery %B at %r (%p%% load, remaining time %t)")
+        ((eq battery-status-function 'battery-pmset)
+         "%L power, battery %B (%p%% load, remaining time %t)"))
   "*Control string formatting the string to display in the echo area.
 Ordinary characters in the control string are printed as-is, while
 conversion specifications introduced by a `%' character in the control
@@ -79,7 +88,9 @@ string are substituted as defined by the current value of the variable
   (cond ((eq battery-status-function 'battery-linux-proc-apm)
          "[%b%p%%]")
         ((eq battery-status-function 'battery-linux-proc-acpi)
-         "[%b%p%%,%d°C]"))
+         "[%b%p%%,%d°C]")
+        ((eq battery-status-function 'battery-pmset)
+         "[%b%p%%]"))
   "*Control string formatting the string to display in the mode line.
 Ordinary characters in the control string are printed as-is, while
 conversion specifications introduced by a `%' character in the control
@@ -93,6 +104,18 @@ string are substituted as defined by the current value of the variable
   :type 'integer
   :group 'battery)
 
+(defcustom battery-load-low 25
+  "*Upper bound of low battery load percentage.
+A battery load percentage below this number is considered low."
+  :type 'integer
+  :group 'battery)
+
+(defcustom battery-load-critical 10
+  "*Upper bound of critical battery load percentage.
+A battery load percentage below this number is considered critical."
+  :type 'integer
+  :group 'battery)
+
 (defvar battery-update-timer nil
   "Interval timer object.")
 
@@ -343,6 +366,58 @@ The following %-sequences are provided:
                        "N/A")))))
 
 
+;;; `pmset' interface for Darwin (OS X).
+
+(defun battery-pmset ()
+  "Get battery status information using `pmset'.
+
+The following %-sequences are provided:
+%L Power source (verbose)
+%B Battery status (verbose)
+%b Battery status, empty means high, `-' means low,
+   `!' means critical, and `+' means charging
+%p Battery load percentage
+%h Remaining time in hours
+%m Remaining time in minutes
+%t Remaining time in the form `h:min'"
+  (let (power-source load-percentage battery-status battery-status-symbol
+        remaining-time hours minutes)
+    (with-temp-buffer
+      (ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
+      (goto-char (point-min))
+      (when (re-search-forward "Currentl?y drawing from '\\(AC\\|Battery\\) Power'" nil t)
+        (setq power-source (match-string 1))
+        (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t)
+          (when (looking-at "\\([0-9]\\{1,3\\}\\)%")
+            (setq load-percentage (match-string 1))
+            (goto-char (match-end 0))
+            (cond ((looking-at "; charging")
+                   (setq battery-status "charging"
+                         battery-status-symbol "+"))
+                  ((< (string-to-number load-percentage) battery-load-low)
+                   (setq battery-status "low"
+                         battery-status-symbol "-"))
+                  ((< (string-to-number load-percentage) battery-load-critical)
+                   (setq battery-status "critical"
+                         battery-status-symbol "!"))
+                  (t
+                   (setq battery-status "high"
+                         battery-status-symbol "")))
+            (when (re-search-forward "\\(\\([0-9]+\\):\\([0-9]+\\)\\) remaining"  nil t)
+              (setq remaining-time (match-string 1))
+              (let ((h (string-to-number (match-string 2)))
+                    (m (string-to-number (match-string 3))))
+                (setq hours (number-to-string (+ h (if (< m 30) 0 1)))
+                      minutes (number-to-string (+ (* h 60) m)))))))))
+    (list (cons ?L (or power-source "N/A"))
+          (cons ?p (or load-percentage "N/A"))
+          (cons ?B (or battery-status "N/A"))
+          (cons ?b (or battery-status-symbol ""))
+          (cons ?h (or hours "N/A"))
+          (cons ?m (or minutes "N/A"))
+          (cons ?t (or remaining-time "N/A")))))
+
+
 ;;; Private functions.
 
 (defun battery-format (format alist)
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index a9a690648fc..3c18e2f608f 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -265,8 +265,16 @@
 ;;    than the emulated TPU commands.  Also, it works only in the forward
 ;;    direction, regardless of the current TPU-edt direction.
 
+;;; Todo/Bugs:
+
+;; We shouldn't use vt100 ESC sequences since it is uselessly fighting
+;; against function-key-map.  Better use real key names.
+
 ;;; Code:
 
+;; we use picture-mode functions
+(require 'picture)
+
 (defgroup tpu nil
   "Emacs emulating TPU emulating EDT."
   :prefix "tpu-"
@@ -316,29 +324,270 @@
 ;;;
 ;;;  Global Keymaps
 ;;;
-(defvar CSI-map (make-sparse-keymap)
+(defvar CSI-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "A" 'tpu-previous-line)               ; up
+    (define-key map "B" 'tpu-next-line)                   ; down
+    (define-key map "D" 'tpu-backward-char)               ; left
+    (define-key map "C" 'tpu-forward-char)                ; right
+
+    (define-key map "1~" 'tpu-search)                     ; Find
+    (define-key map "2~" 'tpu-paste)                      ; Insert Here
+    (define-key map "3~" 'tpu-cut)                        ; Remove
+    (define-key map "4~" 'tpu-select)                     ; Select
+    (define-key map "5~" 'tpu-scroll-window-down)         ; Prev Screen
+    (define-key map "6~" 'tpu-scroll-window-up)           ; Next Screen
+
+    (define-key map "11~" 'nil)                           ; F1
+    (define-key map "12~" 'nil)                           ; F2
+    (define-key map "13~" 'nil)                           ; F3
+    (define-key map "14~" 'nil)                           ; F4
+    (define-key map "15~" 'nil)                           ; F5
+    (define-key map "17~" 'nil)                           ; F6
+    (define-key map "18~" 'nil)                           ; F7
+    (define-key map "19~" 'nil)                           ; F8
+    (define-key map "20~" 'nil)                           ; F9
+    (define-key map "21~" 'tpu-exit)                      ; F10
+    (define-key map "23~" 'tpu-insert-escape)             ; F11 (ESC)
+    (define-key map "24~" 'tpu-next-beginning-of-line)    ; F12 (BS)
+    (define-key map "25~" 'tpu-delete-previous-word)      ; F13 (LF)
+    (define-key map "26~" 'tpu-toggle-overwrite-mode)     ; F14
+    (define-key map "28~" 'tpu-help)                      ; HELP
+    (define-key map "29~" 'execute-extended-command)      ; DO
+    (define-key map "31~" 'tpu-goto-breadcrumb)           ; F17
+    (define-key map "32~" 'nil)                           ; F18
+    (define-key map "33~" 'nil)                           ; F19
+    (define-key map "34~" 'nil)                           ; F20
+    map)
   "Maps the CSI function keys on the VT100 keyboard.
 CSI is DEC's name for the sequence <ESC>[.")
 
-(defvar SS3-map (make-sparse-keymap)
-  "Maps the SS3 function keys on the VT100 keyboard.
-SS3 is DEC's name for the sequence <ESC>O.")
+(defvar GOLD-CSI-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "A" 'tpu-move-to-beginning)      ; up-arrow
+    (define-key map "B" 'tpu-move-to-end)            ; down-arrow
+    (define-key map "C" 'end-of-line)                ; right-arrow
+    (define-key map "D" 'beginning-of-line)          ; left-arrow
+
+    (define-key map "1~" 'nil)                       ; Find
+    (define-key map "2~" 'nil)                       ; Insert Here
+    (define-key map "3~" 'tpu-store-text)            ; Remove
+    (define-key map "4~" 'tpu-unselect)              ; Select
+    (define-key map "5~" 'tpu-previous-window)       ; Prev Screen
+    (define-key map "6~" 'tpu-next-window)           ; Next Screen
+
+    (define-key map "11~" 'nil)                      ; F1
+    (define-key map "12~" 'nil)                      ; F2
+    (define-key map "13~" 'nil)                      ; F3
+    (define-key map "14~" 'nil)                      ; F4
+    (define-key map "16~" 'nil)                      ; F5
+    (define-key map "17~" 'nil)                      ; F6
+    (define-key map "18~" 'nil)                      ; F7
+    (define-key map "19~" 'nil)                      ; F8
+    (define-key map "20~" 'nil)                      ; F9
+    (define-key map "21~" 'nil)                      ; F10
+    (define-key map "23~" 'nil)                      ; F11
+    (define-key map "24~" 'nil)                      ; F12
+    (define-key map "25~" 'nil)                      ; F13
+    (define-key map "26~" 'nil)                      ; F14
+    (define-key map "28~" 'describe-bindings)        ; HELP
+    (define-key map "29~" 'nil)                      ; DO
+    (define-key map "31~" 'tpu-drop-breadcrumb)      ; F17
+    (define-key map "32~" 'nil)                      ; F18
+    (define-key map "33~" 'nil)                      ; F19
+    (define-key map "34~" 'nil)                      ; F20
+    map)
+  "Maps the function keys on the VT100 keyboard preceded by GOLD-CSI.")
+
+(defvar GOLD-SS3-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "A" 'tpu-move-to-beginning)      ; up-arrow
+    (define-key map "B" 'tpu-move-to-end)            ; down-arrow
+    (define-key map "C" 'end-of-line)                ; right-arrow
+    (define-key map "D" 'beginning-of-line)          ; left-arrow
+
+    (define-key map "P" 'keyboard-quit)              ; PF1
+    (define-key map "Q" 'help-for-help)              ; PF2
+    (define-key map "R" 'tpu-search)                 ; PF3
+    (define-key map "S" 'tpu-undelete-lines)         ; PF4
+    (define-key map "p" 'open-line)                  ; KP0
+    (define-key map "q" 'tpu-change-case)            ; KP1
+    (define-key map "r" 'tpu-delete-to-eol)          ; KP2
+    (define-key map "s" 'tpu-special-insert)         ; KP3
+    (define-key map "t" 'tpu-move-to-end)            ; KP4
+    (define-key map "u" 'tpu-move-to-beginning)      ; KP5
+    (define-key map "v" 'tpu-paste)                  ; KP6
+    (define-key map "w" 'execute-extended-command)   ; KP7
+    (define-key map "x" 'tpu-fill)                   ; KP8
+    (define-key map "y" 'tpu-replace)                ; KP9
+    (define-key map "m" 'tpu-undelete-words)         ; KP-
+    (define-key map "l" 'tpu-undelete-char)          ; KP,
+    (define-key map "n" 'tpu-unselect)               ; KP.
+    (define-key map "M" 'tpu-substitute)             ; KPenter
+    map)
+  "Maps the function keys on the VT100 keyboard preceded by GOLD-SS3.")
 
-(defvar GOLD-map (make-keymap)
+(defvar GOLD-map
+  (let ((map (make-keymap)))
+    (define-key map "\e[" GOLD-CSI-map)                  ; GOLD-CSI map
+    (define-key map "\eO" GOLD-SS3-map)                  ; GOLD-SS3 map
+    ;; 
+    (define-key map "\C-A" 'tpu-toggle-overwrite-mode)   ; ^A
+    (define-key map "\C-B" 'nil)                         ; ^B
+    (define-key map "\C-C" 'nil)                         ; ^C
+    (define-key map "\C-D" 'nil)                         ; ^D
+    (define-key map "\C-E" 'nil)                         ; ^E
+    (define-key map "\C-F" 'set-visited-file-name)       ; ^F
+    (define-key map "\C-g" 'keyboard-quit)               ; safety first
+    (define-key map "\C-h" 'delete-other-windows)        ; BS
+    (define-key map "\C-i" 'other-window)                ; TAB
+    (define-key map "\C-J" 'nil)                         ; ^J
+    (define-key map "\C-K" 'tpu-define-macro-key)        ; ^K
+    (define-key map "\C-l" 'downcase-region)             ; ^L
+    (define-key map "\C-M" 'nil)                         ; ^M
+    (define-key map "\C-N" 'nil)                         ; ^N
+    (define-key map "\C-O" 'nil)                         ; ^O
+    (define-key map "\C-P" 'nil)                         ; ^P
+    (define-key map "\C-Q" 'nil)                         ; ^Q
+    (define-key map "\C-R" 'nil)                         ; ^R
+    (define-key map "\C-S" 'nil)                         ; ^S
+    (define-key map "\C-T" 'tpu-toggle-control-keys)     ; ^T
+    (define-key map "\C-u" 'upcase-region)               ; ^U
+    (define-key map "\C-V" 'nil)                         ; ^V
+    (define-key map "\C-w" 'tpu-write-current-buffers)   ; ^W
+    (define-key map "\C-X" 'nil)                         ; ^X
+    (define-key map "\C-Y" 'nil)                         ; ^Y
+    (define-key map "\C-Z" 'nil)                         ; ^Z
+    (define-key map " " 'undo)                           ; SPC
+    (define-key map "!" 'nil)                            ; !
+    (define-key map "#" 'nil)                            ; #
+    (define-key map "$" 'tpu-add-at-eol)                 ; $
+    (define-key map "%" 'tpu-goto-percent)               ; %
+    (define-key map "&" 'nil)                            ; &
+    (define-key map "(" 'nil)                            ; (
+    (define-key map ")" 'nil)                            ; )
+    (define-key map "*" 'tpu-toggle-regexp)              ; *
+    (define-key map "+" 'nil)                            ; +
+    (define-key map "," 'tpu-goto-breadcrumb)            ; ,
+    (define-key map "-" 'negative-argument)              ; -
+    (define-key map "." 'tpu-drop-breadcrumb)            ; .
+    (define-key map "/" 'tpu-emacs-replace)              ; /
+    (define-key map "0" 'digit-argument)                 ; 0
+    (define-key map "1" 'digit-argument)                 ; 1
+    (define-key map "2" 'digit-argument)                 ; 2
+    (define-key map "3" 'digit-argument)                 ; 3
+    (define-key map "4" 'digit-argument)                 ; 4
+    (define-key map "5" 'digit-argument)                 ; 5
+    (define-key map "6" 'digit-argument)                 ; 6
+    (define-key map "7" 'digit-argument)                 ; 7
+    (define-key map "8" 'digit-argument)                 ; 8
+    (define-key map "9" 'digit-argument)                 ; 9
+    (define-key map ":" 'nil)                            ; :
+    (define-key map ";" 'tpu-trim-line-ends)             ; ;
+    (define-key map "<" 'nil)                            ; <
+    (define-key map "=" 'nil)                            ; =
+    (define-key map ">" 'nil)                            ; >
+    (define-key map "?" 'tpu-spell-check)                ; ?
+    (define-key map "A" 'tpu-toggle-newline-and-indent)  ; A
+    (define-key map "B" 'tpu-next-buffer)                ; B
+    (define-key map "C" 'repeat-complex-command)         ; C
+    (define-key map "D" 'shell-command)                  ; D
+    (define-key map "E" 'tpu-exit)                       ; E
+    (define-key map "F" 'tpu-set-cursor-free)            ; F
+    (define-key map "G" 'tpu-get)                        ; G
+    (define-key map "H" 'nil)                            ; H
+    (define-key map "I" 'tpu-include)                    ; I
+    (define-key map "K" 'tpu-kill-buffer)                ; K
+    (define-key map "L" 'tpu-what-line)                  ; L
+    (define-key map "M" 'buffer-menu)                    ; M
+    (define-key map "N" 'tpu-next-file-buffer)           ; N
+    (define-key map "O" 'occur)                          ; O
+    (define-key map "P" 'lpr-buffer)                     ; P
+    (define-key map "Q" 'tpu-quit)                       ; Q
+    (define-key map "R" 'tpu-toggle-rectangle)           ; R
+    (define-key map "S" 'replace)                        ; S
+    (define-key map "T" 'tpu-line-to-top-of-window)      ; T
+    (define-key map "U" 'undo)                           ; U
+    (define-key map "V" 'tpu-version)                    ; V
+    (define-key map "W" 'save-buffer)                    ; W
+    (define-key map "X" 'tpu-save-all-buffers-kill-emacs) ; X
+    (define-key map "Y" 'copy-region-as-kill)             ; Y
+    (define-key map "Z" 'suspend-emacs)                   ; Z
+    (define-key map "[" 'blink-matching-open)             ; [
+    (define-key map "\\" 'nil)                            ; \
+    (define-key map "]" 'blink-matching-open)             ; ]
+    (define-key map "^" 'tpu-add-at-bol)                  ; ^
+    (define-key map "_" 'split-window-vertically)         ; -
+    (define-key map "`" 'what-line)                       ; `
+    (define-key map "a" 'tpu-toggle-newline-and-indent)   ; a
+    (define-key map "b" 'tpu-next-buffer)                 ; b
+    (define-key map "c" 'repeat-complex-command)          ; c
+    (define-key map "d" 'shell-command)                   ; d
+    (define-key map "e" 'tpu-exit)                        ; e
+    (define-key map "f" 'tpu-set-cursor-free)             ; f
+    (define-key map "g" 'tpu-get)                         ; g
+    (define-key map "h" 'nil)                             ; h
+    (define-key map "i" 'tpu-include)                     ; i
+    (define-key map "k" 'tpu-kill-buffer)                 ; k
+    (define-key map "l" 'goto-line)                       ; l
+    (define-key map "m" 'buffer-menu)                     ; m
+    (define-key map "n" 'tpu-next-file-buffer)            ; n
+    (define-key map "o" 'occur)                           ; o
+    (define-key map "p" 'lpr-region)                      ; p
+    (define-key map "q" 'tpu-quit)                        ; q
+    (define-key map "r" 'tpu-toggle-rectangle)            ; r
+    (define-key map "s" 'replace)                         ; s
+    (define-key map "t" 'tpu-line-to-top-of-window)       ; t
+    (define-key map "u" 'undo)                            ; u
+    (define-key map "v" 'tpu-version)                     ; v
+    (define-key map "w" 'save-buffer)                     ; w
+    (define-key map "x" 'tpu-save-all-buffers-kill-emacs) ; x
+    (define-key map "y" 'copy-region-as-kill)             ; y
+    (define-key map "z" 'suspend-emacs)                   ; z
+    (define-key map "{" 'nil)                             ; {
+    (define-key map "|" 'split-window-horizontally)       ; |
+    (define-key map "}" 'nil)                             ; }
+    (define-key map "~" 'exchange-point-and-mark)         ; ~
+    (define-key map "\177" 'delete-window)                ; <X]
+    map)
   "Maps the function keys on the VT100 keyboard preceded by PF1.
 GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
 
-(defvar GOLD-CSI-map (make-sparse-keymap)
-  "Maps the function keys on the VT100 keyboard preceded by GOLD-CSI.")
-
-(defvar GOLD-SS3-map (make-sparse-keymap)
-  "Maps the function keys on the VT100 keyboard preceded by GOLD-SS3.")
+(defvar SS3-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "P" GOLD-map)                         ; GOLD map
+    ;; 
+    (define-key map "A" 'tpu-previous-line)               ; up
+    (define-key map "B" 'tpu-next-line)                   ; down
+    (define-key map "C" 'tpu-forward-char)                ; right
+    (define-key map "D" 'tpu-backward-char)               ; left
+
+    (define-key map "Q" 'tpu-help)                        ; PF2
+    (define-key map "R" 'tpu-search-again)                ; PF3
+    (define-key map "S" 'tpu-delete-current-line)         ; PF4
+    (define-key map "p" 'tpu-line)                        ; KP0
+    (define-key map "q" 'tpu-word)                        ; KP1
+    (define-key map "r" 'tpu-end-of-line)                 ; KP2
+    (define-key map "s" 'tpu-char)                        ; KP3
+    (define-key map "t" 'tpu-advance-direction)           ; KP4
+    (define-key map "u" 'tpu-backup-direction)            ; KP5
+    (define-key map "v" 'tpu-cut)                         ; KP6
+    (define-key map "w" 'tpu-page)                        ; KP7
+    (define-key map "x" 'tpu-scroll-window)               ; KP8
+    (define-key map "y" 'tpu-append-region)               ; KP9
+    (define-key map "m" 'tpu-delete-current-word)         ; KP-
+    (define-key map "l" 'tpu-delete-current-char)         ; KP,
+    (define-key map "n" 'tpu-select)                      ; KP.
+    (define-key map "M" 'newline)                         ; KPenter
+    map)
+  "Maps the SS3 function keys on the VT100 keyboard.
+SS3 is DEC's name for the sequence <ESC>O.")
 
 (defvar tpu-global-map nil "TPU-edt global keymap.")
 (defvar tpu-original-global-map global-map
-  "Original global keymap.")
+  "Original non-TPU global keymap.")
 
-(and tpu-lucid-emacs-p
+(and (not (boundp 'minibuffer-local-ns-map))
      (defvar minibuffer-local-ns-map (make-sparse-keymap)
        "Hack to give Lucid Emacs the same maps as ordinary Emacs."))
 
@@ -346,9 +595,6 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
 ;;;
 ;;;  Global Variables
 ;;;
-(defvar tpu-edt-mode nil
-  "If non-nil, TPU-edt mode is active.")
-
 (defvar tpu-last-replaced-text ""
   "Last text deleted by a TPU-edt replace command.")
 (defvar tpu-last-deleted-region ""
@@ -433,26 +679,14 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
 
 (defun tpu-set-mode-line (for-tpu)
   "Set ``minor-mode-alist'' for TPU-edt, or reset it to default Emacs."
-  (cond ((not for-tpu)
-         (setq minor-mode-alist tpu-original-mm-alist))
-        (t
-         (or (assq 'tpu-newline-and-indent-p minor-mode-alist)
-             (setq minor-mode-alist
-                   (cons '(tpu-newline-and-indent-p
-                           tpu-newline-and-indent-string)
-                         minor-mode-alist)))
-         (or (assq 'tpu-rectangular-p minor-mode-alist)
-             (setq minor-mode-alist
-                   (cons '(tpu-rectangular-p tpu-rectangle-string)
-                         minor-mode-alist)))
-         (or (assq 'tpu-direction-string minor-mode-alist)
-             (setq minor-mode-alist
-                   (cons '(tpu-direction-string tpu-direction-string)
-                         minor-mode-alist)))
-         (or (assq 'tpu-mark-flag minor-mode-alist)
-             (setq minor-mode-alist
-                   (cons '(tpu-mark-flag tpu-mark-flag)
-                         minor-mode-alist))))))
+  (let ((entries '((tpu-newline-and-indent-p tpu-newline-and-indent-string)
+                   (tpu-rectangular-p tpu-rectangle-string)
+                   (tpu-direction-string tpu-direction-string)
+                   (tpu-mark-flag tpu-mark-flag))))
+    (dolist (entry entries)
+      (if for-tpu
+          (add-to-list 'minor-mode-alist entry)
+        (setq minor-mode-alist (remove entry minor-mode-alist))))))
 
 (defun tpu-update-mode-line nil
   "Make sure mode-line in the current buffer reflects all changes."
@@ -482,7 +716,7 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
   "Set markers at match beginning and end."
   ;; Add one to beginning mark so it stays with the first character of
   ;;   the string even if characters are added just before the string.
-  (setq tpu-match-beginning-mark (copy-marker (1+ (match-beginning 0))))
+  (setq tpu-match-beginning-mark (copy-marker (match-beginning 0) t))
   (setq tpu-match-end-mark (copy-marker (match-end 0))))
 
 (defun tpu-unset-match nil
@@ -492,7 +726,7 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
 
 (defun tpu-match-beginning nil
   "Returns the location of the last match beginning."
-  (1- (marker-position tpu-match-beginning-mark)))
+  (marker-position tpu-match-beginning-mark))
 
 (defun tpu-match-end nil
   "Returns the location of the last match end."
@@ -508,10 +742,10 @@ Otherwise sets the tpu-match markers to nil and returns nil."
   ;;              beginning, end, and point are equal.
   (cond ((and
           (equal (marker-buffer tpu-match-beginning-mark) (current-buffer))
-          (>= (point) (1- (marker-position tpu-match-beginning-mark)))
+          (>= (point) (marker-position tpu-match-beginning-mark))
           (or
            (< (point) (marker-position tpu-match-end-mark))
-           (and (= (1- (marker-position tpu-match-beginning-mark))
+           (and (= (marker-position tpu-match-beginning-mark)
                    (marker-position tpu-match-end-mark))
                 (= (marker-position tpu-match-end-mark) (point))))) t)
         (t
@@ -521,12 +755,11 @@ Otherwise sets the tpu-match markers to nil and returns nil."
   "Show the values of the match markers."
   (interactive)
   (if (markerp tpu-match-beginning-mark)
-      (let ((beg (marker-position tpu-match-beginning-mark)))
-        (message "(%s, %s) in %s -- current %s in %s"
-                 (if beg (1- beg) nil)
-                 (marker-position tpu-match-end-mark)
-                 (marker-buffer tpu-match-end-mark)
-                 (point) (current-buffer)))))
+      (message "(%s, %s) in %s -- current %s in %s"
+               (marker-position tpu-match-beginning-mark)
+               (marker-position tpu-match-end-mark)
+               (marker-buffer tpu-match-end-mark)
+               (point) (current-buffer))))
 
 
 ;;;
@@ -549,7 +782,9 @@ version of Emacs."
 Sets the mark at POS and activates the region according to the
 current version of Emacs."
   (set-mark pos)
-  (and tpu-lucid-emacs-p pos (zmacs-activate-region)))
+  ;; We use a separate `if' for the fboundp so the byte-compiler notices it
+  ;; and doesn't complain about the subsequent call.
+  (if (fboundp 'zmacs-activate-region) (if pos (zmacs-activate-region))))
 
 (defun tpu-string-prompt (prompt history-symbol)
   "Read a string with PROMPT."
@@ -775,8 +1010,12 @@ This is useful for inserting control characters."
 ;;;  Command and Function Aliases
 ;;;
 ;;;###autoload
-(defalias 'tpu-edt-mode 'tpu-edt-on)
-(defalias 'TPU-EDT-MODE 'tpu-edt-on)
+(define-minor-mode tpu-edt-mode
+  "TPU/edt emulation."
+  :global t
+  (if tpu-edt-mode (tpu-edt-on) (tpu-edt-off)))
+
+(defalias 'TPU-EDT-MODE 'tpu-edt-mode)
 
 ;;;###autoload
 (defalias 'tpu-edt 'tpu-edt-on)
@@ -1164,7 +1403,7 @@ The search is performed in the current direction."
 (defun tpu-set-search (&optional arg)
   "Set the search functions and set the search direction to the current
 direction.  If an argument is specified, don't set the search direction."
-  (if (not arg) (setq tpu-searching-forward (if tpu-advance t nil)))
+  (if (not arg) (setq tpu-searching-forward tpu-advance))
   (cond (tpu-searching-forward
          (cond (tpu-regexp-p
                 (fset 'tpu-emacs-search 're-search-forward)
@@ -1217,7 +1456,7 @@ direction.  If an argument is specified, don't set the search direction."
                     "%sSearch failed: \"%s\""
                     (if tpu-regexp-p "RE " "") tpu-search-last-string)))))))))
 
-(fset 'tpu-search-internal-core (symbol-function 'tpu-search-internal))
+(defalias 'tpu-search-internal-core (symbol-function 'tpu-search-internal))
 
 (defun tpu-check-search-case (string)
   "Returns t if string contains upper case."
@@ -2005,278 +2244,23 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
 
 
 ;;;
-;;;  Define keymaps
-;;;
-(define-key SS3-map "P" GOLD-map)                             ; GOLD map
-(define-key GOLD-map "\e[" GOLD-CSI-map)                      ; GOLD-CSI map
-(define-key GOLD-map "\eO" GOLD-SS3-map)                      ; GOLD-SS3 map
-
-
-;;;
-;;;  CSI-map key definitions
-;;;
-(define-key CSI-map "A" 'tpu-previous-line)                   ; up
-(define-key CSI-map "B" 'tpu-next-line)                       ; down
-(define-key CSI-map "D" 'tpu-backward-char)                   ; left
-(define-key CSI-map "C" 'tpu-forward-char)                    ; right
-
-(define-key CSI-map "1~" 'tpu-search)                         ; Find
-(define-key CSI-map "2~" 'tpu-paste)                          ; Insert Here
-(define-key CSI-map "3~" 'tpu-cut)                            ; Remove
-(define-key CSI-map "4~" 'tpu-select)                         ; Select
-(define-key CSI-map "5~" 'tpu-scroll-window-down)             ; Prev Screen
-(define-key CSI-map "6~" 'tpu-scroll-window-up)               ; Next Screen
-
-(define-key CSI-map "11~" 'nil)                               ; F1
-(define-key CSI-map "12~" 'nil)                               ; F2
-(define-key CSI-map "13~" 'nil)                               ; F3
-(define-key CSI-map "14~" 'nil)                               ; F4
-(define-key CSI-map "15~" 'nil)                               ; F5
-(define-key CSI-map "17~" 'nil)                               ; F6
-(define-key CSI-map "18~" 'nil)                               ; F7
-(define-key CSI-map "19~" 'nil)                               ; F8
-(define-key CSI-map "20~" 'nil)                               ; F9
-(define-key CSI-map "21~" 'tpu-exit)                          ; F10
-(define-key CSI-map "23~" 'tpu-insert-escape)                 ; F11 (ESC)
-(define-key CSI-map "24~" 'tpu-next-beginning-of-line)        ; F12 (BS)
-(define-key CSI-map "25~" 'tpu-delete-previous-word)          ; F13 (LF)
-(define-key CSI-map "26~" 'tpu-toggle-overwrite-mode)         ; F14
-(define-key CSI-map "28~" 'tpu-help)                          ; HELP
-(define-key CSI-map "29~" 'execute-extended-command)          ; DO
-(define-key CSI-map "31~" 'tpu-goto-breadcrumb)               ; F17
-(define-key CSI-map "32~" 'nil)                               ; F18
-(define-key CSI-map "33~" 'nil)                               ; F19
-(define-key CSI-map "34~" 'nil)                               ; F20
-
-
-;;;
-;;;  SS3-map key definitions
-;;;
-(define-key SS3-map "A" 'tpu-previous-line)                   ; up
-(define-key SS3-map "B" 'tpu-next-line)                       ; down
-(define-key SS3-map "C" 'tpu-forward-char)                    ; right
-(define-key SS3-map "D" 'tpu-backward-char)                   ; left
-
-(define-key SS3-map "Q" 'tpu-help)                            ; PF2
-(define-key SS3-map "R" 'tpu-search-again)                    ; PF3
-(define-key SS3-map "S" 'tpu-delete-current-line)             ; PF4
-(define-key SS3-map "p" 'tpu-line)                            ; KP0
-(define-key SS3-map "q" 'tpu-word)                            ; KP1
-(define-key SS3-map "r" 'tpu-end-of-line)                     ; KP2
-(define-key SS3-map "s" 'tpu-char)                            ; KP3
-(define-key SS3-map "t" 'tpu-advance-direction)               ; KP4
-(define-key SS3-map "u" 'tpu-backup-direction)                ; KP5
-(define-key SS3-map "v" 'tpu-cut)                             ; KP6
-(define-key SS3-map "w" 'tpu-page)                            ; KP7
-(define-key SS3-map "x" 'tpu-scroll-window)                   ; KP8
-(define-key SS3-map "y" 'tpu-append-region)                   ; KP9
-(define-key SS3-map "m" 'tpu-delete-current-word)             ; KP-
-(define-key SS3-map "l" 'tpu-delete-current-char)             ; KP,
-(define-key SS3-map "n" 'tpu-select)                          ; KP.
-(define-key SS3-map "M" 'newline)                             ; KPenter
-
-
-;;;
-;;;  GOLD-map key definitions
-;;;
-(define-key GOLD-map "\C-A" 'tpu-toggle-overwrite-mode)       ; ^A
-(define-key GOLD-map "\C-B" 'nil)                             ; ^B
-(define-key GOLD-map "\C-C" 'nil)                             ; ^C
-(define-key GOLD-map "\C-D" 'nil)                             ; ^D
-(define-key GOLD-map "\C-E" 'nil)                             ; ^E
-(define-key GOLD-map "\C-F" 'set-visited-file-name)           ; ^F
-(define-key GOLD-map "\C-g" 'keyboard-quit)                   ; safety first
-(define-key GOLD-map "\C-h" 'delete-other-windows)            ; BS
-(define-key GOLD-map "\C-i" 'other-window)                    ; TAB
-(define-key GOLD-map "\C-J" 'nil)                             ; ^J
-(define-key GOLD-map "\C-K" 'tpu-define-macro-key)            ; ^K
-(define-key GOLD-map "\C-l" 'downcase-region)                 ; ^L
-(define-key GOLD-map "\C-M" 'nil)                             ; ^M
-(define-key GOLD-map "\C-N" 'nil)                             ; ^N
-(define-key GOLD-map "\C-O" 'nil)                             ; ^O
-(define-key GOLD-map "\C-P" 'nil)                             ; ^P
-(define-key GOLD-map "\C-Q" 'nil)                             ; ^Q
-(define-key GOLD-map "\C-R" 'nil)                             ; ^R
-(define-key GOLD-map "\C-S" 'nil)                             ; ^S
-(define-key GOLD-map "\C-T" 'tpu-toggle-control-keys)         ; ^T
-(define-key GOLD-map "\C-u" 'upcase-region)                   ; ^U
-(define-key GOLD-map "\C-V" 'nil)                             ; ^V
-(define-key GOLD-map "\C-w" 'tpu-write-current-buffers)       ; ^W
-(define-key GOLD-map "\C-X" 'nil)                             ; ^X
-(define-key GOLD-map "\C-Y" 'nil)                             ; ^Y
-(define-key GOLD-map "\C-Z" 'nil)                             ; ^Z
-(define-key GOLD-map " " 'undo)                               ; SPC
-(define-key GOLD-map "!" 'nil)                                ; !
-(define-key GOLD-map "#" 'nil)                                ; #
-(define-key GOLD-map "$" 'tpu-add-at-eol)                     ; $
-(define-key GOLD-map "%" 'tpu-goto-percent)                   ; %
-(define-key GOLD-map "&" 'nil)                                ; &
-(define-key GOLD-map "(" 'nil)                                ; (
-(define-key GOLD-map ")" 'nil)                                ; )
-(define-key GOLD-map "*" 'tpu-toggle-regexp)                  ; *
-(define-key GOLD-map "+" 'nil)                                ; +
-(define-key GOLD-map "," 'tpu-goto-breadcrumb)                ; ,
-(define-key GOLD-map "-" 'negative-argument)                  ; -
-(define-key GOLD-map "." 'tpu-drop-breadcrumb)                ; .
-(define-key GOLD-map "/" 'tpu-emacs-replace)                  ; /
-(define-key GOLD-map "0" 'digit-argument)                     ; 0
-(define-key GOLD-map "1" 'digit-argument)                     ; 1
-(define-key GOLD-map "2" 'digit-argument)                     ; 2
-(define-key GOLD-map "3" 'digit-argument)                     ; 3
-(define-key GOLD-map "4" 'digit-argument)                     ; 4
-(define-key GOLD-map "5" 'digit-argument)                     ; 5
-(define-key GOLD-map "6" 'digit-argument)                     ; 6
-(define-key GOLD-map "7" 'digit-argument)                     ; 7
-(define-key GOLD-map "8" 'digit-argument)                     ; 8
-(define-key GOLD-map "9" 'digit-argument)                     ; 9
-(define-key GOLD-map ":" 'nil)                                ; :
-(define-key GOLD-map ";" 'tpu-trim-line-ends)                 ; ;
-(define-key GOLD-map "<" 'nil)                                ; <
-(define-key GOLD-map "=" 'nil)                                ; =
-(define-key GOLD-map ">" 'nil)                                ; >
-(define-key GOLD-map "?" 'tpu-spell-check)                    ; ?
-(define-key GOLD-map "A" 'tpu-toggle-newline-and-indent)      ; A
-(define-key GOLD-map "B" 'tpu-next-buffer)                    ; B
-(define-key GOLD-map "C" 'repeat-complex-command)             ; C
-(define-key GOLD-map "D" 'shell-command)                      ; D
-(define-key GOLD-map "E" 'tpu-exit)                           ; E
-(define-key GOLD-map "F" 'tpu-set-cursor-free)                ; F
-(define-key GOLD-map "G" 'tpu-get)                            ; G
-(define-key GOLD-map "H" 'nil)                                ; H
-(define-key GOLD-map "I" 'tpu-include)                        ; I
-(define-key GOLD-map "K" 'tpu-kill-buffer)                    ; K
-(define-key GOLD-map "L" 'tpu-what-line)                      ; L
-(define-key GOLD-map "M" 'buffer-menu)                        ; M
-(define-key GOLD-map "N" 'tpu-next-file-buffer)               ; N
-(define-key GOLD-map "O" 'occur)                              ; O
-(define-key GOLD-map "P" 'lpr-buffer)                         ; P
-(define-key GOLD-map "Q" 'tpu-quit)                           ; Q
-(define-key GOLD-map "R" 'tpu-toggle-rectangle)               ; R
-(define-key GOLD-map "S" 'replace)                            ; S
-(define-key GOLD-map "T" 'tpu-line-to-top-of-window)          ; T
-(define-key GOLD-map "U" 'undo)                               ; U
-(define-key GOLD-map "V" 'tpu-version)                        ; V
-(define-key GOLD-map "W" 'save-buffer)                        ; W
-(define-key GOLD-map "X" 'tpu-save-all-buffers-kill-emacs)    ; X
-(define-key GOLD-map "Y" 'copy-region-as-kill)                ; Y
-(define-key GOLD-map "Z" 'suspend-emacs)                      ; Z
-(define-key GOLD-map "[" 'blink-matching-open)                ; [
-(define-key GOLD-map "\\" 'nil)                               ; \
-(define-key GOLD-map "]" 'blink-matching-open)                ; ]
-(define-key GOLD-map "^" 'tpu-add-at-bol)                     ; ^
-(define-key GOLD-map "_" 'split-window-vertically)            ; -
-(define-key GOLD-map "`" 'what-line)                          ; `
-(define-key GOLD-map "a" 'tpu-toggle-newline-and-indent)      ; a
-(define-key GOLD-map "b" 'tpu-next-buffer)                    ; b
-(define-key GOLD-map "c" 'repeat-complex-command)             ; c
-(define-key GOLD-map "d" 'shell-command)                      ; d
-(define-key GOLD-map "e" 'tpu-exit)                           ; e
-(define-key GOLD-map "f" 'tpu-set-cursor-free)                ; f
-(define-key GOLD-map "g" 'tpu-get)                            ; g
-(define-key GOLD-map "h" 'nil)                                ; h
-(define-key GOLD-map "i" 'tpu-include)                        ; i
-(define-key GOLD-map "k" 'tpu-kill-buffer)                    ; k
-(define-key GOLD-map "l" 'goto-line)                          ; l
-(define-key GOLD-map "m" 'buffer-menu)                        ; m
-(define-key GOLD-map "n" 'tpu-next-file-buffer)               ; n
-(define-key GOLD-map "o" 'occur)                              ; o
-(define-key GOLD-map "p" 'lpr-region)                         ; p
-(define-key GOLD-map "q" 'tpu-quit)                           ; q
-(define-key GOLD-map "r" 'tpu-toggle-rectangle)               ; r
-(define-key GOLD-map "s" 'replace)                            ; s
-(define-key GOLD-map "t" 'tpu-line-to-top-of-window)          ; t
-(define-key GOLD-map "u" 'undo)                               ; u
-(define-key GOLD-map "v" 'tpu-version)                        ; v
-(define-key GOLD-map "w" 'save-buffer)                        ; w
-(define-key GOLD-map "x" 'tpu-save-all-buffers-kill-emacs)    ; x
-(define-key GOLD-map "y" 'copy-region-as-kill)                ; y
-(define-key GOLD-map "z" 'suspend-emacs)                      ; z
-(define-key GOLD-map "{" 'nil)                                ; {
-(define-key GOLD-map "|" 'split-window-horizontally)          ; |
-(define-key GOLD-map "}" 'nil)                                ; }
-(define-key GOLD-map "~" 'exchange-point-and-mark)            ; ~
-(define-key GOLD-map "\177" 'delete-window)                   ; <X]
-
-
-;;;
-;;;  GOLD-CSI-map key definitions
-;;;
-(define-key GOLD-CSI-map "A" 'tpu-move-to-beginning)          ; up-arrow
-(define-key GOLD-CSI-map "B" 'tpu-move-to-end)                ; down-arrow
-(define-key GOLD-CSI-map "C" 'end-of-line)                    ; right-arrow
-(define-key GOLD-CSI-map "D" 'beginning-of-line)              ; left-arrow
-
-(define-key GOLD-CSI-map "1~" 'nil)                           ; Find
-(define-key GOLD-CSI-map "2~" 'nil)                           ; Insert Here
-(define-key GOLD-CSI-map "3~" 'tpu-store-text)                ; Remove
-(define-key GOLD-CSI-map "4~" 'tpu-unselect)                  ; Select
-(define-key GOLD-CSI-map "5~" 'tpu-previous-window)           ; Prev Screen
-(define-key GOLD-CSI-map "6~" 'tpu-next-window)               ; Next Screen
-
-(define-key GOLD-CSI-map "11~" 'nil)                          ; F1
-(define-key GOLD-CSI-map "12~" 'nil)                          ; F2
-(define-key GOLD-CSI-map "13~" 'nil)                          ; F3
-(define-key GOLD-CSI-map "14~" 'nil)                          ; F4
-(define-key GOLD-CSI-map "16~" 'nil)                          ; F5
-(define-key GOLD-CSI-map "17~" 'nil)                          ; F6
-(define-key GOLD-CSI-map "18~" 'nil)                          ; F7
-(define-key GOLD-CSI-map "19~" 'nil)                          ; F8
-(define-key GOLD-CSI-map "20~" 'nil)                          ; F9
-(define-key GOLD-CSI-map "21~" 'nil)                          ; F10
-(define-key GOLD-CSI-map "23~" 'nil)                          ; F11
-(define-key GOLD-CSI-map "24~" 'nil)                          ; F12
-(define-key GOLD-CSI-map "25~" 'nil)                          ; F13
-(define-key GOLD-CSI-map "26~" 'nil)                          ; F14
-(define-key GOLD-CSI-map "28~" 'describe-bindings)            ; HELP
-(define-key GOLD-CSI-map "29~" 'nil)                          ; DO
-(define-key GOLD-CSI-map "31~" 'tpu-drop-breadcrumb)          ; F17
-(define-key GOLD-CSI-map "32~" 'nil)                          ; F18
-(define-key GOLD-CSI-map "33~" 'nil)                          ; F19
-(define-key GOLD-CSI-map "34~" 'nil)                          ; F20
-
-
-;;;
-;;;  GOLD-SS3-map key definitions
-;;;
-(define-key GOLD-SS3-map "A" 'tpu-move-to-beginning)          ; up-arrow
-(define-key GOLD-SS3-map "B" 'tpu-move-to-end)                ; down-arrow
-(define-key GOLD-SS3-map "C" 'end-of-line)                    ; right-arrow
-(define-key GOLD-SS3-map "D" 'beginning-of-line)              ; left-arrow
-
-(define-key GOLD-SS3-map "P" 'keyboard-quit)                  ; PF1
-(define-key GOLD-SS3-map "Q" 'help-for-help)                  ; PF2
-(define-key GOLD-SS3-map "R" 'tpu-search)                     ; PF3
-(define-key GOLD-SS3-map "S" 'tpu-undelete-lines)             ; PF4
-(define-key GOLD-SS3-map "p" 'open-line)                      ; KP0
-(define-key GOLD-SS3-map "q" 'tpu-change-case)                ; KP1
-(define-key GOLD-SS3-map "r" 'tpu-delete-to-eol)              ; KP2
-(define-key GOLD-SS3-map "s" 'tpu-special-insert)             ; KP3
-(define-key GOLD-SS3-map "t" 'tpu-move-to-end)                ; KP4
-(define-key GOLD-SS3-map "u" 'tpu-move-to-beginning)          ; KP5
-(define-key GOLD-SS3-map "v" 'tpu-paste)                      ; KP6
-(define-key GOLD-SS3-map "w" 'execute-extended-command)       ; KP7
-(define-key GOLD-SS3-map "x" 'tpu-fill)                       ; KP8
-(define-key GOLD-SS3-map "y" 'tpu-replace)                    ; KP9
-(define-key GOLD-SS3-map "m" 'tpu-undelete-words)             ; KP-
-(define-key GOLD-SS3-map "l" 'tpu-undelete-char)              ; KP,
-(define-key GOLD-SS3-map "n" 'tpu-unselect)                   ; KP.
-(define-key GOLD-SS3-map "M" 'tpu-substitute)                 ; KPenter
-
-
-;;;
 ;;;  Minibuffer map additions to make KP_enter = RET
 ;;;
-(define-key minibuffer-local-map "\eOM" 'exit-minibuffer)
-(define-key minibuffer-local-ns-map "\eOM" 'exit-minibuffer)
-(define-key minibuffer-local-completion-map "\eOM" 'exit-minibuffer)
-(define-key minibuffer-local-must-match-map "\eOM" 'minibuffer-complete-and-exit)
+;; Standard Emacs settings under xterm in function-key-map map
+;; "\eOM" to [kp-enter] and [kp-enter] to RET, but since the output of the map
+;; is not fed back into the map, the key stays as kp-enter :-(.
+(define-key minibuffer-local-map [kp-enter] 'exit-minibuffer)
+;; These are not necessary because they are inherited.
+;; (define-key minibuffer-local-ns-map [kp-enter] 'exit-minibuffer)
+;; (define-key minibuffer-local-completion-map [kp-enter] 'exit-minibuffer)
+(define-key minibuffer-local-must-match-map [kp-enter] 'minibuffer-complete-and-exit)
 
 
 ;;;
 ;;;  Minibuffer map additions to set search direction
 ;;;
-(define-key minibuffer-local-map "\eOt" 'tpu-search-forward-exit)
-(define-key minibuffer-local-map "\eOu" 'tpu-search-backward-exit)
+(define-key minibuffer-local-map "\eOt" 'tpu-search-forward-exit)  ;KP4
+(define-key minibuffer-local-map "\eOu" 'tpu-search-backward-exit) ;KP5
 
 
 ;;;
@@ -2306,9 +2290,7 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
          (doit  (or tpu emacs)))
     (cond (doit
            (if emacs (setq tpu-global-map (copy-keymap global-map)))
-           (let ((map (if tpu
-                          (copy-keymap tpu-global-map)
-                        (copy-keymap tpu-original-global-map))))
+           (let ((map (if tpu tpu-global-map tpu-original-global-map)))
 
              (define-key global-map "\C-\\" (lookup-key map "\C-\\"))   ; ^\
              (define-key global-map "\C-a" (lookup-key map "\C-a"))     ; ^A
@@ -2352,23 +2334,23 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
 (defun tpu-arrow-history nil
   "Modify minibuffer maps to use arrows for history recall."
   (interactive)
-  (let ((loc (where-is-internal 'tpu-previous-line)) (cur nil))
-    (while (setq cur (car loc))
-      (define-key read-expression-map cur 'tpu-previous-history-element)
-      (define-key minibuffer-local-map cur 'tpu-previous-history-element)
-      (define-key minibuffer-local-ns-map cur 'tpu-previous-history-element)
-      (define-key minibuffer-local-completion-map cur 'tpu-previous-history-element)
-      (define-key minibuffer-local-must-match-map cur 'tpu-previous-history-element)
-      (setq loc (cdr loc)))
-
-    (setq loc (where-is-internal 'tpu-next-line))
-    (while (setq cur (car loc))
-      (define-key read-expression-map cur 'tpu-next-history-element)
-      (define-key minibuffer-local-map cur 'tpu-next-history-element)
-      (define-key minibuffer-local-ns-map cur 'tpu-next-history-element)
-      (define-key minibuffer-local-completion-map cur 'tpu-next-history-element)
-      (define-key minibuffer-local-must-match-map cur 'tpu-next-history-element)
-      (setq loc (cdr loc)))))
+  (dolist (cur (where-is-internal 'tpu-previous-line))
+    (define-key read-expression-map cur 'tpu-previous-history-element)
+    (define-key minibuffer-local-map cur 'tpu-previous-history-element)
+    ;; These are inherited anyway.  --Stef
+    ;; (define-key minibuffer-local-ns-map cur 'tpu-previous-history-element)
+    ;; (define-key minibuffer-local-completion-map cur 'tpu-previous-history-element)
+    ;; (define-key minibuffer-local-must-match-map cur 'tpu-previous-history-element)
+    )
+
+  (dolist (cur (where-is-internal 'tpu-next-line))
+    (define-key read-expression-map cur 'tpu-next-history-element)
+    (define-key minibuffer-local-map cur 'tpu-next-history-element)
+    ;; These are inherited anyway.  --Stef
+    ;; (define-key minibuffer-local-ns-map cur 'tpu-next-history-element)
+    ;; (define-key minibuffer-local-completion-map cur 'tpu-next-history-element)
+    ;; (define-key minibuffer-local-must-match-map cur 'tpu-next-history-element)
+    ))
 
 
 ;;;
@@ -2461,46 +2443,39 @@ If FILE is nil, try to load a default file.  The default file names are
 ;;;  Start and Stop TPU-edt
 ;;;
 ;;;###autoload
-(defun tpu-edt-on nil
+(defun tpu-edt-on ()
   "Turn on TPU/edt emulation."
   (interactive)
-  (cond
-   ((not tpu-edt-mode)
-    ;; we use picture-mode functions
-    (require 'picture)
-    (tpu-set-control-keys)
-    (and window-system (tpu-load-xkeys nil))
-    (tpu-arrow-history)
-    (transient-mark-mode t)
-    (add-hook 'post-command-hook 'tpu-search-highlight)
-    (tpu-set-mode-line t)
-    (tpu-advance-direction)
-    ;; set page delimiter, display line truncation, and scrolling like TPU
-    (setq-default page-delimiter "\f")
-    (setq-default truncate-lines t)
-    (setq scroll-step 1)
-    (setq tpu-original-global-map global-map)
-    (setq global-map (copy-keymap global-map))
-    (define-key global-map "\e[" CSI-map)
-    (define-key global-map "\eO" SS3-map)
-    (setq tpu-edt-mode t))))
-
-(defun tpu-edt-off nil
+  (and window-system (tpu-load-xkeys nil))
+  (tpu-arrow-history)
+  (transient-mark-mode t)
+  (add-hook 'post-command-hook 'tpu-search-highlight)
+  (tpu-set-mode-line t)
+  (tpu-advance-direction)
+  ;; set page delimiter, display line truncation, and scrolling like TPU
+  (setq-default page-delimiter "\f")
+  (setq-default truncate-lines t)
+  (setq scroll-step 1)
+  (setq global-map (copy-keymap global-map))
+  (tpu-set-control-keys)
+  (define-key global-map "\e[" CSI-map)
+  (define-key global-map "\eO" SS3-map)
+  (setq tpu-edt-mode t))
+
+(defun tpu-edt-off ()
   "Turn off TPU/edt emulation.  Note that the keypad is left on."
   (interactive)
-  (cond
-   (tpu-edt-mode
-    (tpu-reset-control-keys nil)
-    (remove-hook 'post-command-hook 'tpu-search-highlight)
-    (tpu-set-mode-line nil)
-    (setq-default page-delimiter "^\f")
-    (setq-default truncate-lines nil)
-    (setq scroll-step 0)
-    (setq global-map tpu-original-global-map)
-    (use-global-map global-map)
-    (setq tpu-edt-mode nil))))
+  (tpu-reset-control-keys nil)
+  (remove-hook 'post-command-hook 'tpu-search-highlight)
+  (tpu-set-mode-line nil)
+  (setq-default page-delimiter "^\f")
+  (setq-default truncate-lines nil)
+  (setq scroll-step 0)
+  (setq global-map tpu-original-global-map)
+  (use-global-map global-map)
+  (setq tpu-edt-mode nil))
 
 (provide 'tpu-edt)
 
-;;; arch-tag: f3dfe61c-2cbd-4f73-b9cc-eb215020b857
+;; arch-tag: f3dfe61c-2cbd-4f73-b9cc-eb215020b857
 ;;; tpu-edt.el ends here
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5ffcbb0810b..053ce91dad9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
 2005-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus.el (gnus-exit):
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index c649ed8d465..d7aec9112bc 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -557,14 +557,10 @@ Optional argument END is maximum excursion."
           (beginning-of-line)
           (while (and (re-search-forward target-regexp (+ (point) 100) t)
                       (not (looking-at "\\s-*end")))
-            (let ((patterns
-                   (condition-case nil
-                       (read (current-buffer))
-                     (error  (message
-                              (format "Could not read expression at %d"
-                                      (hi-lock-current-line))) nil))))
-              (if patterns
-                  (setq all-patterns (append patterns all-patterns)))))))
+            (condition-case nil
+                (setq all-patterns (append (read (current-buffer)) all-patterns))
+              (error (message "Invalid pattern list expression at %d"
+                              (hi-lock-current-line)))))))
       (when hi-lock-mode (hi-lock-set-file-patterns all-patterns))
       (if (interactive-p)
         (message (format "Hi-lock added %d patterns." (length all-patterns)))))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a24d45e9c30..e9c22a47d8e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -321,9 +321,11 @@ This sets the following coding systems:
   o coding system of a newly created buffer
   o default coding system for subprocess I/O
 This also sets the following values:
-  o default value used as `file-name-coding-system' for converting file names.
+  o default value used as `file-name-coding-system' for converting file names
+      if CODING-SYSTEM is ASCII-compatible.
   o default value for the command `set-terminal-coding-system' (not on MSDOS)
-  o default value for the command `set-keyboard-coding-system'."
+  o default value for the command `set-keyboard-coding-system'
+      if CODING-SYSTEM is ASCII-compatible.."
   (check-coding-system coding-system)
   (setq-default buffer-file-coding-system coding-system)
   (if (fboundp 'ucs-set-table-for-input)
@@ -331,14 +333,18 @@ This also sets the following values:
         (or (local-variable-p 'buffer-file-coding-system buffer)
             (ucs-set-table-for-input buffer))))
 
-  (if (and default-enable-multibyte-characters (not (eq system-type 'darwin)))
+  (if (and default-enable-multibyte-characters (not (eq system-type 'darwin))
+           (or (not coding-system)
+               (not (coding-system-get coding-system 'ascii-incompatible))))
       ;; The file-name coding system on Darwin systems is always utf-8.
       (setq default-file-name-coding-system coding-system))
   ;; If coding-system is nil, honor that on MS-DOS as well, so
   ;; that they could reset the terminal coding system.
   (unless (and (eq window-system 'pc) coding-system)
     (setq default-terminal-coding-system coding-system))
-  (setq default-keyboard-coding-system coding-system)
+  (if (or (not coding-system)
+          (not (coding-system-get coding-system 'ascii-incompatible)))
+      (setq default-keyboard-coding-system coding-system))
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
   ;; carefully by the user, or by the startup code, to deal with the
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 198ebaa4ef7..0c7c6f84480 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -839,6 +839,12 @@ following properties are recognized:
   If the value is non-nil, the coding system preserves composition
   information.
 
+  o ascii-incompatible
+
+  If the value is non-nil, the coding system is not compatible
+  with ASCII, which means it encodes or decodes ASCII character
+  string to the different byte sequence.
+
 These properties are set in PLIST, a property list.  This function
 also sets properties `coding-category' and `alias-coding-systems'
 automatically.
@@ -1191,6 +1197,9 @@ It actually just set the variable `file-name-coding-system' (which
 see) to CODING-SYSTEM."
   (interactive "zCoding system for file names (default, nil): ")
   (check-coding-system coding-system)
+  (if (and coding-system
+           (coding-system-get coding-system 'ascii-incompatible))
+      (error "%s is not ASCII-compatible" coding-system))
   (setq file-name-coding-system coding-system))
 
 (defvar default-terminal-coding-system nil
@@ -1254,6 +1263,9 @@ The setting has no effect on graphical displays."
       (setq coding-system default-keyboard-coding-system))
   (if coding-system
       (setq default-keyboard-coding-system coding-system))
+  (if (and coding-system
+           (coding-system-get coding-system 'ascii-incompatible))
+      (error "%s is not ASCII-compatible" coding-system))
   (set-keyboard-coding-system-internal coding-system display)
   (setq keyboard-coding-system coding-system)
   (encoded-kbd-setup-display display))
diff --git a/lisp/international/utf-16.el b/lisp/international/utf-16.el
index 65730e553b9..bbe2ab37bd8 100644
--- a/lisp/international/utf-16.el
+++ b/lisp/international/utf-16.el
@@ -504,6 +504,7 @@ sequence representing U+FFFD (REPLACEMENT CHARACTER).")
    '(ccl-decode-mule-utf-16le . ccl-encode-mule-utf-16le)
    `(,@props
      (post-read-conversion . utf-8-post-read-conversion)
+     (ascii-incompatible . t)
      (mime-charset . utf-16le)))
 
   (make-coding-system
@@ -515,6 +516,7 @@ sequence representing U+FFFD (REPLACEMENT CHARACTER).")
    '(ccl-decode-mule-utf-16be . ccl-encode-mule-utf-16be)
    `(,@props
      (post-read-conversion . utf-8-post-read-conversion)
+     (ascii-incompatible . t)
      (mime-charset . utf-16be)))
 
   (make-coding-system
@@ -528,6 +530,7 @@ sequence representing U+FFFD (REPLACEMENT CHARACTER).")
    `(,@props
      (post-read-conversion . utf-8-post-read-conversion)
      (coding-category . coding-category-utf-16-le)
+     (ascii-incompatible . t)
      (mime-charset . utf-16)))
 
   (make-coding-system
@@ -541,6 +544,7 @@ sequence representing U+FFFD (REPLACEMENT CHARACTER).")
    `(,@props
      (post-read-conversion . utf-8-post-read-conversion)
      (coding-category . coding-category-utf-16-be)
+     (ascii-incompatible . t)
      (mime-charset . utf-16)))
 
   (make-coding-system
@@ -553,6 +557,7 @@ sequence representing U+FFFD (REPLACEMENT CHARACTER).")
    `(,@props
      (post-read-conversion . mule-utf-16-post-read-conversion)
      (coding-category . coding-category-utf-16-be)
+     (ascii-incompatible . t)
      (mime-charset . utf-16)))
 )
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 91d9e057263..db3de56d8b4 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
 2005-06-17  Lute Kamstra  <lute@gnu.org>
 
         * mh-customize.el (mh-folder-body-face, mh-folder-cur-msg-face)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0fb5411e798..4c5f3ad12b9 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -64,15 +64,15 @@
 (defalias 'flymake-float-time
   (if (fboundp 'float-time)
       'float-time
-    (with-no-warnings
-      (lambda ()
-        (multiple-value-bind (s0 s1 s2) (current-time)
-          (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))))
+    (if (featurep 'xemacs)
+        (lambda ()
+          (multiple-value-bind (s0 s1 s2) (current-time)
+            (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))))
 
 (defsubst flymake-replace-regexp-in-string (regexp rep str)
-  (if (fboundp 'replace-regexp-in-string)
-      (replace-regexp-in-string regexp rep str)
-    (replace-in-string str regexp rep)))
+  (if (fboundp 'replace-in-string)
+      (replace-in-string str regexp rep)
+    (replace-regexp-in-string regexp rep str)))
 
 (defun flymake-split-string (str pattern)
   "Split STR into a list of substrings bounded by PATTERN.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 9b8e51dda5f..50644383667 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -43,6 +43,7 @@
 
 (require 'comint)
 (require 'etags)
+(require 'font-lock)
 
 ;; ======================================================================
 ;; GUD commands must be visible in C buffers visited by GUD
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 94dad8874e9..35524b4a363 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -960,7 +960,9 @@ Return as (TOP . BOTTOM) the extent of ifdef block."
   "Set `hide-ifdef-env' to the define list specified by NAME."
   (interactive
    (list (completing-read "Use define list: "
-                          hide-ifdef-define-alist nil t)))
+                          (mapcar (lambda (x) (symbol-name (car x)))
+                                  hide-ifdef-define-alist)
+                          nil t)))
   (if (stringp name) (setq name (intern name)))
   (let ((define-list (assoc name hide-ifdef-define-alist)))
     (if define-list
@@ -972,5 +974,5 @@ Return as (TOP . BOTTOM) the extent of ifdef block."
 
 (provide 'hideif)
 
-;;; arch-tag: c6381d17-a59a-483a-b945-658f22277981
+;; arch-tag: c6381d17-a59a-483a-b945-658f22277981
 ;;; hideif.el ends here
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7e1f8c1fe24..0313379814f 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
 2005-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * url-history.el (url-history-track): Doc fix.
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 5c6741a3f3e..8e998b9968d 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -143,7 +143,7 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
               (string :tag "Title")
               (repeat :inline t
                (choice :tag ""
-                (const :tag "Seperator" (""))
+                (const :tag "Separator" (""))
                 (list :tag "Font Entry"
                       (string :tag "Menu text")
                       (string :tag "Font")))))))