Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 493-503)

   - Update from CVS
   - Update from CVS: lisp/startup.el (command-line): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 95-98)

   - Update from CVS

46 files changed, 1559 insertions, 1220 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0f12487fb4..5ae09a0e9ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,173 @@
+2005-07-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/ange-ftp.el (ange-ftp-gateway-fatal-msgs)
+        (ange-ftp-pending-error-line): New vars.
+        (ange-ftp-process-handle-line, ange-ftp-process-filter): Use them
+        to handle the non-fatal no-route-to-host messages.
+        (internal-ange-ftp-mode): Make the no-match regexp more efficient.
+
+2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * isearch.el (isearch-mode-map, isearch-other-meta-char)
+        (isearch-quote-char, isearch-printing-char)
+        (isearch-text-char-description): "?\ " -> "?\s".
+        (isearch-lazy-highlight-cleanup)
+        (isearch-lazy-highlight-initial-delay)
+        (isearch-lazy-highlight-interval)
+        (isearch-lazy-highlight-max-at-a-time)
+        (isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup):
+        Declare with define-obsolete-*-alias macros.
+        (isearch-forward): Fix typo in docstring.
+        (search-invisible, search-ring-yank-pointer)
+        (regexp-search-ring-yank-pointer): Doc fixes.
+
+        * recentf.el (recentf-menu-append-commands-p): Declare with
+        `define-obsolete-variable-alias'.
+        (recentf-max-saved-items, recentf-menu-filter)
+        (recentf-arrange-by-rule-subfilter): Doc fixes.
+        (recentf-menu-append-commands-flag)
+        (recentf-initialize-file-name-history, recentf-expand-file-name)
+        (recentf-clear-data): Fix typos in docstrings.
+
+2005-07-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el: Smarten comments.
+        (gdb-info-breakpoints-custom): Use nowarn when finding file.
+
+2005-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/apollo.el (terminal-init-apollo): New function containing
+        all former top level forms in the file.
+        * term/bobcat.el (terminal-init-bobcat):
+        * term/cygwin.el (terminal-init-cygwin):
+        * term/iris-ansi.el (terminal-init-iris-ansi):
+        * term/linux.el (terminal-init-linux):
+        * term/news.el (terminal-init-news):
+        * term/rxvt.el (terminal-init-rxvt):
+        * term/sun.el (terminal-init-sun):
+        * term/tvi970.el (terminal-init-tvi970):
+        * term/vt100.el (terminal-init-vt100):
+        * term/vt102.el (terminal-init-vt102):
+        * term/vt125.el (terminal-init-vt125):
+        * term/vt200.el (terminal-init-vt200):
+        * term/vt201.el (terminal-init-vt201):
+        * term/vt220.el (terminal-init-vt220):
+        * term/vt240.el (terminal-init-vt240):
+        * term/vt300.el (terminal-init-vt300):
+        * term/vt320.el (terminal-init-vt320):
+        * term/vt400.el (terminal-init-vt400):
+        * term/vt420.el (terminal-init-vt420):
+        * term/wyse50.el (terminal-init-wyse50):
+        * term/xterm.el (terminal-init-xterm): Likewise.
+
+        * term/README: Describe the terminal-init-* functionality.
+
+        * startup.el (command-line): After loading the terminal
+        initialization file call the corresponding terminal initialization
+        function.
+
+2005-07-27  Kenichi Handa  <handa@m17n.org>
+
+        * ps-bdf.el (bdf-read-font-info): Ignore glyphs whose ENCODING is
+        negative.
+
+        * ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to
+        setcharwidth.
+        (ps-mule-composition-prologue): Fix for the case that
+        RelativeCompose is false.
+
+2005-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * smerge-mode.el (smerge-ediff): Use insert-buffer-substring.
+
+        * descr-text.el (describe-char): Handle the case where the list of
+        chars is displayed in a separate frame.
+        Be a bit more discriminating when looking for the char.
+
+2005-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bookmark.el (bookmark-automatically-show-annotations)
+        (bookmark-read-annotation-text-func): Doc fixes.
+        (bookmark-save): Improve argument/docstring consistency.
+        (bookmark-get-bookmark, bookmark-get-bookmark-record)
+        (bookmark-alist-from-buffer)
+        (bookmark-upgrade-file-format-from-0)
+        (bookmark-grok-file-format-version)
+        (bookmark-maybe-upgrade-file-format, bookmark-kill-line)
+        (bookmark-read-annotation-mode)
+        (bookmark-insert-current-bookmark, bookmark-jump)
+        (bookmark-exit-hook): Fix typos in docstrings.
+        (bookmark-exit-hooks): Define as obsolete alias.
+        (bookmark-exit-hook-internal): Run `bookmark-exit-hook',
+        not `bookmark-exit-hooks'.  Fix docstring.
+        (bookmark-bmenu-select): "?\ " -> "?\s".
+
+2005-07-25  Ari Roponen <arjuropo@cc.jyu.fi>  (tiny change)
+
+        * startup.el (command-line): Fix typo.
+
+2005-07-24  Richard M. Stallman  <rms@gnu.org>
+
+        * tooltip.el (tooltip-mode): Test emacs-basic-display,
+        not emacs-quick-startup.
+
+2005-07-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/re-builder.el (reb-with-current-window): Delete.
+        (reb-next-match, reb-show-subexp): Use `with-selected-window'
+        instead of `reb-with-current-window'.
+        (reb-prev-match): Likewise.  Also, don't move left if the search
+        was unsuccessful.
+        (reb-initialize-buffer): New function.
+        (re-builder, reb-change-syntax): Use it.
+
+        * man.el (Man-goto-page): Make second argument NOERROR optional.
+
+2005-07-23  Richard M. Stallman  <rms@gnu.org>
+
+        * man.el (Man-bgproc-sentinel): Check here for failure to find
+        any man page in the output, and report the error here.
+        (Man-arguments): Make it permanent local.
+        (Man-goto-page): New arg NOERROR.  Never kill the current buffer.
+        (Man-mode): Pass t for NOERROR.
+
+        * progmodes/grep.el (grep-error-face): Use font-lock-keyword-face.
+        (grep-mode-font-lock-keywords):
+        Don't use compilation-...-face for messages that are not file names.
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Don't use compilation-...-face for messages that are not file names.
+
+2005-07-22  Juri Linkov  <juri@jurta.org>
+
+        * simple.el (line-move-1): Fix comments.
+
+        * startup.el (normal-splash-screen): Update menu name.
+
+        * tempo.el (tempo-insert-template): Fix 2005-07-16 change.
+
+2005-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el: Load term/rxvt if the terminal is actually an
+        rxvt terminal.
+        (xterm-rxvt-set-background-mode): Remove, not used anymore.
+
+        * term/rxvt.el (function-key-map): Use substitute-key-definition
+        to bind {C,S,C-S}-{f1-f10}. Add a few missing key bindings.
+
+        * term/cygwin.el: New file.
+
+2005-07-22  Kim F. Storm  <storm@cua.dk>
+
+        * image-file.el (insert-image-file, image-file-yank-handler):
+        Fix last change to maintain a (unique) yank-handler on yanked images.
+
+2005-07-22  Eduardo Mu,Aq(Boz  <emufer@terra.es>  (tiny change)
+
+        * dired.el (dired-move-to-filename-regexp): Recognize the B suffix
+        of the file size (as in "177B" for 177 bytes).  This happens with
+        "ls -lh" on FreeBSD.
+
 2005-07-22  Juanma Barranquero  <lekktu@gmail.com>
 
         * hilit-chg.el (highlight-changes-global-initial-state)
@@ -215,20 +385,20 @@
 
         * textmodes/org.el (org-table-column-names)
         (org-table-column-name-regexp)
-        (org-table-named-field-locations): New variables.
-        (org-archive-subtree): Protect `this-command' when calling
+        (org-table-named-field-locations): New variables.
+        (org-archive-subtree): Protect `this-command' when calling
         `org-copy-subtree' and `org-cut-subtree', to avoid appending to
         the kill buffer.
-        (org-complete): Remove fixed-formula completion.
-        (org-edit-formulas-map): New variable.
-        (org-table-edit-formulas): New command.
-        (org-finish-edit-formulas, org-abort-edit-formulas)
+        (org-complete): Remove fixed-formula completion.
+        (org-edit-formulas-map): New variable.
+        (org-table-edit-formulas): New command.
+        (org-finish-edit-formulas, org-abort-edit-formulas)
         (org-show-variable, org-table-get-vertical-vector): New functions.
-        (org-table-maybe-eval-formula): Handle `:=' fields.
-        (org-table-get-stored-formulas, org-table-store-formulas)
-        (org-table-get-formula, org-table-modify-formulas)
-        (org-table-replace-in-formulas): Handle named field formulas.
-        (org-table-get-specials): Store locations of named fields.
+        (org-table-maybe-eval-formula): Handle `:=' fields.
+        (org-table-get-stored-formulas, org-table-store-formulas)
+        (org-table-get-formula, org-table-modify-formulas)
+        (org-table-replace-in-formulas): Handle named field formulas.
+        (org-table-get-specials): Store locations of named fields.
 
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
@@ -290,8 +460,8 @@
         more than 88 colors.  Use green for light backgrounds with
         8 colors, and yellow for dark backgrounds with 8 colors.
 
-        * font-lock.el (font-lock-regexp-grouping-backslash): Don't
-        inherit from escape-glyph (use bold for all cases).
+        * font-lock.el (font-lock-regexp-grouping-backslash):
+        Don't inherit from escape-glyph (use bold for all cases).
 
         * info.el (info-xref-visited): Use light foreground color `violet'
         for dark backgrounds instead of dark color `magenta3'.
@@ -388,8 +558,8 @@
         `insert-buffer'.
 
         * calendar/icalendar.el (icalendar--get-unfolded-buffer):
-        * progmodes/ada-mode.el (ada-make-body): Use
-        `insert-buffer-substring' and `goto-char', not `insert-buffer'.
+        * progmodes/ada-mode.el (ada-make-body):
+        Use `insert-buffer-substring' and `goto-char', not `insert-buffer'.
 
         * dired.el (dired-log):
         * tar-mode.el (tar-subfile-save-buffer):
@@ -483,8 +653,8 @@
 
         * emulation/viper-init.el (viper-activate-input-method): Avoid warning.
 
-        * emacs-lisp/re-builder.el (reb-cook-regexp): Avoid
-        warning calling lre-compile-string.
+        * emacs-lisp/re-builder.el (reb-cook-regexp):
+        Avoid warning calling lre-compile-string.
         (reb-color-display-p): Avoid warning.
 
         * calculator.el (calculator-last-input): Guard uses
@@ -501,8 +671,8 @@
         (checkdoc-overlay-start, checkdoc-overlay-end)
         (checkdoc-mode-line-update, checkdoc-char=):
         Define such that compiler knows they are defined.
-        (checkdoc-call-eval-buffer): Deleted.  Use eval-buffer directly.
-        (checkdoc-read-event): Deleted.  Use read-event directly.
+        (checkdoc-call-eval-buffer): Delete.  Use eval-buffer directly.
+        (checkdoc-read-event): Delete.  Use read-event directly.
 
         * whitespace.el (whitespace-make-overlay)
         (whitespace-overlay-put, whitespace-delete-overlay)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 51a5e0469e5..1f0d671afb4 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -169,7 +169,7 @@ recently set ones come first, oldest ones come last)."
 
 
 (defcustom bookmark-automatically-show-annotations t
-  "*nil means don't show annotations when jumping to a bookmark."
+  "*Non-nil means show annotations when jumping to a bookmark."
   :type 'boolean
   :group 'bookmark)
 
@@ -333,14 +333,14 @@ through a file easier.")
 
 
 (defun bookmark-get-bookmark (bookmark)
-  "Return the full entry for BOOKMARK in bookmark-alist.
+  "Return the full entry for BOOKMARK in `bookmark-alist'.
 If BOOKMARK is not a string, return nil."
   (when (stringp bookmark)
     (assoc-string bookmark bookmark-alist bookmark-completion-ignore-case)))
 
 
 (defun bookmark-get-bookmark-record (bookmark)
-  "Return the guts of the entry for BOOKMARK in bookmark-alist.
+  "Return the guts of the entry for BOOKMARK in `bookmark-alist'.
 That is, all information but the name."
   (car (cdr (bookmark-get-bookmark bookmark))))
 
@@ -443,8 +443,7 @@ That is, all information but the name."
              (list (cons 'info-node node)))))
 
   (message "%S" (assq 'info-node (bookmark-get-bookmark-record bookmark)))
-  (sit-for 4)
-  )
+  (sit-for 4))
 
 
 (defvar bookmark-history nil
@@ -619,7 +618,7 @@ You should never need to change this.")
 
 
 (defun bookmark-alist-from-buffer ()
-  "Return a bookmark-alist (in any format) from the current buffer.
+  "Return a `bookmark-alist' (in any format) from the current buffer.
 The buffer must of course contain bookmark format information.
 Does not care from where in the buffer it is called, and does not
 affect point."
@@ -659,7 +658,7 @@ affect point."
 
 (defun bookmark-upgrade-file-format-from-0 ()
   "Upgrade a bookmark file of format 0 (the original format) to format 1.
-This expects to be called from point-min in a bookmark file."
+This expects to be called from `point-min' in a bookmark file."
   (message "Upgrading bookmark format from 0 to %d..."
            bookmark-file-format-version)
   (let* ((old-list (bookmark-alist-from-buffer))
@@ -676,7 +675,7 @@ This expects to be called from point-min in a bookmark file."
 
 (defun bookmark-grok-file-format-version ()
   "Return an integer which is the file-format version of this bookmark file.
-This expects to be called from point-min in a bookmark file."
+This expects to be called from `point-min' in a bookmark file."
   (if (looking-at "^;;;;")
       (save-excursion
         (save-match-data
@@ -691,7 +690,7 @@ This expects to be called from point-min in a bookmark file."
 (defun bookmark-maybe-upgrade-file-format ()
   "Check the file-format version of this bookmark file.
 If the version is not up-to-date, upgrade it automatically.
-This expects to be called from point-min in a bookmark file."
+This expects to be called from `point-min' in a bookmark file."
   (let ((version (bookmark-grok-file-format-version)))
     (cond
      ((= version bookmark-file-format-version)
@@ -783,7 +782,7 @@ the list of bookmarks.\)"
 (defun bookmark-kill-line (&optional newline-too)
   "Kill from point to end of line.
 If optional arg NEWLINE-TOO is non-nil, delete the newline too.
-Does not affect the kill-ring."
+Does not affect the kill ring."
   (let ((eol (save-excursion (end-of-line) (point))))
     (delete-region (point) eol)
     (if (and newline-too (looking-at "\n"))
@@ -842,11 +841,11 @@ the bookmark (and file, and point) specified in buffer local variables."
 
 (defvar bookmark-read-annotation-text-func 'bookmark-default-annotation-text
   "Function to return default text to use for a bookmark annotation.
-It takes the name of the bookmark, as a string, as an arg.")
+It takes one argument, the name of the bookmark, as a string.")
 
 (defun bookmark-read-annotation-mode (buf point parg bookmark)
   "Mode for composing annotations for a bookmark.
-Wants BUF POINT PARG and BOOKMARK.
+Wants BUF, POINT, PARG, and BOOKMARK.
 When you have finished composing, type \\[bookmark-send-annotation] to send
 the annotation.
 
@@ -933,7 +932,7 @@ Lines beginning with `#' are ignored."
 
 
 (defun bookmark-insert-current-bookmark ()
-  "Insert this buffer's value of bookmark-current-bookmark.
+  "Insert this buffer's value of `bookmark-current-bookmark'.
 Default to file name if it's nil."
   (interactive)
   (let ((str
@@ -1044,7 +1043,7 @@ bookmarks.  See help on function `bookmark-load' for more about
 this.
 
 If the file pointed to by BOOKMARK no longer exists, you will be asked
-if you wish to give the bookmark a new location, and bookmark-jump
+if you wish to give the bookmark a new location, and `bookmark-jump'
 will then jump to the new location, as well as recording it in place
 of the old one in the permanent bookmark record."
   (interactive
@@ -1304,8 +1303,8 @@ Saves by default in the file defined by the variable
 `bookmark-default-file'.  With a prefix arg, save it in file FILE
 \(second argument\).
 
-If you are calling this from Lisp, the two arguments are PREFIX-ARG
-and FILE, and if you just want it to write to the default file, then
+If you are calling this from Lisp, the two arguments are PARG and
+FILE, and if you just want it to write to the default file, then
 pass no arguments.  Or pass in nil and FILE, and it will save in FILE
 instead.  If you pass in one argument, and it is non-nil, then the
 user will be interactively queried for a file to save in.
@@ -1804,7 +1803,7 @@ You can mark bookmarks with the \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-mar
           (setq tem (bookmark-bmenu-bookmark))
           (let ((inhibit-read-only t))
             (delete-char -1)
-            (insert ?\ ))
+            (insert ?\s))
           (or (string-equal tem bmrk)
               (member tem others)
               (setq others (cons tem others))))
@@ -2093,7 +2092,7 @@ strings returned are not."
                (format "-*- %s (%d) -*-" name iter)
                (nreverse lst))
               pane-list)))
-    
+
     ;; Popup the menu and return the string.
     (x-popup-menu event (cons (concat "-*- " name " -*-")
                               (nreverse pane-list)))))
@@ -2141,12 +2140,14 @@ strings returned are not."
 
 ;;; Exit Hook, called from kill-emacs-hook
 (defvar bookmark-exit-hook nil
-  "Hook run when emacs exits.")
+  "Hook run when Emacs exits.")
+
+(define-obsolete-variable-alias 'bookmark-exit-hooks 'bookmark-exit-hook "22.1")
 
 (defun bookmark-exit-hook-internal ()
   "Save bookmark state, if necessary, at Emacs exit time.
-This also runs `bookmark-exit-hooks'."
-  (run-hooks 'bookmark-exit-hooks)
+This also runs `bookmark-exit-hook'."
+  (run-hooks 'bookmark-exit-hook)
   (and bookmark-alist
        (bookmark-time-to-save-p t)
        (bookmark-save)))
diff --git a/lisp/dired.el b/lisp/dired.el
index 0ba369e4640..880d31d9b41 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1865,11 +1865,11 @@ DIR must be a directory name, not a file name."
          ;; The "[0-9]" below requires the previous column to end in a digit.
          ;; This avoids recognizing `1 may 1997' as a date in the line:
          ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
-         ;; The "[kKMGTPEZY]?" below supports "ls -alh" output.
+         ;; The "[BkKMGTPEZY]?" below supports "ls -alh" output.
          ;; The ".*" below finds the last match if there are multiple matches.
          ;; This avoids recognizing `jservice  10  1024' as a date in the line:
          ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-    (concat ".*[0-9][kKMGTPEZY]?" s
+    (concat ".*[0-9][BkKMGTPEZY]?" s
             "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
             s "+"))
   "Regular expression to match up to the file name in a directory listing.
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index bdfe79b3b6a..e0a3c5ed285 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -299,20 +299,6 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   (add-hook 'kill-buffer-hook 'reb-kill-buffer)
   (reb-auto-update nil nil nil))
 
-
-;; Handy macro for doing things in other windows
-(defmacro reb-with-current-window (window &rest body)
-  "With WINDOW selected evaluate BODY forms and reselect previous window."
-
-  (let ((oldwindow (make-symbol "*oldwindow*")))
-    `(let ((,oldwindow (selected-window)))
-       (select-window ,window)
-       (unwind-protect
-           (progn
-             ,@body)
-         (select-window ,oldwindow)))))
-(put 'reb-with-current-window 'lisp-indent-function 0)
-
 (defun reb-color-display-p ()
   "Return t if display is capable of displaying colors."
   (eq 'color
@@ -330,6 +316,15 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   "Return binding for SYMBOL in the RE Builder target buffer."
   `(with-current-buffer reb-target-buffer ,symbol))
 
+(defun reb-initialize-buffer ()
+  "Initialize the current buffer as a RE Builder buffer."
+  (erase-buffer)
+  (reb-insert-regexp)
+  (goto-char (+ 2 (point-min)))
+  (cond ((reb-lisp-syntax-p)
+         (reb-lisp-mode))
+        (t (reb-mode))))
+
 ;;; This is to help people find this in Apropos.
 ;;;###autoload
 (defalias 'regexp-builder 're-builder)
@@ -349,13 +344,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
           reb-window-config (current-window-configuration))
     (select-window (split-window (selected-window) (- (window-height) 4)))
     (switch-to-buffer (get-buffer-create reb-buffer))
-    (erase-buffer)
-    (reb-insert-regexp)
-    (goto-char (+ 2 (point-min)))
-    (cond
-     ((reb-lisp-syntax-p)
-      (reb-lisp-mode))
-     (t (reb-mode)))))
+    (reb-initialize-buffer)))
 
 (defun reb-change-target-buffer (buf)
   "Change the target buffer and display it in the target window."
@@ -393,8 +382,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   (interactive)
 
   (reb-assert-buffer-in-window)
-  (reb-with-current-window
-    reb-target-window
+  (with-selected-window reb-target-window
     (if (not (re-search-forward reb-regexp (point-max) t))
         (message "No more matches.")
       (reb-show-subexp
@@ -406,13 +394,15 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   (interactive)
 
   (reb-assert-buffer-in-window)
-  (reb-with-current-window reb-target-window
-    (goto-char (1- (point)))
-    (if (not (re-search-backward reb-regexp (point-min) t))
-        (message "No more matches.")
-      (reb-show-subexp
-       (or (and reb-subexp-mode reb-subexp-displayed) 0)
-       t))))
+  (with-selected-window reb-target-window
+    (let ((p (point)))
+      (goto-char (1- p))
+      (if (re-search-backward reb-regexp (point-min) t)
+          (reb-show-subexp
+           (or (and reb-subexp-mode reb-subexp-displayed) 0)
+           t)
+        (goto-char p)
+        (message "No more matches.")))))
 
 (defun reb-toggle-case ()
   "Toggle case sensitivity of searches for RE Builder target buffer."
@@ -449,7 +439,7 @@ On color displays this just puts point to the end of the expression as
 the match should already be marked by an overlay.
 On other displays jump to the beginning and the end of it.
 If the optional PAUSE is non-nil then pause at the end in any case."
-  (reb-with-current-window reb-target-window
+  (with-selected-window reb-target-window
     (if (not (reb-color-display-p))
         (progn (goto-char (match-beginning subexp))
                (sit-for reb-blink-delay)))
@@ -479,14 +469,9 @@ Optional argument SYNTAX must be specified if called non-interactively."
   (if (memq syntax '(read string lisp-re sregex rx))
       (let ((buffer (get-buffer reb-buffer)))
         (setq reb-re-syntax syntax)
-        (if buffer
-            (with-current-buffer buffer
-              (erase-buffer)
-              (reb-insert-regexp)
-              (goto-char (+ 2 (point-min)))
-              (cond ((reb-lisp-syntax-p)
-                     (reb-lisp-mode))
-                    (t (reb-mode))))))
+        (when buffer
+          (with-current-buffer buffer
+            (reb-initialize-buffer))))
     (error "Invalid syntax: %s" syntax)))
 
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 33f639380a6..7bc733ad90f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,36 @@
+2005-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2231.el (rfc2231-parse-string): Take care that not only a
+        segmented parameter but also other parameters might be there.
+
+2005-07-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-next-page-1): Don't scroll if there're
+        fewer lines than that of scroll-margin.
+        (gnus-article-prev-page): Narrow the range to bind scroll-in-place.
+
+2005-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-next-page): Revert.
+        (gnus-article-beginning-of-window): New macro.
+        (gnus-article-next-page-1): Use it.
+        (gnus-article-prev-page): Ditto.
+        (gnus-mime-save-part-and-strip): Use insert-buffer-substring
+        instead of insert-buffer.
+        (gnus-mime-delete-part): Ditto.
+        (gnus-article-edit-exit): Ditto.
+
+        * gnus-util.el (gnus-beginning-of-window): Remove.
+        (gnus-end-of-window): Remove.
+
+        * lpath.el: Don't bind scroll-margin.
+
+2005-07-25  Simon Josefsson  <jas@extundo.com>
+
+        * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible
+        to have the url package without w3.  Reported by Daiki Ueno
+        <ueno@unixuser.org> and Luigi Panzeri <matley@muppetslab.org>.
+
 2005-07-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mml.el (mml-minibuffer-read-disposition): Don't use inline by default
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2be1afea77d..f7e3420e922 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4117,7 +4117,7 @@ Deleting parts may malfunction or destroy the article; continue? ")
                        ',gnus-newsgroup-ignored-charsets))
                   (mbl mml-buffer-list))
               (setq mml-buffer-list nil)
-              (insert-buffer gnus-original-article-buffer)
+              (insert-buffer-substring gnus-original-article-buffer)
               (mime-to-mml ',handles)
               (setq gnus-article-mime-handles nil)
               (let ((mbl1 mml-buffer-list))
@@ -4199,7 +4199,7 @@ Deleting parts may malfunction or destroy the article; continue? ")
                      ',gnus-newsgroup-ignored-charsets))
                 (mbl mml-buffer-list))
             (setq mml-buffer-list nil)
-            (insert-buffer gnus-original-article-buffer)
+            (insert-buffer-substring gnus-original-article-buffer)
             (mime-to-mml ',handles)
             (setq gnus-article-mime-handles nil)
             (let ((mbl1 mml-buffer-list))
@@ -5160,7 +5160,7 @@ If given a numerical ARG, move forward ARG pages."
 If end of article, return non-nil.  Otherwise return nil.
 Argument LINES specifies lines to be scrolled up."
   (interactive "p")
-  (gnus-end-of-window)
+  (move-to-window-line -1)
   (if (save-excursion
         (end-of-line)
         (and (pos-visible-in-window-p)  ;Not continuation line.
@@ -5182,20 +5182,38 @@ Argument LINES specifies lines to be scrolled up."
     (gnus-article-next-page-1 lines)
     nil))
 
+(defmacro gnus-article-beginning-of-window ()
+  "Move point to the beginning of the window.
+In Emacs, the point is placed at the line number which `scroll-margin'
+specifies."
+  (if (featurep 'xemacs)
+      '(move-to-window-line 0)
+    '(move-to-window-line
+      (min (max 0 scroll-margin)
+           (max 1 (- (window-height)
+                     (if mode-line-format 1 0)
+                     (if (and (boundp 'header-line-format)
+                              (symbol-value 'header-line-format))
+                         1 0)))))))
+
 (defun gnus-article-next-page-1 (lines)
-  (let ((scroll-in-place nil))
+  (unless (and (not (featurep 'xemacs))
+               (> (symbol-value 'scroll-margin) 0)
+               (<= (count-lines (window-start) (point-max))
+                   (symbol-value 'scroll-margin)))
     (condition-case ()
-        (scroll-up lines)
+        (let ((scroll-in-place nil))
+          (scroll-up lines))
       (end-of-buffer
        ;; Long lines may cause an end-of-buffer error.
-       (goto-char (point-max)))))
-  (gnus-beginning-of-window))
+       (goto-char (point-max))))
+    (gnus-article-beginning-of-window)))
 
 (defun gnus-article-prev-page (&optional lines)
   "Show previous page of current article.
 Argument LINES specifies lines to be scrolled down."
   (interactive "p")
-  (gnus-beginning-of-window)
+  (move-to-window-line 0)
   (if (and gnus-page-broken
            (bobp)
            (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer?
@@ -5203,13 +5221,13 @@ Argument LINES specifies lines to be scrolled down."
         (gnus-narrow-to-page -1)        ;Go to previous page.
         (goto-char (point-max))
         (recenter -1))
-    (let ((scroll-in-place nil))
-      (prog1
-          (condition-case ()
-              (scroll-down lines)
-            (beginning-of-buffer
-             (goto-char (point-min))))
-        (gnus-beginning-of-window)))))
+    (prog1
+        (condition-case ()
+            (let ((scroll-in-place nil))
+              (scroll-down lines))
+          (beginning-of-buffer
+           (goto-char (point-min))))
+      (gnus-article-beginning-of-window))))
 
 (defun gnus-article-only-boring-p ()
   "Decide whether there is only boring text remaining in the article.
@@ -5818,7 +5836,7 @@ groups."
           (window-start (window-start)))
       (erase-buffer)
       (if (gnus-buffer-live-p gnus-original-article-buffer)
-          (insert-buffer gnus-original-article-buffer))
+          (insert-buffer-substring gnus-original-article-buffer))
       (let ((winconf gnus-prev-winconf))
         (kill-all-local-variables)
         (gnus-article-mode)
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 363b9c2f4a0..925555e1ff0 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1577,30 +1577,6 @@ empty directories from OLD-PATH."
   (defalias 'gnus-set-process-query-on-exit-flag
     'process-kill-without-query))
 
-(defun gnus-beginning-of-window ()
-  "Move point to the beginning of the window."
-  (move-to-window-line
-   (if (featurep 'xemacs)
-       0
-     (min scroll-margin
-          (max 1 (- (window-height)
-                    (if mode-line-format 1 0)
-                    (if (and (boundp 'header-line-format)
-                             (symbol-value 'header-line-format))
-                        1 0)))))))
-
-(defun gnus-end-of-window ()
-  "Move point to the end of the window."
-  (move-to-window-line
-   (if (featurep 'xemacs)
-       -1
-     (max (- -1 scroll-margin)
-          (- -1 (max 1 (- (window-height)
-                          (if mode-line-format 1 0)
-                          (if (and (boundp 'header-line-format)
-                                   (symbol-value 'header-line-format))
-                              1 0))))))))
-
 (provide 'gnus-util)
 
 ;;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49
diff --git a/lisp/gnus/pgg.el b/lisp/gnus/pgg.el
index 91b56c57a4f..8d72fd31502 100644
--- a/lisp/gnus/pgg.el
+++ b/lisp/gnus/pgg.el
@@ -410,7 +410,6 @@ within the region."
 
 (defun pgg-insert-url-with-w3 (url)
   (ignore-errors
-    (require 'w3)
     (require 'url)
     (let (buffer-file-name)
       (url-insert-file-contents url))))
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 0a6cfdb2af1..4c39ba6c7fd 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -1,6 +1,6 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -52,7 +52,7 @@ The list will be on the form
           (prev-value "")
           display-name mailbox c display-string parameters
           attribute value type subtype number encoded
-          prev-attribute)
+          prev-attribute prev-encoded)
       (ietf-drums-init (mail-header-remove-whitespace
                         (mail-header-remove-comments string)))
       (let ((table (copy-syntax-table ietf-drums-syntax-table)))
@@ -106,9 +106,14 @@ The list will be on the form
             ;; See if we have any previous continuations.
             (when (and prev-attribute
                        (not (eq prev-attribute attribute)))
-              (push (cons prev-attribute prev-value) parameters)
+              (push (cons prev-attribute
+                          (if prev-encoded
+                              (rfc2231-decode-encoded-string prev-value)
+                            prev-value))
+                    parameters)
               (setq prev-attribute nil
-                    prev-value ""))
+                    prev-value ""
+                    prev-encoded nil))
             (unless (eq c ?=)
               (error "Invalid header: %s" string))
             (forward-char 1)
@@ -127,7 +132,8 @@ The list will be on the form
               (error "Invalid header: %s" string)))
             (if number
                 (setq prev-attribute attribute
-                      prev-value (concat prev-value value))
+                      prev-value (concat prev-value value)
+                      prev-encoded encoded)
               (push (cons attribute
                           (if encoded
                               (rfc2231-decode-encoded-string value)
@@ -137,7 +143,7 @@ The list will be on the form
         ;; Take care of any final continuations.
         (when prev-attribute
           (push (cons prev-attribute
-                      (if encoded
+                      (if prev-encoded
                           (rfc2231-decode-encoded-string prev-value)
                         prev-value))
                 parameters))
diff --git a/lisp/image-file.el b/lisp/image-file.el
index be95470184c..6b88b84e19f 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -118,7 +118,8 @@ the command `insert-file-contents'."
               (create-image data nil t))
              (props
               `(display ,image
-                        yank-handler (image-file-yank-handler)
+                        yank-handler
+                        (image-file-yank-handler nil t)
                         intangible ,image
                         rear-nonsticky (display intangible)
                         ;; This a cheap attempt to make the whole buffer
@@ -141,12 +142,18 @@ the command `insert-file-contents'."
 ;; recognized as two different images.
 (defun image-file-yank-handler (string)
   "Yank handler for inserting an image into a buffer."
-  (let ((image (get-text-property 0 'display string)))
+  (let ((len (length string))
+        (image (get-text-property 0 'display string)))
+    (remove-text-properties 0 len yank-excluded-properties string)
     (if (consp image)
-        (put-text-property 0 (length string)
-                           'display
-                           (cons (car image) (cdr image))
-                           string))
+        (add-text-properties 0
+                             (or (next-single-property-change 0 'image-counter string)
+                                 (length string))
+                             `(display
+                               ,(cons (car image) (cdr image))
+                               yank-handler
+                               ,(cons 'image-file-yank-handler '(nil t)))
+                             string))
     (insert string)))
 
 (put 'image-file-handler 'safe-magic t)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 90a12b7a7b9..e72b011fc40 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -122,8 +122,8 @@ a tab, a carriage return (control-M), a newline, and `]+'."
 
 (defcustom search-invisible 'open
   "If t incremental search can match hidden text.
-nil means don't match invisible text.
-If the value is `open', if the text matched is made invisible by
+A nil value means don't match invisible text.
+When the value is `open', if the text matched is made invisible by
 an overlay having an `invisible' property and that overlay has a property
 `isearch-open-invisible', then incremental search will show the contents.
 \(This applies when using `outline.el' and `hideshow.el'.)
@@ -188,10 +188,10 @@ to the search status stack.")
 
 (defvar search-ring-yank-pointer nil
   "Index in `search-ring' of last string reused.
-nil if none yet.")
+It is nil if none yet.")
 (defvar regexp-search-ring-yank-pointer nil
   "Index in `regexp-search-ring' of last string reused.
-nil if none yet.")
+It is nil if none yet.")
 
 (defcustom search-ring-update nil
   "*Non-nil if advancing or retreating in the search ring should cause search.
@@ -246,22 +246,25 @@ If this is nil, extra highlighting can be \"manually\" removed with
 \\[lazy-highlight-cleanup]."
   :type 'boolean
   :group 'lazy-highlight)
-(defvaralias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
-(make-obsolete-variable 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1")
+(define-obsolete-variable-alias 'isearch-lazy-highlight-cleanup
+                                'lazy-highlight-cleanup
+                                "22.1")
 
 (defcustom lazy-highlight-initial-delay 0.25
   "*Seconds to wait before beginning to lazily highlight all matches."
   :type 'number
   :group 'lazy-highlight)
-(defvaralias 'isearch-lazy-highlight-initial-delay 'lazy-highlight-initial-delay)
-(make-obsolete-variable 'isearch-lazy-highlight-initial-delay 'lazy-highlight-initial-delay "22.1")
+(define-obsolete-variable-alias 'isearch-lazy-highlight-initial-delay
+                                'lazy-highlight-initial-delay
+                                "22.1")
 
 (defcustom lazy-highlight-interval 0 ; 0.0625
   "*Seconds between lazily highlighting successive matches."
   :type 'number
   :group 'lazy-highlight)
-(defvaralias 'isearch-lazy-highlight-interval 'lazy-highlight-interval)
-(make-obsolete-variable 'isearch-lazy-highlight-interval 'lazy-highlight-interval "22.1")
+(define-obsolete-variable-alias 'isearch-lazy-highlight-interval
+                                'lazy-highlight-interval
+                                "22.1")
 
 (defcustom lazy-highlight-max-at-a-time 20
   "*Maximum matches to highlight at a time (for `lazy-highlight').
@@ -271,8 +274,9 @@ A value of nil means highlight all matches."
   :type '(choice (const :tag "All" nil)
                  (integer :tag "Some"))
   :group 'lazy-highlight)
-(defvaralias 'isearch-lazy-highlight-max-at-a-time 'lazy-highlight-max-at-a-time)
-(make-obsolete-variable 'isearch-lazy-highlight-max-at-a-time 'lazy-highlight-max-at-a-time "22.1")
+(define-obsolete-variable-alias 'isearch-lazy-highlight-max-at-a-time
+                                'lazy-highlight-max-at-a-time
+                                "22.1")
 
 (defface lazy-highlight
   '((((class color) (min-colors 88) (background light))
@@ -288,8 +292,9 @@ A value of nil means highlight all matches."
   :group 'lazy-highlight)
 (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
 (defvar lazy-highlight-face 'lazy-highlight)
-(defvaralias 'isearch-lazy-highlight-face 'lazy-highlight-face)
-(make-obsolete-variable 'isearch-lazy-highlight-face 'lazy-highlight-face "22.1")
+(define-obsolete-variable-alias 'isearch-lazy-highlight-face
+                                'lazy-highlight-face
+                                "22.1")
 
 ;; Define isearch-mode keymap.
 
@@ -308,12 +313,12 @@ A value of nil means highlight all matches."
     ;; We need these explicit definitions because, in a dense keymap,
     ;; the binding for t does not affect characters.
     ;; We use a dense keymap to save space.
-    (while (< i ?\ )
+    (while (< i ?\s)
       (define-key map (make-string 1 i) 'isearch-other-control-char)
       (setq i (1+ i)))
 
     ;; Single-byte printing chars extend the search string by default.
-    (setq i ?\ )
+    (setq i ?\s)
     (while (< i 256)
       (define-key map (vector i) 'isearch-printing-char)
       (setq i (1+ i)))
@@ -527,7 +532,7 @@ Type \\[isearch-quote-char] to quote control character to search for it.
 Type \\[isearch-query-replace] to start `query-replace' with string to\
  replace from last search string.
 Type \\[isearch-query-replace-regexp] to start `query-replace-regexp'\
- with string to replace from last search string..
+ with string to replace from last search string.
 
 Type \\[isearch-toggle-case-fold] to toggle search case-sensitivity.
 Type \\[isearch-toggle-regexp] to toggle regular-expression mode.
@@ -1653,7 +1658,7 @@ Isearch mode."
                ;; directly to avoid the input method and keyboard
                ;; coding system translating it.
                (if (and (integerp key)
-                        (>= key ?\ ) (/= key 127) (< key 256))
+                        (>= key ?\s) (/= key 127) (< key 256))
                    (progn
                      (isearch-process-search-char key)
                      (setq keylist (cdr keylist)))
@@ -1745,7 +1750,7 @@ Isearch mode."
     ;; Assume character codes 0200 - 0377 stand for characters in some
     ;; single-byte character set, and convert them to Emacs
     ;; characters.
-    (if (and isearch-regexp (= char ?\ ))
+    (if (and isearch-regexp (= char ?\s))
         (if (subregexp-context-p isearch-string (length isearch-string))
             (isearch-process-search-string "[ ]" " ")
           (isearch-process-search-char char))
@@ -1766,7 +1771,7 @@ Isearch mode."
   (interactive)
   (let ((char last-command-char))
     (if (= char ?\S-\ )
-        (setq char ?\ ))
+        (setq char ?\s))
     (if (and enable-multibyte-characters
              (>= char ?\200)
              (<= char ?\377))
@@ -2196,7 +2201,7 @@ since they have special meaning in a regexp."
 
 (defun isearch-text-char-description (c)
   (cond
-   ((< c ?\ ) (format "^%c" (+ c 64)))
+   ((< c ?\s) (format "^%c" (+ c 64)))
    ((= c ?\^?) "^?")
    (t (char-to-string c))))
 
@@ -2283,8 +2288,9 @@ is nil.  This function is called when exiting an incremental search if
     (cancel-timer isearch-lazy-highlight-timer)
     (setq isearch-lazy-highlight-timer nil)))
 
-(defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
-(make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1")
+(define-obsolete-function-alias 'isearch-lazy-highlight-cleanup
+                                'lazy-highlight-cleanup
+                                "22.1")
 
 (defun isearch-lazy-highlight-new-loop (&optional beg end)
   "Cleanup any previous `lazy-highlight' loop and begin a new one.
diff --git a/lisp/man.el b/lisp/man.el
index cb62aa65e94..ed6112e1978 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -352,6 +352,7 @@ Otherwise, the value is whatever the function
 (make-variable-buffer-local 'Man-page-mode-string)
 (make-variable-buffer-local 'Man-original-frame)
 (make-variable-buffer-local 'Man-arguments)
+(put 'Man-arguments 'permanent-local t)
 
 (setq-default Man-sections-alist nil)
 (setq-default Man-refpages-alist nil)
@@ -1005,8 +1006,15 @@ manpage command."
           (if Man-fontify-manpage-flag
               (Man-fontify-manpage)
             (Man-cleanup-manpage))
+
           (run-hooks 'Man-cooked-hook)
-          (Man-mode)
+          (Man-mode)
+
+          (if (not Man-page-list)
+              (let ((args Man-arguments))
+                (kill-buffer (current-buffer))
+                (error "Can't find the %s manpage" args)))
+
           (set-buffer-modified-p nil)
           ))
         ;; Restore case-fold-search before calling
@@ -1082,7 +1090,7 @@ The following key bindings are currently in effect in the buffer:
   (Man-build-page-list)
   (Man-strip-page-headers)
   (Man-unindent)
-  (Man-goto-page 1)
+  (Man-goto-page 1 t)
   (run-mode-hooks 'Man-mode-hook))
 
 (defsubst Man-build-section-alist ()
@@ -1342,35 +1350,32 @@ Specify which REFERENCE to use; default is based on word at point."
   (interactive)
   (quit-window))
 
-(defun Man-goto-page (page)
+(defun Man-goto-page (page &optional noerror)
   "Go to the manual page on page PAGE."
   (interactive
    (if (not Man-page-list)
-       (let ((args Man-arguments))
-         (kill-buffer (current-buffer))
-         (error "Can't find the %s manpage" args))
+       (error "Not a man page buffer")
      (if (= (length Man-page-list) 1)
          (error "You're looking at the only manpage in the buffer")
        (list (read-minibuffer (format "Go to manpage [1-%d]: "
                                       (length Man-page-list)))))))
-  (if (not Man-page-list)
-      (let ((args Man-arguments))
-        (kill-buffer (current-buffer))
-        (error "Can't find the %s manpage" args)))
-  (if (or (< page 1)
-          (> page (length Man-page-list)))
-      (error "No manpage %d found" page))
-  (let* ((page-range (nth (1- page) Man-page-list))
-         (page-start (car page-range))
-         (page-end (car (cdr page-range))))
-    (setq Man-current-page page
-          Man-page-mode-string (Man-make-page-mode-string))
-    (widen)
-    (goto-char page-start)
-    (narrow-to-region page-start page-end)
-    (Man-build-section-alist)
-    (Man-build-references-alist)
-    (goto-char (point-min))))
+  (if (and (not Man-page-list) (not noerror))
+      (error "Not a man page buffer"))
+  (when Man-page-list
+    (if (or (< page 1)
+            (> page (length Man-page-list)))
+        (error "No manpage %d found" page))
+    (let* ((page-range (nth (1- page) Man-page-list))
+           (page-start (car page-range))
+           (page-end (car (cdr page-range))))
+      (setq Man-current-page page
+            Man-page-mode-string (Man-make-page-mode-string))
+      (widen)
+      (goto-char page-start)
+      (narrow-to-region page-start page-end)
+      (Man-build-section-alist)
+      (Man-build-references-alist)
+      (goto-char (point-min)))))
 
 
 (defun Man-next-manpage ()
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index e8647dfc221..330fead2393 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -743,6 +743,21 @@ These mean that the FTP process should (or already has) been killed."
   :group 'ange-ftp
   :type 'regexp)
 
+(defcustom ange-ftp-potential-error-msgs
+  ;; On Mac OS X we sometimes get things like:
+  ;; 
+  ;;     ftp> open ftp.nluug.nl
+  ;;     Trying 2001:610:1:80aa:192:87:102:36...
+  ;;     ftp: connect to address 2001:610:1:80aa:192:87:102:36: No route to host
+  ;;     Trying 192.87.102.36...
+  ;;     Connected to ftp.nluug.nl.
+  "^ftp: connect to address .*: No route to host"
+  "*Regular expression matching ftp messages that can indicate serious errors.
+These mean that something went wrong, but they may be followed by more
+messages indicating that the error was somehow corrected."
+  :group 'ange-ftp
+  :type 'regexp)
+
 (defcustom ange-ftp-gateway-fatal-msgs
   "No route to host\\|Connection closed\\|No such host\\|Login incorrect"
   "*Regular expression matching login failure messages from rlogin/telnet."
@@ -1071,6 +1086,7 @@ All HOST values should be in lower case.")
 (defvar ange-ftp-xfer-size nil)
 (defvar ange-ftp-process-string nil)
 (defvar ange-ftp-process-result-line nil)
+(defvar ange-ftp-pending-error-line nil)
 (defvar ange-ftp-process-busy nil)
 (defvar ange-ftp-process-result nil)
 (defvar ange-ftp-process-multi-skip nil)
@@ -1544,6 +1560,7 @@ good, skip, fatal, or unknown."
         ((string-match ange-ftp-good-msgs line)
          (setq ange-ftp-process-busy nil
                ange-ftp-process-result t
+               ange-ftp-pending-error-line nil
                ange-ftp-process-result-line line))
         ;; Check this before checking for errors.
         ;; Otherwise the last line of these three seems to be an error:
@@ -1552,11 +1569,17 @@ good, skip, fatal, or unknown."
         ;; 230-"ftp.stsci.edu: unknown host", the new IP address will be...
         ((string-match ange-ftp-multi-msgs line)
          (setq ange-ftp-process-multi-skip t))
+        ((string-match ange-ftp-potential-error-msgs line)
+         ;; This looks like an error, but we have to keep reading the output
+         ;; to see if it was fixed or not.  E.g. it may indicate that IPv6
+         ;; failed, but maybe a subsequent IPv4 fallback succeeded.
+         (set (make-local-variable 'ange-ftp-pending-error-line) line)
+         t)
         ((string-match ange-ftp-fatal-msgs line)
          (delete-process proc)
          (setq ange-ftp-process-busy nil
                ange-ftp-process-result-line line))
-        (ange-ftp-process-multi-skip
+        (ange-ftp-process-multi-skip
          t)
         (t
          (setq ange-ftp-process-busy nil
@@ -1651,12 +1674,21 @@ good, skip, fatal, or unknown."
                           (string-match "\n" ange-ftp-process-string))
                 (let ((line (substring ange-ftp-process-string
                                        0
-                                       (match-beginning 0))))
+                                       (match-beginning 0)))
+                      (seen-prompt nil))
                   (setq ange-ftp-process-string (substring ange-ftp-process-string
                                                            (match-end 0)))
                   (while (string-match "^ftp> *" line)
+                    (setq seen-prompt t)
                     (setq line (substring line (match-end 0))))
-                  (ange-ftp-process-handle-line line proc)))
+                  (if (not (and seen-prompt ange-ftp-pending-error-line))
+                      (ange-ftp-process-handle-line line proc)
+                    ;; If we've seen a potential error message and it
+                    ;; hasn't been cancelled by a good message before
+                    ;; seeing a propt, then the error was real.
+                    (delete-process proc)
+                    (setq ange-ftp-process-busy nil
+                          ange-ftp-process-result-line ange-ftp-pending-error-line))))
 
               ;; has the ftp client finished?  if so then do some clean-up
               ;; actions.
@@ -1988,7 +2020,7 @@ on the gateway machine to do the ftp instead."
   (make-local-variable 'comint-password-prompt-regexp)
   ;; This is a regexp that can't match anything.
   ;; ange-ftp has its own ways of handling passwords.
-  (setq comint-password-prompt-regexp "^a\\'z")
+  (setq comint-password-prompt-regexp "\\`a\\`")
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
   (run-mode-hooks 'internal-ange-ftp-mode-hook))
@@ -4543,9 +4575,9 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
   (setq ange-ftp-ls-cache-file nil)     ;Stop confusing Dired.
   0)
 
-;;; This is turned off because it has nothing properly to do
-;;; with dired.  It could be reasonable to adapt this to
-;;; replace ange-ftp-copy-file.
+;; This is turned off because it has nothing properly to do
+;; with dired.  It could be reasonable to adapt this to
+;; replace ange-ftp-copy-file.
 
 ;;;;; ------------------------------------------------------------
 ;;;;; Noddy support for async copy-file within dired.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d3cbf142222..ff41a964ecc 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -377,13 +377,13 @@ you may also want to change `compilation-page-delimiter'.")
    '(;; configure output lines.
      ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$"
       (1 font-lock-variable-name-face)
-      (2 (compilation-face '(4 . 3))))
+      (2 font-lock-keyword-face))
      ;; Command output lines.  Recognize `make[n]:' lines too.
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
      (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
-     ("^Compilation finished" . compilation-info-face)
-     ("^Compilation exited abnormally" . compilation-error-face))
+     ("^Compilation finished" . font-lock-keyword-face)
+     ("^Compilation exited abnormally" . font-lock-keyword-face))
    "Additional things to highlight in Compilation mode.
 This gets tacked on the end of the generated expressions.")
 
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 8a426a37365..8e574e912c6 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -524,9 +524,9 @@ Also display the main routine in the disassembly buffer if present."
   (setq gdb-pending-triggers
    (delq 'gdb-var-update gdb-pending-triggers))
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-    ;; dummy command to update speedbar at right time
+    ;; Dummy command to update speedbar at right time.
     (gdb-enqueue-input (list "server pwd\n" 'gdb-speedbar-timer-fn))
-    ;; keep gdb-pending-triggers non-nil till end
+    ;; Keep gdb-pending-triggers non-nil till end.
     (push 'gdb-speedbar-timer gdb-pending-triggers)))
 
 (defun gdb-speedbar-timer-fn ()
@@ -1023,7 +1023,7 @@ happens to be appropriate."
     (gdb-invalidate-threads)
     (unless (eq system-type 'darwin) ;Breaks on Darwin's GDB-5.3.
       ;; FIXME: with GDB-6 on Darwin, this might very well work.
-      ;; only needed/used with speedbar/watch expressions
+      ;; Only needed/used with speedbar/watch expressions.
       (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
         (setq gdb-var-changed t)    ; force update
         (dolist (var gdb-var-list)
@@ -1043,9 +1043,9 @@ happens to be appropriate."
   (if gdb-flush-pending-output
       nil
     (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
-    ;; Recall the left over gud-marker-acc from last time
+    ;; Recall the left over gud-marker-acc from last time.
     (setq gud-marker-acc (concat gud-marker-acc string))
-    ;; Start accumulating output for the GUD buffer
+    ;; Start accumulating output for the GUD buffer.
     (let ((output ""))
       ;;
       ;; Process all the complete markers in this chunk.
@@ -1295,7 +1295,7 @@ static char *magick[] = {
      :weight bold))
   "Face for enabled breakpoint icon in fringe."
   :group 'gud)
-;; compatibility alias for old name
+;; Compatibility alias for old name.
 (put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
 
 (defface breakpoint-disabled
@@ -1306,13 +1306,13 @@ static char *magick[] = {
     (((background light)) :foreground "grey40"))
   "Face for disabled breakpoint icon in fringe."
   :group 'gud)
-;; compatibility alias for old name
+;; Compatibility alias for old name.
 (put 'breakpoint-disabled-bitmap-face 'face-alias 'breakpoint-disabled)
 
-;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
+;; Put breakpoint icons in relevant margins (even those set in the GUD buffer).
 (defun gdb-info-breakpoints-custom ()
   (let ((flag) (bptno))
-    ;; remove all breakpoint-icons in source buffers but not assembler buffer
+    ;; Remove all breakpoint-icons in source buffers but not assembler buffer.
     (dolist (buffer (buffer-list))
       (with-current-buffer buffer
         (if (and (eq gud-minor-mode 'gdba)
@@ -1342,13 +1342,14 @@ static char *magick[] = {
                            (setq file (cdr (assoc bptno gdb-location-alist))))
                         (if (and file
                                  (not (string-equal file "File not found")))
-                            (with-current-buffer (find-file-noselect file)
+                            (with-current-buffer
+                                (find-file-noselect file 'nowarn)
                               (set (make-local-variable 'gud-minor-mode)
                                    'gdba)
                               (set (make-local-variable 'tool-bar-map)
                                    gud-tool-bar-map)
-                              ;; only want one breakpoint icon at each
-                              ;; location
+                              ;; Only want one breakpoint icon at each
+                              ;; location.
                               (save-excursion
                                 (goto-line (string-to-number line))
                                 (gdb-put-breakpoint-icon (eq flag ?y) bptno)))
@@ -1388,11 +1389,7 @@ static char *magick[] = {
         (with-selected-window (posn-window posn)
           (save-excursion
             (goto-char (posn-point posn))
-            (if
-;               (or
-                 (posn-object posn)
-;                (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
-;                    'breakpoint))
+            (if (posn-object posn)
                 (gdb-enqueue-input
                  (list
                   (let ((bptno (get-text-property
@@ -1980,7 +1977,7 @@ corresponding to the mode line clicked."
              'mouse-1
              #'(lambda () (interactive)
                  (let ((gdb-memory-address
-                        ;; let GDB do the arithmetic
+                        ;; Let GDB do the arithmetic.
                         (concat
                          gdb-memory-address " - "
                          (number-to-string
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 8f6dd73cba1..dce17ed1306 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -277,7 +277,8 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 (defvar grep-hit-face   compilation-info-face
   "Face name to use for grep hits.")
 
-(defvar grep-error-face compilation-error-face
+;; compilation-error-face is wrong for this; it's designed to look like a link.
+(defvar grep-error-face font-lock-keyword-face
   "Face name to use for grep error messages.")
 
 (defvar grep-match-face 'match
@@ -291,12 +292,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
      ;; remove match from grep-regexp-alist before fontifying
      ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
-      (1 grep-hit-face nil t)
-      (2 grep-error-face nil t))
+      (1 font-lock-keyword-face nil t)
+      (2 font-lock-keyword-face nil t))
      ("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
-      (1 compilation-warning-face)
-      (2 compilation-line-face))
+      (1 grep-error-face)
+      (2 grep-error-face))
      ;; Highlight grep matches and delete markers
      ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
       ;; Refontification does not work after the markers have been
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 97356b01029..c4e8a444aff 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -272,18 +272,20 @@ CODE, where N and CODE are in the following relation:
             (while (search-forward "\nSTARTCHAR" nil t)
               (setq offset (line-beginning-position))
               (search-forward "\nENCODING")
-              (setq code (read (current-buffer))
-                    code0 (lsh code -8)
-                    code1 (logand code 255)
-                    min-code (min min-code code)
-                    max-code (max max-code code)
-                    min-code0 (min min-code0 code0)
-                    max-code0 (max max-code0 code0)
-                    min-code1 (min min-code1 code1)
-                    max-code1 (max max-code1 code1))
-              (search-forward "ENDCHAR")
-              (setq maxlen (max maxlen (- (point) offset))
-                    glyph-list (cons (cons code offset) glyph-list)))
+              (setq code (read (current-buffer)))
+              (if (< code 0)
+                  (search-forward "ENDCHAR")
+                (setq code0 (lsh code -8)
+                      code1 (logand code 255)
+                      min-code (min min-code code)
+                      max-code (max max-code code)
+                      min-code0 (min min-code0 code0)
+                      max-code0 (max max-code0 code0)
+                      min-code1 (min min-code1 code1)
+                      max-code1 (max max-code1 code1))
+                (search-forward "ENDCHAR")
+                (setq maxlen (max maxlen (- (point) offset))
+                      glyph-list (cons (cons code offset) glyph-list))))
 
             (setq code-range
                   (vector min-code0 max-code0 min-code1 max-code1
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 57280a7b4bc..dcb962c3f19 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -65,7 +65,7 @@ You should define the options of your own filters in this group."
 
 (defcustom recentf-max-saved-items 20
   "*Maximum number of items of the recent list that will be saved.
-nil means to save the whole list.
+A nil value means to save the whole list.
 See the command `recentf-save-list'."
   :group 'recentf
   :type 'integer)
@@ -145,7 +145,7 @@ The default is to call `find-file' to edit the selected file."
 
 (defcustom recentf-menu-filter nil
   "*Function used to filter files displayed in the recentf menu.
-nil means no filter.  The following functions are predefined:
+A nil value means no filter.  The following functions are predefined:
 
 - `recentf-sort-ascending'
     Sort menu items in ascending order.
@@ -199,16 +199,14 @@ elements (see `recentf-make-menu-element' for menu element form)."
   :set 'recentf-menu-customization-changed)
 
 (defcustom recentf-menu-append-commands-flag t
-  "*non-nil means to append command items to the menu."
+  "*Non-nil means to append command items to the menu."
   :group 'recentf
   :type 'boolean
   :set 'recentf-menu-customization-changed)
 
-(defvaralias 'recentf-menu-append-commands-p
-  'recentf-menu-append-commands-flag)
-(make-obsolete-variable 'recentf-menu-append-commands-p
-                        'recentf-menu-append-commands-flag
-                        "22.1")
+(define-obsolete-variable-alias 'recentf-menu-append-commands-p
+                                'recentf-menu-append-commands-flag
+                                "22.1")
 
 (defcustom recentf-auto-cleanup 'mode
   "*Define when to automatically cleanup the recent list.
@@ -244,7 +242,7 @@ cleanup the list."
            (recentf-auto-cleanup))))
 
 (defcustom recentf-initialize-file-name-history t
-  "*non-nil means to initialize `file-name-history' with the recent list.
+  "*Non-nil means to initialize `file-name-history' with the recent list.
 If `file-name-history' is not empty, do nothing."
   :group 'recentf
   :type  'boolean)
@@ -350,8 +348,8 @@ filenames."
 (defsubst recentf-expand-file-name (name)
   "Convert filename NAME to absolute, and canonicalize it.
 See also the function `expand-file-name'.
-If defined, call the function `recentf-filename-handler' to post
-process the canonical name."
+If defined, call the function `recentf-filename-handler'
+to postprocess the canonical name."
   (let* ((filename (expand-file-name name)))
     (or (and recentf-filename-handler
              (funcall recentf-filename-handler filename))
@@ -557,7 +555,7 @@ menu-elements (no sub-menu)."
 
 (defun recentf-clear-data ()
   "Clear data used to build the recentf menu.
-This force a rebuild of the menu."
+This forces a rebuild of the menu."
   (easy-menu-remove-item (recentf-menu-bar)
                          recentf-menu-path recentf-menu-title)
   (setq recentf-data-cache nil))
@@ -703,7 +701,7 @@ defined."
 
 (defcustom recentf-arrange-by-rule-subfilter nil
   "*Function called by a rule based filter to filter sub-menu elements.
-nil means no filter.  See also `recentf-menu-filter'.
+A nil value means no filter.  See also `recentf-menu-filter'.
 You can't use another rule based filter here."
   :group 'recentf-filters
   :type '(choice (const nil) function)
diff --git a/lisp/simple.el b/lisp/simple.el
index 32b83c465ae..7d6a9febb3b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3491,8 +3491,8 @@ Outline mode sets this."
              ;; at least go to end of line.
              (end-of-line))
             ((< arg 0)
-             ;; If we did not move down as far as desired,
-             ;; at least go to end of line.
+             ;; If we did not move up as far as desired,
+             ;; at least go to beginning of line.
              (beginning-of-line))
             (t
              (line-move-finish (or goal-column temporary-goal-column)
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 45e68750cb3..a40486ffd07 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -670,7 +670,7 @@ buffer names."
              (ediff-cleanup-mess)
              (with-current-buffer buf
                (erase-buffer)
-               (insert-buffer buffer-C)
+               (insert-buffer-substring buffer-C)
                (kill-buffer buffer-A)
                (kill-buffer buffer-B)
                (kill-buffer buffer-C)
diff --git a/lisp/startup.el b/lisp/startup.el
index 2f71a9ba352..59fdc75dd09 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -575,7 +575,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   ;; Choose a reasonable location for temporary files.
   (custom-reevaluate-setting 'temporary-file-directory)
-  (custom-reevaluate-setting 'small-emporary-file-directory)
+  (custom-reevaluate-setting 'small-temporary-file-directory)
   (custom-reevaluate-setting 'auto-save-file-name-transforms)
 
   ;; See if we should import version-control from the environment variable.
@@ -984,7 +984,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
         (setq term
               (if (setq hyphend (string-match "[-_][^-_]+$" term))
                   (substring term 0 hyphend)
-                nil)))))
+                nil)))
+      (when term
+        ;; The terminal file has been loaded, now call the terminal
+        ;; specific initialization function.
+        (let ((term-init-func (intern (concat "terminal-init-" term))))
+          (when (fboundp term-init-func)
+            (funcall term-init-func))))))
 
   ;; Update the out-of-memory error message based on user's key bindings
   ;; for save-some-buffers.
@@ -1346,7 +1352,7 @@ You can do basic editing with the menu bar and scroll bar using the mouse.
 
 Useful File menu items:
 Exit Emacs              (or type Control-x followed by Control-c)
-Recover Session         Recover files you were editing before a crash
+Recover Crashed Session Recover files you were editing before a crash
 
 Important Help menu items:
 Emacs Tutorial          Learn how to use Emacs efficiently
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 915d3a430d8..282885e2d65 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -303,7 +303,7 @@ mode, ON-REGION is ignored and assumed true if the region is active."
                      transient-mark-mode
                      mark-active)
                 (if (featurep 'xemacs)
-                     zmacs-regions (mark)))
+                    (and zmacs-regions (mark))))
             (setq on-region t))
         (and on-region
              (set-marker tempo-region-start (min (mark) (point)))
diff --git a/lisp/term/README b/lisp/term/README
index 76c64435af1..581f321d3ba 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -8,7 +8,12 @@ that exists, the last hyphen and what follows it is stripped.  If that doesn't
 yield a file that exists, the previous hyphen is stripped, and so on until all
 hyphens are gone.  For example, if the terminal type is `aaa-48-foo', Emacs
 will try first `term/aaa-48-foo.el', then `term/aaa-48.el' and finally
-`term/aaa.el'.
+`term/aaa.el'.  Each terminal specific file should contain a function
+named terminal-init-TERMINALNAME (eg terminal-init-aaa-48 for
+term/aaa-48.el) that Emacs will call in order to initialize the
+terminal. The terminal files should not contain any top level forms
+that are executed when the file is loaded, all the initialization
+actions are performed by the terminal-init-TERMINALNAME functions.
 
    When writing terminal packages, there are some things it is good to keep in
 mind.
diff --git a/lisp/term/apollo.el b/lisp/term/apollo.el
index 1d04fd35245..749ff85a0a6 100644
--- a/lisp/term/apollo.el
+++ b/lisp/term/apollo.el
@@ -1,6 +1,7 @@
 ;; -*- no-byte-compile: t -*-
-
-(load "term/vt100" nil t)
+(defun terminal-init-apollo ()
+  "Terminal initialization function for apollo."  
+  (load "term/vt100" nil t))
 
 ;;; arch-tag: c72f446f-e6b7-4749-90a4-bd68632adacf
 ;;; apollo.el ends here
diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index b11a4ff8309..82401f7bf71 100644
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -1,7 +1,10 @@
 ;; -*- no-byte-compile: t -*-
-;;; HP terminals usually encourage using ^H as the rubout character
-(keyboard-translate ?\177 ?\^h)
-(keyboard-translate ?\^h ?\177)
+
+(defun terminal-init-bobcat ()
+  "Terminal initialization function for bobcat."  
+  ;; HP terminals usually encourage using ^H as the rubout character
+  (keyboard-translate ?\177 ?\^h)
+  (keyboard-translate ?\^h ?\177))
 
 ;;; arch-tag: 754e4520-0a3e-4e6e-8ca5-9481b1f85cf7
 ;;; bobcat.el ends here
diff --git a/lisp/term/cygwin.el b/lisp/term/cygwin.el
new file mode 100644
index 00000000000..3bdd5d3aa05
--- /dev/null
+++ b/lisp/term/cygwin.el
@@ -0,0 +1,10 @@
+;;; cygwin.el --- support for the Cygwin terminal -*- no-byte-compile: t -*-
+
+;;; The Cygwin terminal can't really display underlines.
+
+(defun terminal-init-cygwin ()
+  "Terminal initialization function for cygwin."  
+  (tty-no-underline))
+
+;; arch-tag: ca81ce67-3c41-4883-a29b-4c3d64a21191
+;;; cygwin.el ends here
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index eae2f419378..ef59860b606 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,6 +1,6 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2005 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 
@@ -25,302 +25,306 @@
 
 ;;; Code:
 
-(define-key function-key-map "\e[120q" [S-escape])
-(define-key function-key-map "\e[121q" [C-escape])
-
-(define-key function-key-map "\e[001q" [f1])
-(define-key function-key-map "\e[013q" [S-f1])
-(define-key function-key-map "\e[025q" [C-f1])
-
-
-(define-key function-key-map "\e[002q" [f2])
-(define-key function-key-map "\e[014q" [S-f2])
-(define-key function-key-map "\e[026q" [C-f2])
-(define-key function-key-map "\e[038q" [M-f2])
-
-(define-key function-key-map "\e[003q" [f3])
-(define-key function-key-map "\e[015q" [S-f3])
-(define-key function-key-map "\e[027q" [C-f3])
-
-
-(define-key function-key-map "\e[004q" [f4])
-(define-key function-key-map "\e[016q" [S-f4])
-(define-key function-key-map "\e[028q" [C-f4])
-
-
-(define-key function-key-map "\e[005q" [f5])
-(define-key function-key-map "\e[017q" [S-f5])
-(define-key function-key-map "\e[029q" [C-f5])
-
-
-(define-key function-key-map "\e[006q" [f6])
-(define-key function-key-map "\e[018q" [S-f6])
-(define-key function-key-map "\e[030q" [C-f6])
-
-
-(define-key function-key-map "\e[007q" [f7])
-(define-key function-key-map "\e[019q" [S-f7])
-(define-key function-key-map "\e[031q" [C-f7])
-
-
-(define-key function-key-map "\e[008q" [f8])
-(define-key function-key-map "\e[020q" [S-f8])
-(define-key function-key-map "\e[032q" [C-f8])
-
-
-(define-key function-key-map "\e[009q" [f9])
-(define-key function-key-map "\e[021q" [S-f9])
-(define-key function-key-map "\e[033q" [C-f9])
-
-
-(define-key function-key-map "\e[010q" [f10])
-(define-key function-key-map "\e[022q" [S-f10])
-(define-key function-key-map "\e[034q" [C-f10])
-
-
-(define-key function-key-map "\e[011q" [f11])
-(define-key function-key-map "\e[023q" [S-f11])
-(define-key function-key-map "\e[035q" [C-f11])
-(define-key function-key-map "\e[047q" [M-f11])
-
-(define-key function-key-map "\e[012q" [f12])
-(define-key function-key-map "\e[024q" [S-f12])
-(define-key function-key-map "\e[036q" [C-f12])
-(define-key function-key-map "\e[048q" [M-f12])
-
-
-(define-key function-key-map "\e[057q" [C-`])
-(define-key function-key-map "\e[115q" [M-`])
-
-(define-key function-key-map "\e[049q" [?\C-1])
-(define-key function-key-map "\e[058q" [?\M-1])
-
-
-(define-key function-key-map "\e[059q" [?\M-2])
-
-(define-key function-key-map "\e[050q" [?\C-3])
-(define-key function-key-map "\e[060q" [?\M-3])
-
-(define-key function-key-map "\e[051q" [?\C-4])
-(define-key function-key-map "\e[061q" [?\M-4])
-
-(define-key function-key-map "\e[052q" [?\C-5])
-(define-key function-key-map "\e[062q" [?\M-5])
-
-
-(define-key function-key-map "\e[063q" [?\M-6])
-
-(define-key function-key-map "\e[053q" [?\C-7])
-(define-key function-key-map "\e[064q" [?\M-7])
-
-(define-key function-key-map "\e[054q" [?\C-8])
-(define-key function-key-map "\e[065q" [?\M-8])
-
-(define-key function-key-map "\e[055q" [?\C-9])
-(define-key function-key-map "\e[066q" [?\M-9])
-
-(define-key function-key-map "\e[056q" [?\C-0])
-(define-key function-key-map "\e[067q" [?\M-0])
-
-(define-key function-key-map "\e[068q" [?\M--])
-
-(define-key function-key-map "\e[069q" [?\C-=])
-(define-key function-key-map "\e[070q" [?\M-=])
-
-;; I don't know what to do with those.
-;(define-key function-key-map "^H" [<del>])
-;(define-key function-key-map "^H" [S-<del>])
-;(define-key function-key-map "\177" [C-<del>])
-;(define-key function-key-map "\e[071q" [M-<del>])
-
-(define-key function-key-map "\e[Z" [?\S-\t])
-(define-key function-key-map "\e[072q" [?\C-\t])
-;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
-;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
-(define-key function-key-map "\e[073q" [?\M-\t])
-
-(define-key function-key-map "\e[074q" [?\M-q])
-
-(define-key function-key-map "\e[075q" [?\M-w])
-
-(define-key function-key-map "\e[076q" [?\M-e])
-
-(define-key function-key-map "\e[077q" [?\M-r])
-
-(define-key function-key-map "\e[078q" [?\M-t])
-
-(define-key function-key-map "\e[079q" [?\M-y])
-
-(define-key function-key-map "\e[080q" [?\M-u])
-
-(define-key function-key-map "\e[081q" [?\M-i])
-
-(define-key function-key-map "\e[082q" [?\M-o])
-
-(define-key function-key-map "\e[083q" [?\M-p])
-
-(define-key function-key-map "\e[084q" [?\M-\[])
-
-(define-key function-key-map "\e[085q" [?\M-\]])
-
-(define-key function-key-map "\e[086q" [?\M-\\])
-
-(define-key function-key-map "\e[087q" [?\M-a])
-
-(define-key function-key-map "\e[088q" [?\M-s])
-
-(define-key function-key-map "\e[089q" [?\M-d])
-
-(define-key function-key-map "\e[090q" [?\M-f])
-
-(define-key function-key-map "\e[091q" [?\M-g])
-
-(define-key function-key-map "\e[092q" [?\M-h])
-
-(define-key function-key-map "\e[093q" [?\M-j])
-
-(define-key function-key-map "\e[094q" [?\M-k])
-
-(define-key function-key-map "\e[095q" [?\M-l])
-
-(define-key function-key-map "\e[096q" [?\C-\;])
-(define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating
-                                                ;; here, this is realy
-                                                ;; M-;, but M-:
-                                                ;; generates the same
-                                                ;; string and is more
-                                                ;; usefull.
-
-(define-key function-key-map "\e[098q" [?\C-'])
-(define-key function-key-map "\e[099q" [?\M-'])
-
-(define-key function-key-map "\e[100q" [?\M-\n])
-
-(define-key function-key-map "\e[101q" [?\M-z])
-
-(define-key function-key-map "\e[102q" [?\M-x])
-
-(define-key function-key-map "\e[103q" [?\M-c])
-
-(define-key function-key-map "\e[104q" [?\M-v])
-
-(define-key function-key-map "\e[105q" [?\M-b])
-
-(define-key function-key-map "\e[106q" [M-n])
-
-(define-key function-key-map "\e[107q" [M-m])
-
-(define-key function-key-map "\e[108q" [?\C-,])
-(define-key function-key-map "\e[109q" [?\M-,])
-
-(define-key function-key-map "\e[110q" [?\C-.])
-(define-key function-key-map "\e[111q" [?\M-.])
-
-(define-key function-key-map "\e[112q" [?\C-/])
-(define-key function-key-map "\e[113q" [?\M-/])
-
-(define-key function-key-map "\e[139q" [insert])
-(define-key function-key-map "\e[139q" [S-insert])
-(define-key function-key-map "\e[140q" [C-insert])
-(define-key function-key-map "\e[141q" [M-insert])
-
-(define-key function-key-map "\e[H" [home])
-(define-key function-key-map "\e[143q" [S-home])
-(define-key function-key-map "\e[144q" [C-home])
-
-
-(define-key function-key-map "\e[150q" [prior])
-(define-key function-key-map "\e[151q" [S-prior]) ;; those don't seem
+(defun iris-ansi-initialize-terminal ()
+  "Terminal initialization function for iris-ansi."
+  (define-key function-key-map "\e[120q" [S-escape])
+  (define-key function-key-map "\e[121q" [C-escape])
+
+  (define-key function-key-map "\e[001q" [f1])
+  (define-key function-key-map "\e[013q" [S-f1])
+  (define-key function-key-map "\e[025q" [C-f1])
+
+
+  (define-key function-key-map "\e[002q" [f2])
+  (define-key function-key-map "\e[014q" [S-f2])
+  (define-key function-key-map "\e[026q" [C-f2])
+  (define-key function-key-map "\e[038q" [M-f2])
+
+  (define-key function-key-map "\e[003q" [f3])
+  (define-key function-key-map "\e[015q" [S-f3])
+  (define-key function-key-map "\e[027q" [C-f3])
+
+
+  (define-key function-key-map "\e[004q" [f4])
+  (define-key function-key-map "\e[016q" [S-f4])
+  (define-key function-key-map "\e[028q" [C-f4])
+
+
+  (define-key function-key-map "\e[005q" [f5])
+  (define-key function-key-map "\e[017q" [S-f5])
+  (define-key function-key-map "\e[029q" [C-f5])
+
+
+  (define-key function-key-map "\e[006q" [f6])
+  (define-key function-key-map "\e[018q" [S-f6])
+  (define-key function-key-map "\e[030q" [C-f6])
+  
+
+  (define-key function-key-map "\e[007q" [f7])
+  (define-key function-key-map "\e[019q" [S-f7])
+  (define-key function-key-map "\e[031q" [C-f7])
+  
+  
+  (define-key function-key-map "\e[008q" [f8])
+  (define-key function-key-map "\e[020q" [S-f8])
+  (define-key function-key-map "\e[032q" [C-f8])
+  
+
+  (define-key function-key-map "\e[009q" [f9])
+  (define-key function-key-map "\e[021q" [S-f9])
+  (define-key function-key-map "\e[033q" [C-f9])
+  
+  
+  (define-key function-key-map "\e[010q" [f10])
+  (define-key function-key-map "\e[022q" [S-f10])
+  (define-key function-key-map "\e[034q" [C-f10])
+  
+  
+  (define-key function-key-map "\e[011q" [f11])
+  (define-key function-key-map "\e[023q" [S-f11])
+  (define-key function-key-map "\e[035q" [C-f11])
+  (define-key function-key-map "\e[047q" [M-f11])
+
+  (define-key function-key-map "\e[012q" [f12])
+  (define-key function-key-map "\e[024q" [S-f12])
+  (define-key function-key-map "\e[036q" [C-f12])
+  (define-key function-key-map "\e[048q" [M-f12])
+  
+  
+  (define-key function-key-map "\e[057q" [?\C-`])
+  (define-key function-key-map "\e[115q" [?\M-`])
+  
+  (define-key function-key-map "\e[049q" [?\C-1])
+  (define-key function-key-map "\e[058q" [?\M-1])
+  
+  
+  (define-key function-key-map "\e[059q" [?\M-2])
+  
+  (define-key function-key-map "\e[050q" [?\C-3])
+  (define-key function-key-map "\e[060q" [?\M-3])
+  
+  (define-key function-key-map "\e[051q" [?\C-4])
+  (define-key function-key-map "\e[061q" [?\M-4])
+  
+  (define-key function-key-map "\e[052q" [?\C-5])
+  (define-key function-key-map "\e[062q" [?\M-5])
+  
+
+  (define-key function-key-map "\e[063q" [?\M-6])
+  
+  (define-key function-key-map "\e[053q" [?\C-7])
+  (define-key function-key-map "\e[064q" [?\M-7])
+  
+  (define-key function-key-map "\e[054q" [?\C-8])
+  (define-key function-key-map "\e[065q" [?\M-8])
+  
+  (define-key function-key-map "\e[055q" [?\C-9])
+  (define-key function-key-map "\e[066q" [?\M-9])
+  
+  (define-key function-key-map "\e[056q" [?\C-0])
+  (define-key function-key-map "\e[067q" [?\M-0])
+  
+  (define-key function-key-map "\e[068q" [?\M--])
+  
+  (define-key function-key-map "\e[069q" [?\C-=])
+  (define-key function-key-map "\e[070q" [?\M-=])
+  
+  ;; I don't know what to do with those.
+  ;;(define-key function-key-map "^H" [<del>])
+  ;;(define-key function-key-map "^H" [S-<del>])
+  ;;(define-key function-key-map "\177" [C-<del>])
+  ;;(define-key function-key-map "\e[071q" [M-<del>])
+  
+  (define-key function-key-map "\e[Z" [?\S-\t])
+  (define-key function-key-map "\e[072q" [?\C-\t])
+  ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
+  ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
+  (define-key function-key-map "\e[073q" [?\M-\t])
+  
+  (define-key function-key-map "\e[074q" [?\M-q])
+
+  (define-key function-key-map "\e[075q" [?\M-w])
+  
+  (define-key function-key-map "\e[076q" [?\M-e])
+
+  (define-key function-key-map "\e[077q" [?\M-r])
+  
+  (define-key function-key-map "\e[078q" [?\M-t])
+  
+  (define-key function-key-map "\e[079q" [?\M-y])
+  
+  (define-key function-key-map "\e[080q" [?\M-u])
+  
+  (define-key function-key-map "\e[081q" [?\M-i])
+
+  (define-key function-key-map "\e[082q" [?\M-o])
+  
+  (define-key function-key-map "\e[083q" [?\M-p])
+  
+  (define-key function-key-map "\e[084q" [?\M-\[])
+  
+  (define-key function-key-map "\e[085q" [?\M-\]])
+  
+  (define-key function-key-map "\e[086q" [?\M-\\])
+  
+  (define-key function-key-map "\e[087q" [?\M-a])
+  
+  (define-key function-key-map "\e[088q" [?\M-s])
+  
+  (define-key function-key-map "\e[089q" [?\M-d])
+  
+  (define-key function-key-map "\e[090q" [?\M-f])
+  
+  (define-key function-key-map "\e[091q" [?\M-g])
+  
+  (define-key function-key-map "\e[092q" [?\M-h])
+  
+  (define-key function-key-map "\e[093q" [?\M-j])
+  
+  (define-key function-key-map "\e[094q" [?\M-k])
+  
+  (define-key function-key-map "\e[095q" [?\M-l])
+  
+  (define-key function-key-map "\e[096q" [?\C-\;])
+  (define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating
+                                                  ;; here, this is
+                                                  ;; realy M-;, but
+                                                  ;; M-: generates the
+                                                  ;; same string and
+                                                  ;; is more usefull.
+
+  (define-key function-key-map "\e[098q" [?\C-'])
+  (define-key function-key-map "\e[099q" [?\M-'])
+  
+  (define-key function-key-map "\e[100q" [?\M-\n])
+  
+  (define-key function-key-map "\e[101q" [?\M-z])
+  
+  (define-key function-key-map "\e[102q" [?\M-x])
+  
+  (define-key function-key-map "\e[103q" [?\M-c])
+  
+  (define-key function-key-map "\e[104q" [?\M-v])
+  
+  (define-key function-key-map "\e[105q" [?\M-b])
+  
+  (define-key function-key-map "\e[106q" [M-n])
+  
+  (define-key function-key-map "\e[107q" [M-m])
+  
+  (define-key function-key-map "\e[108q" [?\C-,])
+  (define-key function-key-map "\e[109q" [?\M-,])
+  
+  (define-key function-key-map "\e[110q" [?\C-.])
+  (define-key function-key-map "\e[111q" [?\M-.])
+  
+  (define-key function-key-map "\e[112q" [?\C-/])
+  (define-key function-key-map "\e[113q" [?\M-/])
+  
+  (define-key function-key-map "\e[139q" [insert])
+  (define-key function-key-map "\e[139q" [S-insert])
+  (define-key function-key-map "\e[140q" [C-insert])
+  (define-key function-key-map "\e[141q" [M-insert])
+  
+  (define-key function-key-map "\e[H" [home])
+  (define-key function-key-map "\e[143q" [S-home])
+  (define-key function-key-map "\e[144q" [C-home])
+  
+
+  (define-key function-key-map "\e[150q" [prior])
+  (define-key function-key-map "\e[151q" [S-prior]) ;; those don't
+                                                    ;; seem to
+                                                    ;; generate
+                                                    ;; anything
+  (define-key function-key-map "\e[152q" [C-prior])
+
+  
+  ;; (define-key function-key-map "^?" [delete]) 
+  (define-key function-key-map "\e[P" [S-delete])
+  (define-key function-key-map "\e[142q" [C-delete])
+  (define-key function-key-map "\e[M" [M-delete])
+  
+  (define-key function-key-map "\e[146q" [end])
+  (define-key function-key-map "\e[147q" [S-end]) ;; those don't seem
                                                   ;; to generate
                                                   ;; anything
-(define-key function-key-map "\e[152q" [C-prior])
-
-
-;; (define-key function-key-map "^?" [delete]) ?? something else seems to take care of this.
-(define-key function-key-map "\e[P" [S-delete])
-(define-key function-key-map "\e[142q" [C-delete])
-(define-key function-key-map "\e[M" [M-delete])
-
-(define-key function-key-map "\e[146q" [end])
-(define-key function-key-map "\e[147q" [S-end]) ;; those don't seem to
-                                                ;; generate anything
-(define-key function-key-map "\e[148q" [C-end])
-
-(define-key function-key-map "\e[154q" [next])
-(define-key function-key-map "\e[155q" [S-next])
-(define-key function-key-map "\e[156q" [C-next])
-
-
-(define-key function-key-map "\e[161q" [S-up])
-(define-key function-key-map "\e[162q" [C-up])
-(define-key function-key-map "\e[163q" [M-up])
-
-(define-key function-key-map "\e[158q" [S-left])
-(define-key function-key-map "\e[159q" [C-left])
-(define-key function-key-map "\e[160q" [M-left])
-
-(define-key function-key-map "\e[164q" [S-down])
-(define-key function-key-map "\e[165q" [C-down])
-(define-key function-key-map "\e[166q" [M-down])
-
-(define-key function-key-map "\e[167q" [S-right])
-(define-key function-key-map "\e[168q" [C-right])
-(define-key function-key-map "\e[169q" [M-right])
-
-;; Keypad functions, most of those are untested.
-(define-key function-key-map "\e[179q" [?\C-/])
-(define-key function-key-map "\e[180q" [?\M-/])
-
-(define-key function-key-map "\e[187q" [?\C-*])
-(define-key function-key-map "\e[188q" [?\M-*])
-
-(define-key function-key-map "\e[198q" [?\C--])
-(define-key function-key-map "\e[199q" [?\M--])
-
-;; Something else takes care of home, up, prior, down, left, right, next
-;(define-key function-key-map "\e[H" [home])
-(define-key function-key-map "\e[172q" [C-home])
-
-;(define-key function-key-map "\e[A" [up])
-(define-key function-key-map "\e[182q" [C-up])
-
-
-;(define-key function-key-map "\e[150q" [prior])
-(define-key function-key-map "\e[190q" [C-prior])
-
-
-(define-key function-key-map "\e[200q" [?\C-+])
-(define-key function-key-map "\e[201q" [?\M-+])
-
-;(define-key function-key-map "\e[D" [left])
-(define-key function-key-map "\e[174q" [C-left])
-
-
-(define-key function-key-map "\e[000q" [begin])
-(define-key function-key-map "\e[184q" [C-begin])
-
-
-;(define-key function-key-map "\e[C" [right])
-(define-key function-key-map "\e[192q" [C-right])
-
-;(define-key function-key-map "\e[146q" [end])
-(define-key function-key-map "\e[176q" [C-end])
-
-;(define-key function-key-map "\e[B" [down])
-(define-key function-key-map "\e[186q" [C-down])
-
-;(define-key function-key-map "\e[154q" [next])
-(define-key function-key-map "\e[194q" [C-next])
-
-
-(define-key function-key-map "\e[100q" [M-enter])
-
-(define-key function-key-map "\e[139q" [insert])
-(define-key function-key-map "\e[178q" [C-inset])
-
-(define-key function-key-map "\e[P" [delete])
-(define-key function-key-map "\e[196q" [C-delete])
-(define-key function-key-map "\e[197q" [M-delete])
+  (define-key function-key-map "\e[148q" [C-end])
+  
+  (define-key function-key-map "\e[154q" [next])
+  (define-key function-key-map "\e[155q" [S-next])
+  (define-key function-key-map "\e[156q" [C-next])
+  
+
+  (define-key function-key-map "\e[161q" [S-up])
+  (define-key function-key-map "\e[162q" [C-up])
+  (define-key function-key-map "\e[163q" [M-up])
+  
+  (define-key function-key-map "\e[158q" [S-left])
+  (define-key function-key-map "\e[159q" [C-left])
+  (define-key function-key-map "\e[160q" [M-left])
+  
+  (define-key function-key-map "\e[164q" [S-down])
+  (define-key function-key-map "\e[165q" [C-down])
+  (define-key function-key-map "\e[166q" [M-down])
+  
+  (define-key function-key-map "\e[167q" [S-right])
+  (define-key function-key-map "\e[168q" [C-right])
+  (define-key function-key-map "\e[169q" [M-right])
+  
+  ;; Keypad functions, most of those are untested.
+  (define-key function-key-map "\e[179q" [?\C-/])
+  (define-key function-key-map "\e[180q" [?\M-/])
+  
+  (define-key function-key-map "\e[187q" [?\C-*])
+  (define-key function-key-map "\e[188q" [?\M-*])
+  
+  (define-key function-key-map "\e[198q" [?\C--])
+  (define-key function-key-map "\e[199q" [?\M--])
+  
+  ;; Something else takes care of home, up, prior, down, left, right, next
+  ;;(define-key function-key-map "\e[H" [home])
+  (define-key function-key-map "\e[172q" [C-home])
+  
+  ;;(define-key function-key-map "\e[A" [up])
+  (define-key function-key-map "\e[182q" [C-up])
+  
+  
+  ;;(define-key function-key-map "\e[150q" [prior])
+  (define-key function-key-map "\e[190q" [C-prior])
+  
+  
+  (define-key function-key-map "\e[200q" [?\C-+])
+  (define-key function-key-map "\e[201q" [?\M-+])
+  
+  ;;(define-key function-key-map "\e[D" [left])
+  (define-key function-key-map "\e[174q" [C-left])
+
+  
+  (define-key function-key-map "\e[000q" [begin])
+  (define-key function-key-map "\e[184q" [C-begin])
+
+  
+  ;;(define-key function-key-map "\e[C" [right])
+  (define-key function-key-map "\e[192q" [C-right])
+  
+  ;;(define-key function-key-map "\e[146q" [end])
+  (define-key function-key-map "\e[176q" [C-end])
+  
+  ;;(define-key function-key-map "\e[B" [down])
+  (define-key function-key-map "\e[186q" [C-down])
+  
+  ;;(define-key function-key-map "\e[154q" [next])
+  (define-key function-key-map "\e[194q" [C-next])
+  
+  
+  (define-key function-key-map "\e[100q" [M-enter])
+  
+  (define-key function-key-map "\e[139q" [insert])
+  (define-key function-key-map "\e[178q" [C-inset])
+  
+  (define-key function-key-map "\e[P" [delete])
+  (define-key function-key-map "\e[196q" [C-delete])
+  (define-key function-key-map "\e[197q" [M-delete]))
 
 ;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b
 ;;; iris-ansi.el ends here
diff --git a/lisp/term/linux.el b/lisp/term/linux.el
index 71b9e0d4bcf..7fa9a96e9bd 100644
--- a/lisp/term/linux.el
+++ b/lisp/term/linux.el
@@ -1,19 +1,21 @@
 ;; -*- no-byte-compile: t -*-
 ;; The Linux console handles Latin-1 by default.
 
-(unless (terminal-coding-system)
-  (set-terminal-coding-system 'iso-latin-1))
+(defun terminal-init-linux ()
+  "Terminal initialization function for linux."  
+  (unless (terminal-coding-system)
+    (set-terminal-coding-system 'iso-latin-1))
 
-;; It can't really display underlines.
-(tty-no-underline)
+  ;; It can't really display underlines.
+  (tty-no-underline)
 
-;; Make Latin-1 input characters work, too.
-;; Meta will continue to work, because the kernel
-;; turns that into Escape.
+  ;; Make Latin-1 input characters work, too.
+  ;; Meta will continue to work, because the kernel
+  ;; turns that into Escape.
 
-(let ((value (current-input-mode)))
-  ;; The third arg only matters in that it is not t or nil.
-  (set-input-mode (nth 0 value) (nth 1 value) 'iso-latin-1 (nth 3 value)))
+  (let ((value (current-input-mode)))
+    ;; The third arg only matters in that it is not t or nil.
+    (set-input-mode (nth 0 value) (nth 1 value) 'iso-latin-1 (nth 3 value))))
 
 ;;; arch-tag: 5d0c4f63-739b-4862-abf3-041fe42adb8f
 ;;; linux.el ends here
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 7a24eaf5a0c..f8a4934f8bc 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,6 +1,6 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -28,47 +28,49 @@
 
 ;;; Code:
 
-(if (boundp 'news-fkey-prefix)
-    nil
-  ;; The terminal initialization should already have set up some keys
-  (setq news-fkey-prefix (lookup-key function-key-map "\eO"))
-  (if (not (keymapp news-fkey-prefix))
-      (error "What?  Your news termcap/terminfo has no keycaps in it"))
+(defun terminal-init-news ()
+  "Terminal initialization function for news."  
+  (if (boundp 'news-fkey-prefix)
+      nil
+    ;; The terminal initialization should already have set up some keys
+    (setq news-fkey-prefix (lookup-key function-key-map "\eO"))
+    (if (not (keymapp news-fkey-prefix))
+        (error "What?  Your news termcap/terminfo has no keycaps in it"))
 
-  ;; Termcap or terminfo will set these
-  ;; (define-key news-fkey-prefix "P" [f1])
-  ;; (define-key news-fkey-prefix "Q" [f2])
-  ;; (define-key news-fkey-prefix "R" [f3])
-  ;; (define-key news-fkey-prefix "S" [f4])
-  ;; (define-key news-fkey-prefix "T" [f5])
-  ;; (define-key news-fkey-prefix "U" [f6])
-  ;; (define-key news-fkey-prefix "V" [f7])
-  ;; (define-key news-fkey-prefix "W" [f8])
-  ;; (define-key news-fkey-prefix "X" [f9])
-  ;; (define-key news-fkey-prefix "Y" [f10])
+    ;; Termcap or terminfo will set these
+    ;; (define-key news-fkey-prefix "P" [f1])
+    ;; (define-key news-fkey-prefix "Q" [f2])
+    ;; (define-key news-fkey-prefix "R" [f3])
+    ;; (define-key news-fkey-prefix "S" [f4])
+    ;; (define-key news-fkey-prefix "T" [f5])
+    ;; (define-key news-fkey-prefix "U" [f6])
+    ;; (define-key news-fkey-prefix "V" [f7])
+    ;; (define-key news-fkey-prefix "W" [f8])
+    ;; (define-key news-fkey-prefix "X" [f9])
+    ;; (define-key news-fkey-prefix "Y" [f10])
 
-  ;; Terminfo will set these
-  (define-key news-fkey-prefix "a" [execute])
-  (define-key news-fkey-prefix "b" [select])
-  (define-key news-fkey-prefix "c" [cancel])
-  (define-key news-fkey-prefix "M" [kp-enter])
-  (define-key news-fkey-prefix "q" [kp-1])
-  (define-key news-fkey-prefix "s" [kp-3])
-  (define-key news-fkey-prefix "u" [kp-5])
-  (define-key news-fkey-prefix "w" [kp-7])
-  (define-key news-fkey-prefix "y" [kp-9])
+    ;; Terminfo will set these
+    (define-key news-fkey-prefix "a" [execute])
+    (define-key news-fkey-prefix "b" [select])
+    (define-key news-fkey-prefix "c" [cancel])
+    (define-key news-fkey-prefix "M" [kp-enter])
+    (define-key news-fkey-prefix "q" [kp-1])
+    (define-key news-fkey-prefix "s" [kp-3])
+    (define-key news-fkey-prefix "u" [kp-5])
+    (define-key news-fkey-prefix "w" [kp-7])
+    (define-key news-fkey-prefix "y" [kp-9])
 
-  ;; These aren't in either termcap or terminfo's repertoire
-  (define-key news-fkey-prefix "m" [kp-subtract])
-  (define-key news-fkey-prefix "k" [kp-add])
-  (define-key news-fkey-prefix "l" [kp-separator])
-  (define-key news-fkey-prefix "n" [kp-decimal])
-  (define-key news-fkey-prefix "p" [kp-0])
-  (define-key news-fkey-prefix "r" [kp-2])
-  (define-key news-fkey-prefix "t" [kp-4])
-  (define-key news-fkey-prefix "v" [kp-6])
-  (define-key news-fkey-prefix "x" [kp-8])
-  )
+    ;; These aren't in either termcap or terminfo's repertoire
+    (define-key news-fkey-prefix "m" [kp-subtract])
+    (define-key news-fkey-prefix "k" [kp-add])
+    (define-key news-fkey-prefix "l" [kp-separator])
+    (define-key news-fkey-prefix "n" [kp-decimal])
+    (define-key news-fkey-prefix "p" [kp-0])
+    (define-key news-fkey-prefix "r" [kp-2])
+    (define-key news-fkey-prefix "t" [kp-4])
+    (define-key news-fkey-prefix "v" [kp-6])
+    (define-key news-fkey-prefix "x" [kp-8])
+    ))
 
 ;;; arch-tag: bfe141a0-623b-4b42-b753-5d9353776c5e
 ;;; news.el ends here
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 8dcd1826e0a..f0e9dd7b5b1 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
@@ -26,73 +26,143 @@
 
 ;;; Code:
 
-;; Set up function-key-map entries that termcap and terminfo don't know.
-(let ((map (make-sparse-keymap)))
-  (define-key map "\e[A" [up])
-  (define-key map "\e[B" [down])
-  (define-key map "\e[C" [right])
-  (define-key map "\e[D" [left])
-  (define-key map "\e[7~" [home])
-  (define-key map "\e[2~" [insert])
-  (define-key map "\e[3~" [delete])
-  (define-key map "\e[4~" [select])
-  (define-key map "\e[5~" [prior])
-  (define-key map "\e[6~" [next])
-  (define-key map "\e[11~" [f1])
-  (define-key map "\e[12~" [f2])
-  (define-key map "\e[13~" [f3])
-  (define-key map "\e[14~" [f4])
-  (define-key map "\e[15~" [f5])
-  (define-key map "\e[17~" [f6])
-  (define-key map "\e[18~" [f7])
-  (define-key map "\e[19~" [f8])
-  (define-key map "\e[20~" [f9])
-  (define-key map "\e[21~" [f10])
-  (define-key map "\e[23~" [f11])
-  (define-key map "\e[24~" [f12])
-  (define-key map "\e[29~" [print])
-
-  (define-key map "\e[11^" [C-f1])
-  (define-key map "\e[12^" [C-f2])
-  (define-key map "\e[13^" [C-f3])
-  (define-key map "\e[14^" [C-f4])
-  (define-key map "\e[15^" [C-f5])
-  (define-key map "\e[17^" [C-f6])
-  (define-key map "\e[18^" [C-f7])
-  (define-key map "\e[19^" [C-f8])
-  (define-key map "\e[20^" [C-f9])
-  (define-key map "\e[21^" [C-f10])
-  (define-key map "\e[23^" [C-f11])
-  (define-key map "\e[24^" [C-f12])
-
-  (define-key map "\e[29~" [print])
-
-  (define-key map "\e[2;2~" [S-insert])
-  (define-key map "\e[3$" [S-delete])
-
-  (define-key map "\e[2^" [C-insert])
-  (define-key map "\e[3^" [C-delete])
-  (define-key map "\e[5^" [C-prior])
-  (define-key map "\e[6^" [C-next])
-  (define-key map "\eOd" [C-left])
-  (define-key map "\eOc" [C-right])
-  (define-key map "\eOa" [C-up])
-  (define-key map "\eOb" [C-down])
-
-  (define-key map "\e[5$" [S-prior])
-  (define-key map "\e[6$" [S-next])
-  (define-key map "\e[8$" [S-end])
-  (define-key map "\e[7$" [S-home])
-  (define-key map "\e[d" [S-left])
-  (define-key map "\e[c" [S-right])
-  (define-key map "\e[a" [S-up])
-  (define-key map "\e[b" [S-down])
-
-  ;; Use inheritance to let the main keymap override those defaults.
-  ;; This way we don't override terminfo-derived settings or settings
-  ;; made in the .emacs file.
-  (set-keymap-parent map (keymap-parent function-key-map))
-  (set-keymap-parent function-key-map map))
+(defun terminal-init-rxvt ()
+  "Terminal initialization function for rxvt."
+  ;; The terminal intialization C code file might have initialized
+  ;; function keys F11->F42 from the termcap/terminfo information.  On
+  ;; a PC-style keyboard these keys correspond to
+  ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-.  The
+  ;; code here subsitutes the corresponding defintions in
+  ;; function-key-map. This substitution is needed because if a key
+  ;; definition if found in function-key-map, there are no further
+  ;; lookups in other keymaps.
+  (substitute-key-definition [f11] [S-f1] function-key-map) 
+  (substitute-key-definition [f12] [S-f2] function-key-map)
+  (substitute-key-definition [f13] [S-f3] function-key-map)
+  (substitute-key-definition [f14] [S-f4] function-key-map)
+  (substitute-key-definition [f15] [S-f5] function-key-map)
+  (substitute-key-definition [f16] [S-f6] function-key-map)
+  (substitute-key-definition [f17] [S-f7] function-key-map)
+  (substitute-key-definition [f18] [S-f8] function-key-map)
+  (substitute-key-definition [f19] [S-f9] function-key-map)
+  (substitute-key-definition [f20] [S-f10] function-key-map)
+
+  (substitute-key-definition [f23] [C-f1] function-key-map) 
+  (substitute-key-definition [f24] [C-f2] function-key-map)
+  (substitute-key-definition [f25] [C-f3] function-key-map)
+  (substitute-key-definition [f26] [C-f4] function-key-map)
+  (substitute-key-definition [f27] [C-f5] function-key-map)
+  (substitute-key-definition [f28] [C-f6] function-key-map)
+  (substitute-key-definition [f29] [C-f7] function-key-map)
+  (substitute-key-definition [f30] [C-f8] function-key-map)
+  (substitute-key-definition [f31] [C-f9] function-key-map)
+  (substitute-key-definition [f32] [C-f10] function-key-map)
+
+  (substitute-key-definition [f33] [C-S-f1] function-key-map) 
+  (substitute-key-definition [f34] [C-S-f2] function-key-map)
+  (substitute-key-definition [f35] [C-S-f3] function-key-map)
+  (substitute-key-definition [f36] [C-S-f4] function-key-map)
+  (substitute-key-definition [f37] [C-S-f5] function-key-map)
+  (substitute-key-definition [f38] [C-S-f6] function-key-map)
+  (substitute-key-definition [f39] [C-S-f7] function-key-map)
+  (substitute-key-definition [f40] [C-S-f8] function-key-map)
+  (substitute-key-definition [f41] [C-S-f9] function-key-map)
+  (substitute-key-definition [f42] [C-S-f10] function-key-map)
+
+  ;; Set up function-key-map entries that termcap and terminfo don't know.
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\e[A" [up])
+    (define-key map "\e[B" [down])
+    (define-key map "\e[C" [right])
+    (define-key map "\e[D" [left])
+    (define-key map "\e[7~" [home])
+    (define-key map "\e[2~" [insert])
+    (define-key map "\e[3~" [delete])
+    (define-key map "\e[4~" [select])
+    (define-key map "\e[5~" [prior])
+    (define-key map "\e[6~" [next])
+    (define-key map "\e[11~" [f1])
+    (define-key map "\e[12~" [f2])
+    (define-key map "\e[13~" [f3])
+    (define-key map "\e[14~" [f4])
+    (define-key map "\e[15~" [f5])
+    (define-key map "\e[17~" [f6])
+    (define-key map "\e[18~" [f7])
+    (define-key map "\e[19~" [f8])
+    (define-key map "\e[20~" [f9])
+    (define-key map "\e[21~" [f10])
+    ;; The strings emitted by f11 and f12 are the same as the strings
+    ;; emitted by S-f1 and S-f2, so don't define f11 and f12.
+    ;; (define-key map "\e[23~" [f11])
+    ;; (define-key map "\e[24~" [f12])
+    (define-key map "\e[29~" [print])
+
+    (define-key map "\e[11^" [C-f1])
+    (define-key map "\e[12^" [C-f2])
+    (define-key map "\e[13^" [C-f3])
+    (define-key map "\e[14^" [C-f4])
+    (define-key map "\e[15^" [C-f5])
+    (define-key map "\e[17^" [C-f6])
+    (define-key map "\e[18^" [C-f7])
+    (define-key map "\e[19^" [C-f8])
+    (define-key map "\e[20^" [C-f9])
+    (define-key map "\e[21^" [C-f10])
+
+    (define-key map "\e[23~" [S-f1])
+    (define-key map "\e[24~" [S-f2])
+    (define-key map "\e[25~" [S-f3])
+    (define-key map "\e[26~" [S-f4])
+    (define-key map "\e[28~" [S-f5])
+    (define-key map "\e[29~" [S-f6])
+    (define-key map "\e[31~" [S-f7])
+    (define-key map "\e[32~" [S-f8])
+    (define-key map "\e[33~" [S-f9])
+    (define-key map "\e[34~" [S-f10])
+
+    (define-key map "\e[23^" [C-S-f1])
+    (define-key map "\e[24^" [C-S-f2])
+    (define-key map "\e[25^" [C-S-f3])
+    (define-key map "\e[26^" [C-S-f4])
+    (define-key map "\e[28^" [C-S-f5])
+    (define-key map "\e[29^" [C-S-f6])
+    (define-key map "\e[31^" [C-S-f7])
+    (define-key map "\e[32^" [C-S-f8])
+    (define-key map "\e[33^" [C-S-f9])
+    (define-key map "\e[34^" [C-S-f10])
+
+    (define-key map "\e[2^" [C-insert])
+    (define-key map "\e[3^" [C-delete])
+    (define-key map "\e[5^" [C-prior])
+    (define-key map "\e[6^" [C-next])
+    (define-key map "\e[7^" [C-home])
+    (define-key map "\e[8^" [C-end])
+    (define-key map "\eOd" [C-left])
+    (define-key map "\eOc" [C-right])
+    (define-key map "\eOa" [C-up])
+    (define-key map "\eOb" [C-down])
+
+    (define-key map "\e[2;2~" [S-insert])
+    (define-key map "\e[3$" [S-delete])
+    (define-key map "\e[5$" [S-prior])
+    (define-key map "\e[6$" [S-next])
+    (define-key map "\e[8$" [S-end])
+    (define-key map "\e[7$" [S-home])
+    (define-key map "\e[d" [S-left])
+    (define-key map "\e[c" [S-right])
+    (define-key map "\e[a" [S-up])
+    (define-key map "\e[b" [S-down])
+
+    ;; Use inheritance to let the main keymap override those defaults.
+    ;; This way we don't override terminfo-derived settings or settings
+    ;; made in the .emacs file.
+    (set-keymap-parent map (keymap-parent function-key-map))
+    (set-keymap-parent function-key-map map))
+
+  ;; Initialize colors and background mode.
+  (rxvt-register-default-colors)
+  (rxvt-set-background-mode)
+  ;; This recomputes all the default faces given the colors we've just set up.
+  (tty-set-up-initial-frame-faces))
 
 ;; Set up colors, for those versions of rxvt that support it.
 (defvar rxvt-standard-colors
@@ -166,11 +236,5 @@ for the currently selected frame."
           (setq default-frame-background-mode 'dark)))
     (frame-set-background-mode (selected-frame))))
 
-;; Do it!
-(rxvt-register-default-colors)
-(rxvt-set-background-mode)
-;; This recomputes all the default faces given the colors we've just set up.
-(tty-set-up-initial-frame-faces)
-
 ;;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257
 ;;; rxvt.el ends here
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 18010e0b343..7d857ca1266 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,6 +1,6 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
-;; Copyright (C) 1987, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2001, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
@@ -93,58 +93,6 @@
 ;;
 
 (defvar sun-raw-prefix (make-sparse-keymap))
-(define-key function-key-map "\e[" sun-raw-prefix)
-
-(define-key sun-raw-prefix "210z" [r3])
-(define-key sun-raw-prefix "213z" [r6])
-(define-key sun-raw-prefix "214z" [r7])
-(define-key sun-raw-prefix "216z" [r9])
-(define-key sun-raw-prefix "218z" [r11])
-(define-key sun-raw-prefix "220z" [r13])
-(define-key sun-raw-prefix "222z" [r15])
-(define-key sun-raw-prefix "193z" [redo])
-(define-key sun-raw-prefix "194z" [props])
-(define-key sun-raw-prefix "195z" [undo])
-;; (define-key sun-raw-prefix "196z" 'ignore)           ; Expose-down
-;; (define-key sun-raw-prefix "197z" [put])
-;; (define-key sun-raw-prefix "198z" 'ignore)           ; Open-down
-;; (define-key sun-raw-prefix "199z" [get])
-(define-key sun-raw-prefix "200z" [find])
-;; (define-key sun-raw-prefix "201z" 'kill-region-and-unmark)   ; Delete
-(define-key sun-raw-prefix "224z" [f1])
-(define-key sun-raw-prefix "225z" [f2])
-(define-key sun-raw-prefix "226z" [f3])
-(define-key sun-raw-prefix "227z" [f4])
-(define-key sun-raw-prefix "228z" [f5])
-(define-key sun-raw-prefix "229z" [f6])
-(define-key sun-raw-prefix "230z" [f7])
-(define-key sun-raw-prefix "231z" [f8])
-(define-key sun-raw-prefix "232z" [f9])
-(define-key sun-raw-prefix "233z" [f10])
-(define-key sun-raw-prefix "234z" [f11])
-(define-key sun-raw-prefix "235z" [f12])
-(define-key sun-raw-prefix "A" [up])                    ; R8
-(define-key sun-raw-prefix "B" [down])                  ; R14
-(define-key sun-raw-prefix "C" [right])                 ; R12
-(define-key sun-raw-prefix "D" [left])                  ; R10
-
-(global-set-key [r3]    'backward-page)
-(global-set-key [r6]    'forward-page)
-(global-set-key [r7]    'beginning-of-buffer)
-(global-set-key [r9]    'scroll-down)
-(global-set-key [r11]   'recenter)
-(global-set-key [r13]   'end-of-buffer)
-(global-set-key [r15]   'scroll-up)
-(global-set-key [redo]  'redraw-display)  ;FIXME: collides with default.
-(global-set-key [props] 'list-buffers)
-(global-set-key [put]   'sun-select-region)
-(global-set-key [get]   'sun-yank-selection)
-(global-set-key [find]  'exchange-point-and-mark)
-(global-set-key [f3]    'scroll-down-in-place)
-(global-set-key [f4]    'scroll-up-in-place)
-(global-set-key [f6]    'shrink-window)
-(global-set-key [f7]    'enlarge-window)
-
 
 ;; Since .emacs gets loaded before this file, a hook is supplied
 ;; for you to put your own bindings in.
@@ -152,13 +100,6 @@
 (defvar sun-raw-prefix-hooks nil
   "List of forms to evaluate after setting sun-raw-prefix.")
 
-(when sun-raw-prefix-hooks
-  (message "sun-raw-prefix-hooks is obsolete!  Use term-setup-hook instead!")
-  (let ((hooks sun-raw-prefix-hooks))
-    (while hooks
-      (eval (car hooks))
-      (setq hooks (cdr hooks)))))
-
 
 ;;; This section adds definitions for the emacstool users
 ;; emacstool event filter converts function keys to C-x*{c}{lrt}
@@ -188,44 +129,6 @@
 (defvar suntool-map (make-sparse-keymap)
   "*Keymap for Emacstool bindings.")
 
-(define-key suntool-map "gr" 'beginning-of-buffer)      ; r7
-(define-key suntool-map "iR" 'backward-page)            ; R9
-(define-key suntool-map "ir" 'scroll-down)              ; r9
-(define-key suntool-map "kr" 'recenter)                 ; r11
-(define-key suntool-map "mr" 'end-of-buffer)            ; r13
-(define-key suntool-map "oR" 'forward-page)             ; R15
-(define-key suntool-map "or" 'scroll-up)                ; r15
-(define-key suntool-map "b\M-L" 'rerun-prev-command)    ; M-AGAIN
-(define-key suntool-map "b\M-l" 'prev-complex-command)  ; M-Again
-(define-key suntool-map "bl" 'redraw-display)           ; Again
-(define-key suntool-map "cl" 'list-buffers)             ; Props
-(define-key suntool-map "dl" 'undo)                     ; Undo
-(define-key suntool-map "el" 'ignore)                   ; Expose-Open
-(define-key suntool-map "fl" 'sun-select-region)        ; Put
-(define-key suntool-map "f," 'copy-region-as-kill)      ; C-Put
-(define-key suntool-map "gl" 'ignore)                   ; Open-Open
-(define-key suntool-map "hl" 'sun-yank-selection)       ; Get
-(define-key suntool-map "h," 'yank)                     ; C-Get
-(define-key suntool-map "il" 'research-forward)         ; Find
-(define-key suntool-map "i," 're-search-forward)        ; C-Find
-(define-key suntool-map "i\M-l" 'research-backward)     ; M-Find
-(define-key suntool-map "i\M-," 're-search-backward)    ; C-M-Find
-
-(define-key suntool-map "jL" 'yank)                     ; DELETE
-(define-key suntool-map "jl" 'kill-region-and-unmark)   ; Delete
-(define-key suntool-map "j\M-l" 'exchange-point-and-mark); M-Delete
-(define-key suntool-map "j,"
-  (lambda () (interactive) (pop-mark)))         ; C-Delete
-
-(define-key suntool-map "fT" 'shrink-window-horizontally)       ; T6
-(define-key suntool-map "gT" 'enlarge-window-horizontally)      ; T7
-(define-key suntool-map "ft" 'shrink-window)                    ; t6
-(define-key suntool-map "gt" 'enlarge-window)                   ; t7
-(define-key suntool-map "cT" (lambda (n) (interactive "p") (scroll-down n)))
-(define-key suntool-map "dT" (lambda (n) (interactive "p") (scroll-up n)))
-(define-key suntool-map "ct" 'scroll-down-in-place)             ; t3
-(define-key suntool-map "dt" 'scroll-up-in-place)               ; t4
-(define-key ctl-x-map "*" suntool-map)
 
 ;; Since .emacs gets loaded before this file, a hook is supplied
 ;; for you to put your own bindings in.
@@ -233,13 +136,6 @@
 (defvar suntool-map-hooks nil
   "List of forms to evaluate after setting suntool-map.")
 
-(when suntool-map-hooks
-  (message "suntool-map-hooks is obsolete!  Use term-setup-hook instead!")
-  (let ((hooks suntool-map-hooks))
-    (while hooks
-      (eval (car hooks))
-      (setq hooks (cdr hooks)))))
-
 ;;
 ;; If running under emacstool, arrange to call suspend-emacstool
 ;; instead of suspend-emacs.
@@ -251,6 +147,115 @@
 (autoload 'sun-mouse-handler "sun-mouse"
           "Sun Emacstool handler for mouse blips (not loaded)." t)
 
+(defun terminal-init-sun ()
+  "Terminal initialization function for sun."
+  (define-key function-key-map "\e[" sun-raw-prefix)
+
+  (define-key sun-raw-prefix "210z" [r3])
+  (define-key sun-raw-prefix "213z" [r6])
+  (define-key sun-raw-prefix "214z" [r7])
+  (define-key sun-raw-prefix "216z" [r9])
+  (define-key sun-raw-prefix "218z" [r11])
+  (define-key sun-raw-prefix "220z" [r13])
+  (define-key sun-raw-prefix "222z" [r15])
+  (define-key sun-raw-prefix "193z" [redo])
+  (define-key sun-raw-prefix "194z" [props])
+  (define-key sun-raw-prefix "195z" [undo])
+  ;; (define-key sun-raw-prefix "196z" 'ignore)         ; Expose-down
+  ;; (define-key sun-raw-prefix "197z" [put])
+  ;; (define-key sun-raw-prefix "198z" 'ignore)         ; Open-down
+  ;; (define-key sun-raw-prefix "199z" [get])
+  (define-key sun-raw-prefix "200z" [find])
+  ;; (define-key sun-raw-prefix "201z" 'kill-region-and-unmark) ; Delete
+  (define-key sun-raw-prefix "224z" [f1])
+  (define-key sun-raw-prefix "225z" [f2])
+  (define-key sun-raw-prefix "226z" [f3])
+  (define-key sun-raw-prefix "227z" [f4])
+  (define-key sun-raw-prefix "228z" [f5])
+  (define-key sun-raw-prefix "229z" [f6])
+  (define-key sun-raw-prefix "230z" [f7])
+  (define-key sun-raw-prefix "231z" [f8])
+  (define-key sun-raw-prefix "232z" [f9])
+  (define-key sun-raw-prefix "233z" [f10])
+  (define-key sun-raw-prefix "234z" [f11])
+  (define-key sun-raw-prefix "235z" [f12])
+  (define-key sun-raw-prefix "A" [up])                  ; R8
+  (define-key sun-raw-prefix "B" [down])                ; R14
+  (define-key sun-raw-prefix "C" [right])               ; R12
+  (define-key sun-raw-prefix "D" [left])                ; R10
+
+  (global-set-key [r3]  'backward-page)
+  (global-set-key [r6]  'forward-page)
+  (global-set-key [r7]  'beginning-of-buffer)
+  (global-set-key [r9]  'scroll-down)
+  (global-set-key [r11] 'recenter)
+  (global-set-key [r13] 'end-of-buffer)
+  (global-set-key [r15] 'scroll-up)
+  (global-set-key [redo]        'redraw-display) ;FIXME: collides with default.
+  (global-set-key [props]       'list-buffers)
+  (global-set-key [put] 'sun-select-region)
+  (global-set-key [get] 'sun-yank-selection)
+  (global-set-key [find]        'exchange-point-and-mark)
+  (global-set-key [f3]  'scroll-down-in-place)
+  (global-set-key [f4]  'scroll-up-in-place)
+  (global-set-key [f6]  'shrink-window)
+  (global-set-key [f7]  'enlarge-window)
+
+  (when sun-raw-prefix-hooks
+    (message "sun-raw-prefix-hooks is obsolete!  Use term-setup-hook instead!")
+    (let ((hooks sun-raw-prefix-hooks))
+      (while hooks
+        (eval (car hooks))
+        (setq hooks (cdr hooks)))))
+
+  (define-key suntool-map "gr" 'beginning-of-buffer)    ; r7
+  (define-key suntool-map "iR" 'backward-page)          ; R9
+  (define-key suntool-map "ir" 'scroll-down)            ; r9
+  (define-key suntool-map "kr" 'recenter)               ; r11
+  (define-key suntool-map "mr" 'end-of-buffer)          ; r13
+  (define-key suntool-map "oR" 'forward-page)           ; R15
+  (define-key suntool-map "or" 'scroll-up)              ; r15
+  (define-key suntool-map "b\M-L" 'rerun-prev-command)  ; M-AGAIN
+  (define-key suntool-map "b\M-l" 'prev-complex-command) ; M-Again
+  (define-key suntool-map "bl" 'redraw-display)          ; Again
+  (define-key suntool-map "cl" 'list-buffers)            ; Props
+  (define-key suntool-map "dl" 'undo)                    ; Undo
+  (define-key suntool-map "el" 'ignore)                  ; Expose-Open
+  (define-key suntool-map "fl" 'sun-select-region)       ; Put
+  (define-key suntool-map "f," 'copy-region-as-kill)     ; C-Put
+  (define-key suntool-map "gl" 'ignore)                  ; Open-Open
+  (define-key suntool-map "hl" 'sun-yank-selection)      ; Get
+  (define-key suntool-map "h," 'yank)                    ; C-Get
+  (define-key suntool-map "il" 'research-forward)        ; Find
+  (define-key suntool-map "i," 're-search-forward)       ; C-Find
+  (define-key suntool-map "i\M-l" 'research-backward)    ; M-Find
+  (define-key suntool-map "i\M-," 're-search-backward)   ; C-M-Find
+
+  (define-key suntool-map "jL" 'yank)                   ; DELETE
+  (define-key suntool-map "jl" 'kill-region-and-unmark) ; Delete
+  (define-key suntool-map "j\M-l" 'exchange-point-and-mark) ; M-Delete
+  (define-key suntool-map "j,"
+    (lambda () (interactive) (pop-mark))) ; C-Delete
+
+  (define-key suntool-map "fT" 'shrink-window-horizontally)     ; T6
+  (define-key suntool-map "gT" 'enlarge-window-horizontally)    ; T7
+  (define-key suntool-map "ft" 'shrink-window)                  ; t6
+  (define-key suntool-map "gt" 'enlarge-window)                 ; t7
+  (define-key suntool-map "cT" (lambda (n) (interactive "p") (scroll-down n)))
+  (define-key suntool-map "dT" (lambda (n) (interactive "p") (scroll-up n)))
+  (define-key suntool-map "ct" 'scroll-down-in-place)           ; t3
+  (define-key suntool-map "dt" 'scroll-up-in-place)             ; t4
+  (define-key ctl-x-map "*" suntool-map)
+
+  (when suntool-map-hooks
+    (message "suntool-map-hooks is obsolete!  Use term-setup-hook instead!")
+    (let ((hooks suntool-map-hooks))
+      (while hooks
+        (eval (car hooks))
+        (setq hooks (cdr hooks)))))
+  
+  (define-key ctl-x-map "\C-@" 'sun-mouse-once))
+
 (defun emacstool-init ()
   "Set up Emacstool window, if you know you are in an emacstool."
   ;; Make sure sun-mouse and sun-fns are loaded.
@@ -272,7 +277,6 @@
   (interactive)
   (emacstool-init)
   (sun-mouse-handler))                  ; Now, execute this mouse blip.
-(define-key ctl-x-map "\C-@" 'sun-mouse-once)
 
 ;;; arch-tag: db761d47-fd7d-42b4-aae1-04fa116b6ba6
 ;;; sun.el ends here
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index c24464fbbd5..f7bc8c852a9 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -3,7 +3,7 @@
 ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
 ;; Keywords: terminals
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -28,77 +28,80 @@
 
 ;;; Code:
 
-(or (lookup-key function-key-map "\e[")
-    (define-key function-key-map "\e[" (make-keymap)))
-;; (or (lookup-key function-key-map "\eO")
-;;    (define-key function-key-map "\eO" (make-keymap)))
-
-;; Miscellaneous keys
-(mapcar (function (lambda (key-binding)
-                    (define-key function-key-map
-                      (car key-binding) (nth 1 key-binding))))
-        '(
-          ;; These are set up by termcap or terminfo
-          ;; ("\eOP"    [kp-f1])
-          ;; ("\eOQ"    [kp-f2])
-          ;; ("\eOR"    [kp-f3])
-          ;; ("\eOS"    [kp-f4])
-
-          ;; These might br set by terminfo
-          ("\e[H"       [home])
-          ("\e[Z"       [backtab])
-          ("\e[i"       [print])
-          ("\e[@"       [insert])
-          ("\e[L"       [insertline])
-          ("\e[M"       [deleteline])
-          ("\e[U"       [next])         ;; actually the `page' key
-
-          ;; These won't be set up by either
-          ("\eOm"       [kp-subtract])
-          ("\eOl"       [kp-separator])
-          ("\eOn"       [kp-decimal])
-          ("\eOM"       [kp-enter])
-
-          ;; These won't be set up by either either
-          ("\e[K"       [key_eol])      ;; Not an X keysym
-          ("\e[J"       [key_eos])      ;; Not an X keysym
-          ("\e[2J"      [key_clear])    ;; Not an X keysym
-          ("\e[P"       [key_dc])       ;; Not an X keysym
-          ("\e[g"       [S-tab])        ;; Not an X keysym
-          ("\e[2N"      [clearentry])   ;; Not an X keysym
-          ("\e[2K"      [S-clearentry]) ;; Not an X keysym
-          ("\e[E"       [?\C-j])        ;; Not an X keysym
-          ("\e[g"       [S-backtab])    ;; Not an X keysym
-          ("\e[?1i"     [key_sprint])   ;; Not an X keysym
-          ("\e[4h"      [key_sic])      ;; Not an X keysym
-          ("\e[4l"      [S-delete])     ;; Not an X keysym
-          ("\e[Q"       [S-insertline]) ;; Not an X keysym
-          ("\e[1Q"      [key_sdl])      ;; Not an X keysym
-          ("\e[19l"     [key_seol])     ;; Not an X keysym
-          ("\e[19h"     [S-erasepage])  ;; Not an X keysym
-          ("\e[V"       [S-page])       ;; Not an X keysym
-          ("\eS"        [send])         ;; Not an X keysym
-          ("\e5"        [S-send])       ;; Not an X keysym
-          ))
-
-;; The numeric keypad keys.
-(let ((i 0))
-  (while (< i 10)
-    (define-key function-key-map
-      (format "\eO%c" (+ i ?p))
-      (vector (intern (format "kp-%d" i))))
-    (setq i (1+ i))))
-;; The numbered function keys.
-(let ((i 0))
-  (while (< i 16)
-    (define-key function-key-map
-      (format "\e?%c" (+ i ?a))
-      (vector (intern (format "f%d" (1+ i)))))
-    (define-key function-key-map
-      (format "\e?%c" (+ i ?A))
-      (vector (intern (format "S-f%d" (1+ i)))))
-    (setq i (1+ i))))
-
+(defun terminal-init-tvi970 ()
+  "Terminal initialization function for tvi970."
+  (or (lookup-key function-key-map "\e[")
+      (define-key function-key-map "\e[" (make-keymap)))
+  ;; (or (lookup-key function-key-map "\eO")
+  ;;    (define-key function-key-map "\eO" (make-keymap)))
+
+  ;; Miscellaneous keys
+  (mapcar (function (lambda (key-binding)
+                      (define-key function-key-map
+                        (car key-binding) (nth 1 key-binding))))
+          '(
+            ;; These are set up by termcap or terminfo
+            ;; ("\eOP"  [kp-f1])
+            ;; ("\eOQ"  [kp-f2])
+            ;; ("\eOR"  [kp-f3])
+            ;; ("\eOS"  [kp-f4])
+
+            ;; These might br set by terminfo
+            ("\e[H"     [home])
+            ("\e[Z"     [backtab])
+            ("\e[i"     [print])
+            ("\e[@"     [insert])
+            ("\e[L"     [insertline])
+            ("\e[M"     [deleteline])
+            ("\e[U"     [next]) ;; actually the `page' key
+
+            ;; These won't be set up by either
+            ("\eOm"     [kp-subtract])
+            ("\eOl"     [kp-separator])
+            ("\eOn"     [kp-decimal])
+            ("\eOM"     [kp-enter])
+
+            ;; These won't be set up by either either
+            ("\e[K"     [key_eol])      ;; Not an X keysym
+            ("\e[J"     [key_eos])      ;; Not an X keysym
+            ("\e[2J"    [key_clear])    ;; Not an X keysym
+            ("\e[P"     [key_dc])       ;; Not an X keysym
+            ("\e[g"     [S-tab])        ;; Not an X keysym
+            ("\e[2N"    [clearentry])   ;; Not an X keysym
+            ("\e[2K"    [S-clearentry]) ;; Not an X keysym
+            ("\e[E"     [?\C-j])        ;; Not an X keysym
+            ("\e[g"     [S-backtab])    ;; Not an X keysym
+            ("\e[?1i"   [key_sprint])   ;; Not an X keysym
+            ("\e[4h"    [key_sic])      ;; Not an X keysym
+            ("\e[4l"    [S-delete])     ;; Not an X keysym
+            ("\e[Q"     [S-insertline]) ;; Not an X keysym
+            ("\e[1Q"    [key_sdl])      ;; Not an X keysym
+            ("\e[19l"   [key_seol])     ;; Not an X keysym
+            ("\e[19h"   [S-erasepage])  ;; Not an X keysym
+            ("\e[V"     [S-page])       ;; Not an X keysym
+            ("\eS"      [send])         ;; Not an X keysym
+            ("\e5"      [S-send])       ;; Not an X keysym
+            ))
+
+  ;; The numeric keypad keys.
+  (let ((i 0))
+    (while (< i 10)
+      (define-key function-key-map
+        (format "\eO%c" (+ i ?p))
+        (vector (intern (format "kp-%d" i))))
+      (setq i (1+ i))))
+  ;; The numbered function keys.
+  (let ((i 0))
+    (while (< i 16)
+      (define-key function-key-map
+        (format "\e?%c" (+ i ?a))
+        (vector (intern (format "f%d" (1+ i)))))
+      (define-key function-key-map
+        (format "\e?%c" (+ i ?A))
+        (vector (intern (format "S-f%d" (1+ i)))))
+      (setq i (1+ i))))
+
+  (tvi970-set-keypad-mode 1))
 
 ;;; Should keypad numbers send ordinary digits or distinct escape sequences?
 (defvar tvi970-keypad-numeric nil
@@ -121,7 +124,5 @@ With a negative argument, select numeric keypad mode."
           (> (prefix-numeric-value arg) 0)))
   (send-string-to-terminal (if tvi970-keypad-numeric "\e=" "\e>")))
 
-(tvi970-set-keypad-mode 1)
-
 ;;; arch-tag: c1334cf0-1462-41c3-a963-c077d175f8f0
 ;;; tvi970.el ends here
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index dfe011c0f6e..6b44e941813 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -36,8 +36,12 @@
 ;;; Code:
 
 ;; Set up function-key-map entries that termcap and terminfo don't know.
-(load "term/lk201" nil t)
 
+
+(defun terminal-init-vt100 ()
+  "Terminal initialization function for vt100."
+  (load "term/lk201" nil t))
+  
 ;;; Controlling the screen width.
 (defvar vt100-wide-mode (= (frame-width) 132)
   "t if vt100 is in 132-column mode.")
diff --git a/lisp/term/vt102.el b/lisp/term/vt102.el
index 887f63837eb..ad780ed5081 100644
--- a/lisp/term/vt102.el
+++ b/lisp/term/vt102.el
@@ -1,6 +1,8 @@
 ;; -*- no-byte-compile: t -*-
 
-(load "term/vt100" nil t)
+(defun terminal-init-vt102 ()
+  "Terminal initialization function for vt102."  
+  (load "term/vt100" nil t))
 
 ;;; arch-tag: 6e839cfc-125a-4574-82f1-c23a51f7c50f
 ;;; vt102.el ends here
diff --git a/lisp/term/vt125.el b/lisp/term/vt125.el
index 458e0dafc22..2221e597aed 100644
--- a/lisp/term/vt125.el
+++ b/lisp/term/vt125.el
@@ -1,6 +1,8 @@
 ;; -*- no-byte-compile: t -*-
 
-(load "term/vt100" nil t)
+(defun terminal-init-vt125 ()
+  "Terminal initialization function for vt125."  
+  (load "term/vt100" nil t))
 
 ;;; arch-tag: 1d92d70f-dd55-4a1d-9088-e215a4883801
 ;;; vt125.el ends here
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 0ff0a30f567..e1215d15023 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -1,10 +1,12 @@
 ;; -*- no-byte-compile: t -*-
 ;; For our purposes we can treat the vt200 and vt100 almost alike.
 ;; Most differences are handled by the termcap entry.
-(load "term/vt100" nil t)
 
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt200 ()
+  "Terminal initialization function for vt200."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89
 ;;; vt200.el ends here
diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el
index d7deeaf11c7..315030ab687 100644
--- a/lisp/term/vt201.el
+++ b/lisp/term/vt201.el
@@ -1,10 +1,11 @@
 ;; -*- no-byte-compile: t -*-
 ;; For our purposes we can treat the vt200 and vt100 almost alike.
 ;; Most differences are handled by the termcap entry.
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt201 ()
+  "Terminal initialization function for vt201."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae
 ;;; vt201.el ends here
diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el
index 7ea1e3b57fa..cccd2a6dfb7 100644
--- a/lisp/term/vt220.el
+++ b/lisp/term/vt220.el
@@ -1,10 +1,11 @@
 ;; -*- no-byte-compile: t -*-
 ;; For our purposes we can treat the vt200 and vt100 almost alike.
 ;; Most differences are handled by the termcap entry.
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt220 ()
+  "Terminal initialization function for vt220."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871
 ;;; vt220.el ends here
diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el
index 05f0bebe50f..bb3931edac8 100644
--- a/lisp/term/vt240.el
+++ b/lisp/term/vt240.el
@@ -1,10 +1,11 @@
 ;; -*- no-byte-compile: t -*-
 ;; For our purposes we can treat the vt200 and vt100 almost alike.
 ;; Most differences are handled by the termcap entry.
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt240 ()
+  "Terminal initialization function for vt240."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7
 ;;; vt240.el ends here
diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index 871ed234bc6..ff600f47a1e 100644
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -1,8 +1,9 @@
 ;; -*- no-byte-compile: t -*-
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt300 ()
+  "Terminal initialization function for vt300."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f
 ;;; vt300.el ends here
diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el
index c99b8672fc1..fb7772c7b5b 100644
--- a/lisp/term/vt320.el
+++ b/lisp/term/vt320.el
@@ -1,8 +1,9 @@
 ;; -*- no-byte-compile: t -*-
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt320 ()
+  "Terminal initialization function for vt320."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c
 ;;; vt320.el ends here
diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el
index 666266e2bf5..97c0c5d7372 100644
--- a/lisp/term/vt400.el
+++ b/lisp/term/vt400.el
@@ -1,8 +1,9 @@
 ;; -*- no-byte-compile: t -*-
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt400 ()
+  "Terminal initialization function for vt400."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5
 ;;; vt400.el ends here
diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el
index 9ed5fbe135b..65ffa759c17 100644
--- a/lisp/term/vt420.el
+++ b/lisp/term/vt420.el
@@ -1,8 +1,9 @@
 ;; -*- no-byte-compile: t -*-
-(load "term/vt100" nil t)
-
-;; Make F11 an escape key.
-(define-key function-key-map "\e[23~" [?\e])
+(defun terminal-init-vt420 ()
+  "Terminal initialization function for vt420."  
+  (load "term/vt100" nil t)
+  ;; Make F11 an escape key.
+  (define-key function-key-map "\e[23~" [?\e]))
 
 ;;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160
 ;;; vt420.el ends here
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 562f5c728c0..64c489d7204 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,6 +1,6 @@
 ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 1994, 2005 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
 ;;      Jim Blandy <jimb@occs.cs.oberlin.edu>
@@ -37,74 +37,92 @@
 
 ;;; Code:
 
-(define-key function-key-map "\C-a" (make-keymap))
-(mapcar (function (lambda (key-definition)
-                    (define-key function-key-map
-                      (car key-definition) (nth 1 key-definition))))
-        '(
-          ;; These might be set up by termcap and terminfo
-          ("\C-k"       [up])
-          ("\C-j"       [down])
-          ("\C-l"       [right])
-          ("\C-h"       [left])
-          ("\^a@\^m"    [f1])
-          ("\^aA\^m"    [f2])
-          ("\^aB\^m"    [f3])
-          ("\^aC\^m"    [f4])
-          ("\^aD\^m"    [f5])
-          ("\^aE\^m"    [f6])
-          ("\^aF\^m"    [f7])
-          ("\^aG\^m"    [f8])
-          ("\^aH\^m"    [f9])
-
-          ;; These might be set up by terminfo
-          ("\eK"        [next])
-          ("\eT"        [clearline])
-          ("\^^"        [home])
-          ("\e\^^"      [end])
-          ("\eQ"        [insert])
-          ("\eE"        [insertline])
-          ("\eR"        [deleteline])
-          ("\eP"        [print])
-          ("\er"        [replace])
-          ("\^aI\^m"    [f10])
-          ("\^aJ\^m"    [f11])
-          ("\^aK\^m"    [f12])
-          ("\^aL\^m"    [f13])
-          ("\^aM\^m"    [f14])
-          ("\^aN\^m"    [f15])
-          ("\^aO\^m"    [f16])
-          ("\^a`\^m"    [f17])
-          ("\^aa\^m"    [f18])
-          ("\^ab\^m"    [f19])
-          ("\^ac\^m"    [f20])
-          ("\^ad\^m"    [f21])
-          ("\^ae\^m"    [f22])
-          ("\^af\^m"    [f23])
-          ("\^ag\^m"    [f24])
-          ("\^ah\^m"    [f25])
-          ("\^ai\^m"    [f26])
-          ("\^aj\^m"    [f27])
-          ("\^ak\^m"    [f28])
-          ("\^al\^m"    [f29])
-          ("\^am\^m"    [f30])
-          ("\^an\^m"    [f31])
-          ("\^ao\^m"    [f32])
-
-          ;; Terminfo may know about these, but X won't
-          ("\eI"        [key-stab])             ;; Not an X keysym
-          ("\eJ"        [key-snext])            ;; Not an X keysym
-          ("\eY"        [key-clear])            ;; Not an X keysym
-
-          ;; These are totally strange :-)
-          ("\eW"        [?\C-?])        ;; Not an X keysym
-          ("\^a\^k\^m"  [funct-up])     ;; Not an X keysym
-          ("\^a\^j\^m"  [funct-down])   ;; Not an X keysym
-          ("\^a\^l\^m"  [funct-right])  ;; Not an X keysym
-          ("\^a\^h\^m"  [funct-left])   ;; Not an X keysym
-          ("\^a\^m\^m"  [funct-return]) ;; Not an X keysym
-          ("\^a\^i\^m"  [funct-tab])    ;; Not an X keysym
-))
+(defun terminal-init-wyse50 ()
+  "Terminal initialization function for wyse50."
+  (define-key function-key-map "\C-a" (make-keymap))
+  (mapcar (function (lambda (key-definition)
+                      (define-key function-key-map
+                        (car key-definition) (nth 1 key-definition))))
+          '(
+            ;; These might be set up by termcap and terminfo
+            ("\C-k"     [up])
+            ("\C-j"     [down])
+            ("\C-l"     [right])
+            ("\C-h"     [left])
+            ("\^a@\^m"  [f1])
+            ("\^aA\^m"  [f2])
+            ("\^aB\^m"  [f3])
+            ("\^aC\^m"  [f4])
+            ("\^aD\^m"  [f5])
+            ("\^aE\^m"  [f6])
+            ("\^aF\^m"  [f7])
+            ("\^aG\^m"  [f8])
+            ("\^aH\^m"  [f9])
+
+            ;; These might be set up by terminfo
+            ("\eK"      [next])
+            ("\eT"      [clearline])
+            ("\^^"      [home])
+            ("\e\^^"    [end])
+            ("\eQ"      [insert])
+            ("\eE"      [insertline])
+            ("\eR"      [deleteline])
+            ("\eP"      [print])
+            ("\er"      [replace])
+            ("\^aI\^m"  [f10])
+            ("\^aJ\^m"  [f11])
+            ("\^aK\^m"  [f12])
+            ("\^aL\^m"  [f13])
+            ("\^aM\^m"  [f14])
+            ("\^aN\^m"  [f15])
+            ("\^aO\^m"  [f16])
+            ("\^a`\^m"  [f17])
+            ("\^aa\^m"  [f18])
+            ("\^ab\^m"  [f19])
+            ("\^ac\^m"  [f20])
+            ("\^ad\^m"  [f21])
+            ("\^ae\^m"  [f22])
+            ("\^af\^m"  [f23])
+            ("\^ag\^m"  [f24])
+            ("\^ah\^m"  [f25])
+            ("\^ai\^m"  [f26])
+            ("\^aj\^m"  [f27])
+            ("\^ak\^m"  [f28])
+            ("\^al\^m"  [f29])
+            ("\^am\^m"  [f30])
+            ("\^an\^m"  [f31])
+            ("\^ao\^m"  [f32])
+
+            ;; Terminfo may know about these, but X won't
+            ("\eI"      [key-stab])             ;; Not an X keysym
+            ("\eJ"      [key-snext])            ;; Not an X keysym
+            ("\eY"      [key-clear])            ;; Not an X keysym
+
+            ;; These are totally strange :-)
+            ("\eW"      [?\C-?])            ;; Not an X keysym
+            ("\^a\^k\^m"        [funct-up]) ;; Not an X keysym
+            ("\^a\^j\^m"        [funct-down])  ;; Not an X keysym
+            ("\^a\^l\^m"        [funct-right]) ;; Not an X keysym
+            ("\^a\^h\^m"        [funct-left])  ;; Not an X keysym
+            ("\^a\^m\^m"        [funct-return]) ;; Not an X keysym
+            ("\^a\^i\^m"        [funct-tab])    ;; Not an X keysym
+            ))
+
+  ;; Miscellaneous hacks
+
+  ;; This is an ugly hack for a nasty problem:
+  ;; Wyse 50 takes one character cell to store video attributes (which seems to
+  ;; explain width 79 rather than 80, column 1 is not used!!!).
+  ;; On killing (C-x C-c) the end inverse code (on column 1 of line 24)
+  ;; of the mode line is overwritten AFTER all the y-or-n questions.
+  ;; This causes the attribute to remain in effect until the mode line has
+  ;; scrolled of the screen.  Suspending (C-z) does not cause this problem.
+  ;; On such terminals, Emacs should sacrifice the first and last character of
+  ;; each mode line, rather than a whole screen column!
+  (add-hook 'kill-emacs-hook
+            (function (lambda () (interactive)
+                        (send-string-to-terminal
+                         (concat "\ea23R" (1+ (frame-width)) "C\eG0"))))))
 
 (defun enable-arrow-keys ()
   "To be called by term-setup-hook. Overrides 6 Emacs standard keys
@@ -131,22 +149,5 @@ M-r	M-x move-to-window-line, Funct up-arrow or down-arrow are similar
             ("\er"      nil)))
   (fset 'enable-arrow-keys nil))
 
-
-;;; Miscellaneous hacks
-
-;;; This is an ugly hack for a nasty problem:
-;;; Wyse 50 takes one character cell to store video attributes (which seems to
-;;; explain width 79 rather than 80, column 1 is not used!!!).
-;;; On killing (C-x C-c) the end inverse code (on column 1 of line 24)
-;;; of the mode line is overwritten AFTER all the y-or-n questions.
-;;; This causes the attribute to remain in effect until the mode line has
-;;; scrolled of the screen.  Suspending (C-z) does not cause this problem.
-;;; On such terminals, Emacs should sacrifice the first and last character of
-;;; each mode line, rather than a whole screen column!
-(add-hook 'kill-emacs-hook
-          (function (lambda () (interactive)
-                      (send-string-to-terminal
-                       (concat "\ea23R" (1+ (frame-width)) "C\eG0")))))
-
 ;;; arch-tag: b6a05d37-eead-4cf6-b997-0f956c68881c
 ;;; wyse50.el ends here
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 17d7cde0e8a..d0c26aa4b94 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -26,222 +26,238 @@
 
 ;;; Code:
 
-;;; The terminal intialization C code file might have initialized
-;;; function keys F13->F60 from the termcap/terminfo information.  On
-;;; a PC-style keyboard these keys correspond to
-;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
-;;; code here subsitutes the corresponding defintions in
-;;; function-key-map. This substitution is needed because if a key
-;;; definition if found in function-key-map, there are no further
-;;; lookups in other keymaps.
-(substitute-key-definition [f13] [S-f1] function-key-map) 
-(substitute-key-definition [f14] [S-f2] function-key-map)
-(substitute-key-definition [f15] [S-f3] function-key-map)
-(substitute-key-definition [f16] [S-f4] function-key-map)
-(substitute-key-definition [f17] [S-f5] function-key-map)
-(substitute-key-definition [f18] [S-f6] function-key-map)
-(substitute-key-definition [f19] [S-f7] function-key-map)
-(substitute-key-definition [f20] [S-f8] function-key-map)
-(substitute-key-definition [f21] [S-f9] function-key-map)
-(substitute-key-definition [f22] [S-f10] function-key-map)
-(substitute-key-definition [f23] [S-f11] function-key-map)
-(substitute-key-definition [f24] [S-f12] function-key-map)
-
-(substitute-key-definition [f25] [C-f1] function-key-map) 
-(substitute-key-definition [f26] [C-f2] function-key-map)
-(substitute-key-definition [f27] [C-f3] function-key-map)
-(substitute-key-definition [f28] [C-f4] function-key-map)
-(substitute-key-definition [f29] [C-f5] function-key-map)
-(substitute-key-definition [f30] [C-f6] function-key-map)
-(substitute-key-definition [f31] [C-f7] function-key-map)
-(substitute-key-definition [f32] [C-f8] function-key-map)
-(substitute-key-definition [f33] [C-f9] function-key-map)
-(substitute-key-definition [f34] [C-f10] function-key-map)
-(substitute-key-definition [f35] [C-f11] function-key-map)
-(substitute-key-definition [f36] [C-f12] function-key-map)
-
-(substitute-key-definition [f37] [C-S-f1] function-key-map) 
-(substitute-key-definition [f38] [C-S-f2] function-key-map)
-(substitute-key-definition [f39] [C-S-f3] function-key-map)
-(substitute-key-definition [f40] [C-S-f4] function-key-map)
-(substitute-key-definition [f41] [C-S-f5] function-key-map)
-(substitute-key-definition [f42] [C-S-f6] function-key-map)
-(substitute-key-definition [f43] [C-S-f7] function-key-map)
-(substitute-key-definition [f44] [C-S-f8] function-key-map)
-(substitute-key-definition [f45] [C-S-f9] function-key-map)
-(substitute-key-definition [f46] [C-S-f10] function-key-map)
-(substitute-key-definition [f47] [C-S-f11] function-key-map)
-(substitute-key-definition [f48] [C-S-f12] function-key-map)
-
-(substitute-key-definition [f49] [A-f1] function-key-map) 
-(substitute-key-definition [f50] [A-f2] function-key-map)
-(substitute-key-definition [f51] [A-f3] function-key-map)
-(substitute-key-definition [f52] [A-f4] function-key-map)
-(substitute-key-definition [f53] [A-f5] function-key-map)
-(substitute-key-definition [f54] [A-f6] function-key-map)
-(substitute-key-definition [f55] [A-f7] function-key-map)
-(substitute-key-definition [f56] [A-f8] function-key-map)
-(substitute-key-definition [f57] [A-f9] function-key-map)
-(substitute-key-definition [f58] [A-f10] function-key-map)
-(substitute-key-definition [f59] [A-f11] function-key-map)
-(substitute-key-definition [f60] [A-f12] function-key-map)
-
-(let ((map (make-sparse-keymap)))
-  (define-key map "\e[A" [up])
-  (define-key map "\e[B" [down])
-  (define-key map "\e[C" [right])
-  (define-key map "\e[D" [left])
-  (define-key map "\e[1~" [home])
-  (define-key map "\e[2~" [insert])
-  (define-key map "\e[3~" [delete])
-  (define-key map "\e[4~" [select])
-  (define-key map "\e[5~" [prior])
-  (define-key map "\e[6~" [next])
-  (define-key map "\e[11~" [f1])
-  (define-key map "\e[12~" [f2])
-  (define-key map "\e[13~" [f3])
-  (define-key map "\e[14~" [f4])
-  (define-key map "\e[15~" [f5])
-  (define-key map "\e[17~" [f6])
-  (define-key map "\e[18~" [f7])
-  (define-key map "\e[19~" [f8])
-  (define-key map "\e[20~" [f9])
-  (define-key map "\e[21~" [f10])
-  (define-key map "\e[23~" [f11])
-  (define-key map "\e[24~" [f12])
-  (define-key map "\e[29~" [print])
-
-  (define-key map "\eOP" [f1])
-  (define-key map "\eOQ" [f2])
-  (define-key map "\eOR" [f3])
-  (define-key map "\eOS" [f4])
-
-  (define-key map "\eO2P" [S-f1])
-  (define-key map "\eO2Q" [S-f2])
-  (define-key map "\eO2R" [S-f3])
-  (define-key map "\eO2S" [S-f4])
-  (define-key map "\e[15;2~" [S-f5])
-  (define-key map "\e[17;2~" [S-f6])
-  (define-key map "\e[18;2~" [S-f7])
-  (define-key map "\e[19;2~" [S-f8])
-  (define-key map "\e[20;2~" [S-f9])
-  (define-key map "\e[21;2~" [S-f10])
-  (define-key map "\e[23;2~" [S-f11])
-  (define-key map "\e[24;2~" [S-f12])
-
-  (define-key map "\eO5P" [C-f1])
-  (define-key map "\eO5Q" [C-f2])
-  (define-key map "\eO5R" [C-f3])
-  (define-key map "\eO5S" [C-f4])
-  (define-key map "\e[15;5~" [C-f5])
-  (define-key map "\e[17;5~" [C-f6])
-  (define-key map "\e[18;5~" [C-f7])
-  (define-key map "\e[19;5~" [C-f8])
-  (define-key map "\e[20;5~" [C-f9])
-  (define-key map "\e[21;5~" [C-f10])
-  (define-key map "\e[23;5~" [C-f11])
-  (define-key map "\e[24;5~" [C-f12])
-
-  (define-key map "\eO6P" [C-S-f1])
-  (define-key map "\eO6Q" [C-S-f2])
-  (define-key map "\eO6R" [C-S-f3])
-  (define-key map "\eO6S" [C-S-f4])
-  (define-key map "\e[15;6~" [C-S-f5])
-  (define-key map "\e[17;6~" [C-S-f6])
-  (define-key map "\e[18;6~" [C-S-f7])
-  (define-key map "\e[19;6~" [C-S-f8])
-  (define-key map "\e[20;6~" [C-S-f9])
-  (define-key map "\e[21;6~" [C-S-f10])
-  (define-key map "\e[23;6~" [C-S-f11])
-  (define-key map "\e[24;6~" [C-S-f12])
-
-  (define-key map "\eO3P" [A-f1])
-  (define-key map "\eO3Q" [A-f2])
-  (define-key map "\eO3R" [A-f3])
-  (define-key map "\eO3S" [A-f4])
-  (define-key map "\e[15;3~" [A-f5])
-  (define-key map "\e[17;3~" [A-f6])
-  (define-key map "\e[18;3~" [A-f7])
-  (define-key map "\e[19;3~" [A-f8])
-  (define-key map "\e[20;3~" [A-f9])
-  (define-key map "\e[21;3~" [A-f10])
-  (define-key map "\e[23;3~" [A-f11])
-  (define-key map "\e[24;3~" [A-f12])
-
-  (define-key map "\e[1;2A" [S-up])
-  (define-key map "\e[1;2B" [S-down])
-  (define-key map "\e[1;2C" [S-right])
-  (define-key map "\e[1;2D" [S-left])
-  (define-key map "\e[1;2F" [S-end])
-  (define-key map "\e[1;2H" [S-home])
-
-  (define-key map "\e[1;5A" [C-up])
-  (define-key map "\e[1;5B" [C-down])
-  (define-key map "\e[1;5C" [C-right])
-  (define-key map "\e[1;5D" [C-left])
-  (define-key map "\e[1;5F" [C-end])
-  (define-key map "\e[1;5H" [C-home])
-
-  (define-key map "\e[1;6A" [C-S-up])
-  (define-key map "\e[1;6B" [C-S-down])
-  (define-key map "\e[1;6C" [C-S-right])
-  (define-key map "\e[1;6D" [C-S-left])
-  (define-key map "\e[1;6F" [C-S-end])
-  (define-key map "\e[1;6H" [C-S-home])
-
-  (define-key map "\e[1;3A" [A-up])
-  (define-key map "\e[1;3B" [A-down])
-  (define-key map "\e[1;3C" [A-right])
-  (define-key map "\e[1;3D" [A-left])
-  (define-key map "\e[1;3F" [A-end])
-  (define-key map "\e[1;3H" [A-home])
-
-  (define-key map "\e[2;2~" [S-insert])
-  (define-key map "\e[3;2~" [S-delete])
-  (define-key map "\e[5;2~" [S-prior])
-  (define-key map "\e[6;2~" [S-next])
-
-  (define-key map "\e[2;5~" [C-insert])
-  (define-key map "\e[3;5~" [C-delete])
-  (define-key map "\e[5;5~" [C-prior])
-  (define-key map "\e[6;5~" [C-next])
-
-  (define-key map "\e[2;6~" [C-S-insert])
-  (define-key map "\e[3;6~" [C-S-delete])
-  (define-key map "\e[5;6~" [C-S-prior])
-  (define-key map "\e[6;6~" [C-S-next])
-
-  (define-key map "\e[2;3~" [A-insert])
-  (define-key map "\e[3;3~" [A-delete])
-  (define-key map "\e[5;3~" [A-prior])
-  (define-key map "\e[6;3~" [A-next])
-
-  (define-key map "\eOA" [up])
-  (define-key map "\eOB" [down])
-  (define-key map "\eOC" [right])
-  (define-key map "\eOD" [left])
-  (define-key map "\eOF" [end])
-  (define-key map "\eOH" [home])
-
-  (define-key map "\eO2A" [S-up])
-  (define-key map "\eO2B" [S-down])
-  (define-key map "\eO2C" [S-right])
-  (define-key map "\eO2D" [S-left])
-  (define-key map "\eO2F" [S-end])
-  (define-key map "\eO2H" [S-home])
-
-  (define-key map "\eO5A" [C-up])
-  (define-key map "\eO5B" [C-down])
-  (define-key map "\eO5C" [C-right])
-  (define-key map "\eO5D" [C-left])
-  (define-key map "\eO5F" [C-end])
-  (define-key map "\eO5H" [C-home])
-
-  ;; Use inheritance to let the main keymap override those defaults.
-  ;; This way we don't override terminfo-derived settings or settings
-  ;; made in the .emacs file.
-  (set-keymap-parent map (keymap-parent function-key-map))
-  (set-keymap-parent function-key-map map))
+(defun terminal-init-xterm ()
+  "Terminal initialization function for xterm."
+  ;; rxvt terminals sometimes set the TERM variable to "xterm", but
+  ;; rxvt's keybindings that are incompatible with xterm's. It is
+  ;; better in that case to use rxvt's initializion function.
+  (if (and (getenv "COLORTERM")
+           (string-match "\\`rxvt" (getenv "COLORTERM")))
+      (progn 
+        (load "term/rxvt")
+        (terminal-init-rxvt))
+
+    ;; The terminal intialization C code file might have initialized
+    ;; function keys F13->F60 from the termcap/terminfo information.  On
+    ;; a PC-style keyboard these keys correspond to
+    ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
+    ;; code here subsitutes the corresponding defintions in
+    ;; function-key-map. This substitution is needed because if a key
+    ;; definition if found in function-key-map, there are no further
+    ;; lookups in other keymaps.
+    (substitute-key-definition [f13] [S-f1] function-key-map) 
+    (substitute-key-definition [f14] [S-f2] function-key-map)
+    (substitute-key-definition [f15] [S-f3] function-key-map)
+    (substitute-key-definition [f16] [S-f4] function-key-map)
+    (substitute-key-definition [f17] [S-f5] function-key-map)
+    (substitute-key-definition [f18] [S-f6] function-key-map)
+    (substitute-key-definition [f19] [S-f7] function-key-map)
+    (substitute-key-definition [f20] [S-f8] function-key-map)
+    (substitute-key-definition [f21] [S-f9] function-key-map)
+    (substitute-key-definition [f22] [S-f10] function-key-map)
+    (substitute-key-definition [f23] [S-f11] function-key-map)
+    (substitute-key-definition [f24] [S-f12] function-key-map)
+
+    (substitute-key-definition [f25] [C-f1] function-key-map) 
+    (substitute-key-definition [f26] [C-f2] function-key-map)
+    (substitute-key-definition [f27] [C-f3] function-key-map)
+    (substitute-key-definition [f28] [C-f4] function-key-map)
+    (substitute-key-definition [f29] [C-f5] function-key-map)
+    (substitute-key-definition [f30] [C-f6] function-key-map)
+    (substitute-key-definition [f31] [C-f7] function-key-map)
+    (substitute-key-definition [f32] [C-f8] function-key-map)
+    (substitute-key-definition [f33] [C-f9] function-key-map)
+    (substitute-key-definition [f34] [C-f10] function-key-map)
+    (substitute-key-definition [f35] [C-f11] function-key-map)
+    (substitute-key-definition [f36] [C-f12] function-key-map)
+
+    (substitute-key-definition [f37] [C-S-f1] function-key-map) 
+    (substitute-key-definition [f38] [C-S-f2] function-key-map)
+    (substitute-key-definition [f39] [C-S-f3] function-key-map)
+    (substitute-key-definition [f40] [C-S-f4] function-key-map)
+    (substitute-key-definition [f41] [C-S-f5] function-key-map)
+    (substitute-key-definition [f42] [C-S-f6] function-key-map)
+    (substitute-key-definition [f43] [C-S-f7] function-key-map)
+    (substitute-key-definition [f44] [C-S-f8] function-key-map)
+    (substitute-key-definition [f45] [C-S-f9] function-key-map)
+    (substitute-key-definition [f46] [C-S-f10] function-key-map)
+    (substitute-key-definition [f47] [C-S-f11] function-key-map)
+    (substitute-key-definition [f48] [C-S-f12] function-key-map)
+
+    (substitute-key-definition [f49] [A-f1] function-key-map) 
+    (substitute-key-definition [f50] [A-f2] function-key-map)
+    (substitute-key-definition [f51] [A-f3] function-key-map)
+    (substitute-key-definition [f52] [A-f4] function-key-map)
+    (substitute-key-definition [f53] [A-f5] function-key-map)
+    (substitute-key-definition [f54] [A-f6] function-key-map)
+    (substitute-key-definition [f55] [A-f7] function-key-map)
+    (substitute-key-definition [f56] [A-f8] function-key-map)
+    (substitute-key-definition [f57] [A-f9] function-key-map)
+    (substitute-key-definition [f58] [A-f10] function-key-map)
+    (substitute-key-definition [f59] [A-f11] function-key-map)
+    (substitute-key-definition [f60] [A-f12] function-key-map)
+
+    (let ((map (make-sparse-keymap)))
+      (define-key map "\e[A" [up])
+      (define-key map "\e[B" [down])
+      (define-key map "\e[C" [right])
+      (define-key map "\e[D" [left])
+      (define-key map "\e[1~" [home])
+      (define-key map "\e[2~" [insert])
+      (define-key map "\e[3~" [delete])
+      (define-key map "\e[4~" [select])
+      (define-key map "\e[5~" [prior])
+      (define-key map "\e[6~" [next])
+      (define-key map "\e[11~" [f1])
+      (define-key map "\e[12~" [f2])
+      (define-key map "\e[13~" [f3])
+      (define-key map "\e[14~" [f4])
+      (define-key map "\e[15~" [f5])
+      (define-key map "\e[17~" [f6])
+      (define-key map "\e[18~" [f7])
+      (define-key map "\e[19~" [f8])
+      (define-key map "\e[20~" [f9])
+      (define-key map "\e[21~" [f10])
+      (define-key map "\e[23~" [f11])
+      (define-key map "\e[24~" [f12])
+      (define-key map "\e[29~" [print])
+
+      (define-key map "\eOP" [f1])
+      (define-key map "\eOQ" [f2])
+      (define-key map "\eOR" [f3])
+      (define-key map "\eOS" [f4])
+
+      (define-key map "\eO2P" [S-f1])
+      (define-key map "\eO2Q" [S-f2])
+      (define-key map "\eO2R" [S-f3])
+      (define-key map "\eO2S" [S-f4])
+      (define-key map "\e[15;2~" [S-f5])
+      (define-key map "\e[17;2~" [S-f6])
+      (define-key map "\e[18;2~" [S-f7])
+      (define-key map "\e[19;2~" [S-f8])
+      (define-key map "\e[20;2~" [S-f9])
+      (define-key map "\e[21;2~" [S-f10])
+      (define-key map "\e[23;2~" [S-f11])
+      (define-key map "\e[24;2~" [S-f12])
+
+      (define-key map "\eO5P" [C-f1])
+      (define-key map "\eO5Q" [C-f2])
+      (define-key map "\eO5R" [C-f3])
+      (define-key map "\eO5S" [C-f4])
+      (define-key map "\e[15;5~" [C-f5])
+      (define-key map "\e[17;5~" [C-f6])
+      (define-key map "\e[18;5~" [C-f7])
+      (define-key map "\e[19;5~" [C-f8])
+      (define-key map "\e[20;5~" [C-f9])
+      (define-key map "\e[21;5~" [C-f10])
+      (define-key map "\e[23;5~" [C-f11])
+      (define-key map "\e[24;5~" [C-f12])
+
+      (define-key map "\eO6P" [C-S-f1])
+      (define-key map "\eO6Q" [C-S-f2])
+      (define-key map "\eO6R" [C-S-f3])
+      (define-key map "\eO6S" [C-S-f4])
+      (define-key map "\e[15;6~" [C-S-f5])
+      (define-key map "\e[17;6~" [C-S-f6])
+      (define-key map "\e[18;6~" [C-S-f7])
+      (define-key map "\e[19;6~" [C-S-f8])
+      (define-key map "\e[20;6~" [C-S-f9])
+      (define-key map "\e[21;6~" [C-S-f10])
+      (define-key map "\e[23;6~" [C-S-f11])
+      (define-key map "\e[24;6~" [C-S-f12])
+
+      (define-key map "\eO3P" [A-f1])
+      (define-key map "\eO3Q" [A-f2])
+      (define-key map "\eO3R" [A-f3])
+      (define-key map "\eO3S" [A-f4])
+      (define-key map "\e[15;3~" [A-f5])
+      (define-key map "\e[17;3~" [A-f6])
+      (define-key map "\e[18;3~" [A-f7])
+      (define-key map "\e[19;3~" [A-f8])
+      (define-key map "\e[20;3~" [A-f9])
+      (define-key map "\e[21;3~" [A-f10])
+      (define-key map "\e[23;3~" [A-f11])
+      (define-key map "\e[24;3~" [A-f12])
+
+      (define-key map "\e[1;2A" [S-up])
+      (define-key map "\e[1;2B" [S-down])
+      (define-key map "\e[1;2C" [S-right])
+      (define-key map "\e[1;2D" [S-left])
+      (define-key map "\e[1;2F" [S-end])
+      (define-key map "\e[1;2H" [S-home])
+
+      (define-key map "\e[1;5A" [C-up])
+      (define-key map "\e[1;5B" [C-down])
+      (define-key map "\e[1;5C" [C-right])
+      (define-key map "\e[1;5D" [C-left])
+      (define-key map "\e[1;5F" [C-end])
+      (define-key map "\e[1;5H" [C-home])
+
+      (define-key map "\e[1;6A" [C-S-up])
+      (define-key map "\e[1;6B" [C-S-down])
+      (define-key map "\e[1;6C" [C-S-right])
+      (define-key map "\e[1;6D" [C-S-left])
+      (define-key map "\e[1;6F" [C-S-end])
+      (define-key map "\e[1;6H" [C-S-home])
+
+      (define-key map "\e[1;3A" [A-up])
+      (define-key map "\e[1;3B" [A-down])
+      (define-key map "\e[1;3C" [A-right])
+      (define-key map "\e[1;3D" [A-left])
+      (define-key map "\e[1;3F" [A-end])
+      (define-key map "\e[1;3H" [A-home])
+
+      (define-key map "\e[2;2~" [S-insert])
+      (define-key map "\e[3;2~" [S-delete])
+      (define-key map "\e[5;2~" [S-prior])
+      (define-key map "\e[6;2~" [S-next])
+
+      (define-key map "\e[2;5~" [C-insert])
+      (define-key map "\e[3;5~" [C-delete])
+      (define-key map "\e[5;5~" [C-prior])
+      (define-key map "\e[6;5~" [C-next])
+
+      (define-key map "\e[2;6~" [C-S-insert])
+      (define-key map "\e[3;6~" [C-S-delete])
+      (define-key map "\e[5;6~" [C-S-prior])
+      (define-key map "\e[6;6~" [C-S-next])
+
+      (define-key map "\e[2;3~" [A-insert])
+      (define-key map "\e[3;3~" [A-delete])
+      (define-key map "\e[5;3~" [A-prior])
+      (define-key map "\e[6;3~" [A-next])
+
+      (define-key map "\eOA" [up])
+      (define-key map "\eOB" [down])
+      (define-key map "\eOC" [right])
+      (define-key map "\eOD" [left])
+      (define-key map "\eOF" [end])
+      (define-key map "\eOH" [home])
+
+      (define-key map "\eO2A" [S-up])
+      (define-key map "\eO2B" [S-down])
+      (define-key map "\eO2C" [S-right])
+      (define-key map "\eO2D" [S-left])
+      (define-key map "\eO2F" [S-end])
+      (define-key map "\eO2H" [S-home])
+
+      (define-key map "\eO5A" [C-up])
+      (define-key map "\eO5B" [C-down])
+      (define-key map "\eO5C" [C-right])
+      (define-key map "\eO5D" [C-left])
+      (define-key map "\eO5F" [C-end])
+      (define-key map "\eO5H" [C-home])
+
+      ;; Use inheritance to let the main keymap override those defaults.
+      ;; This way we don't override terminfo-derived settings or settings
+      ;; made in the .emacs file.
+      (set-keymap-parent map (keymap-parent function-key-map))
+      (set-keymap-parent function-key-map map))
+
+    ;; Do it!
+    (xterm-register-default-colors)
+    ;; This recomputes all the default faces given the colors we've just set up.
+    (tty-set-up-initial-frame-faces)))
 
 ;; Set up colors, for those versions of xterm that support it.
 (defvar xterm-standard-colors
@@ -359,38 +375,5 @@ versions of xterm."
     ;; right colors, so clear them.
     (clear-face-cache)))
 
-;; rxvt puts the default colors into an environment variable
-;; COLORFGBG.  We use this to set the background mode in a more
-;; intelligent way than the default guesswork in startup.el.
-(defun xterm-rxvt-set-background-mode ()
-  "Set background mode as appropriate for the default rxvt colors."
-  (let ((fgbg (getenv "COLORFGBG"))
-        bg rgb)
-    (setq default-frame-background-mode 'light)
-    (when (and fgbg
-               (string-match ".*;\\([0-9][0-9]?\\)\\'" fgbg))
-      (setq bg (string-to-number (substring fgbg (match-beginning 1))))
-      ;; The next line assumes that xterm-standard-colors are ordered
-      ;; by the color index in the ascending order!
-      (setq rgb (car (cddr (nth bg xterm-standard-colors))))
-      ;; See the commentary in frame-set-background-mode about the
-      ;; computation below.
-      (if (< (apply '+ rgb)
-             ;; The following line assumes that white is the 15th
-             ;; color in xterm-standard-colors.
-             (* (apply '+ (car (cddr (nth 15 xterm-standard-colors)))) 0.6))
-          (setq default-frame-background-mode 'dark)))
-    (frame-set-background-mode (selected-frame))))
-
-;; Do it!
-(xterm-register-default-colors)
-;; If this xterm is actually a disguised rxvt, be more intelligent about
-;; determining the background mode.
-(and (getenv "COLORTERM")
-     (string-match "\\`rxvt" (getenv "COLORTERM"))
-     (xterm-rxvt-set-background-mode))
-;; This recomputes all the default faces given the colors we've just set up.
-(tty-set-up-initial-frame-faces)
-
 ;; arch-tag: 12e7ebdd-1e6c-4b25-b0f9-35ace25e855a
 ;;; xterm.el ends here
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 309edde1749..c8991c07e54 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -159,7 +159,7 @@ This might return nil if the event did not occur over a buffer."
 With ARG, turn tooltip mode on if and only if ARG is positive."
   :global t
   :init-value (not (or noninteractive
-                       emacs-quick-startup
+                       emacs-basic-display
                        (not (display-graphic-p))
                        (not (fboundp 'x-show-tip))))
   :initialize 'custom-initialize-safe-default