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

Patches applied:

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

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

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
index 533f9db,64da031..155ef1d
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -781,16 -776,15 +781,17 @@@ opening the first frame (e.g. open a co
    (custom-reevaluate-setting 'mouse-wheel-down-event)
    (custom-reevaluate-setting 'mouse-wheel-up-event)
    (custom-reevaluate-setting 'file-name-shadow-mode)
+   (custom-reevaluate-setting 'send-mail-function)
  
 +  (normal-erase-is-backspace-setup-frame)
 +
    ;; Register default TTY colors for the case the terminal hasn't a
 -  ;; terminal init file.
 -  (unless (memq window-system '(x w32 mac))
 -    ;; We do this regardles of whether the terminal supports colors
 -    ;; or not, since they can switch that support on or off in
 -    ;; mid-session by setting the tty-color-mode frame parameter.
 -    (tty-register-default-colors))
 +  ;; terminal init file.  We do this regardles of whether the terminal
 +  ;; supports colors or not and regardless the current display type,
 +  ;; since users can connect to color-capable terminals and also
 +  ;; switch color support on or off in mid-session by setting the
 +  ;; tty-color-mode frame parameter.
 +  (tty-register-default-colors)
  
    ;; Record whether the tool-bar is present before the user and site
    ;; init files are processed.  frame-notice-user-settings uses this

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
index 1054b76,0e05709..4b40e5a
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -1171,11 -1163,9 +1171,11 @@@ term.o: term.c termchar.h termhooks.h t
     disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h \
     window.h keymap.h
  termcap.o: termcap.c $(config_h)
 +terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
 +   keyboard.h $(config_h)
  terminfo.o: terminfo.c $(config_h)
  tparam.o: tparam.c $(config_h)
- undo.o: undo.c buffer.h commands.h $(config_h)
+ undo.o: undo.c buffer.h commands.h window.h $(config_h)
  /* This hack is to discard any space that cpp might put at the beginning
     of UNEXEC when substituting it in.  */
  UNEXEC_ALIAS=UNEXEC

diff --cc src/fns.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keyboard.h
index 48801df,913f48e..45dbd49
--- 1/src/keyboard.h
--- 2/src/keyboard.h
+++ b/src/keyboard.h
@@@ -305,14 -298,9 +305,13 @@@ struct input_event
  extern Lisp_Object parse_modifiers P_ ((Lisp_Object));
  extern Lisp_Object reorder_modifiers P_ ((Lisp_Object));
  extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *));
 -/* User-supplied string to translate input characters through.  */
 -extern Lisp_Object Vkeyboard_translate_table;
 +
 +/* Parent keymap of terminal-local function-key-map instances.  */
 +extern Lisp_Object Vfunction_key_map;
 +
 +/* Parent keymap of terminal-local key-translation-map instances.  */
 +extern Lisp_Object Vkey_translation_map;
  
- 
  extern int parse_menu_item P_ ((Lisp_Object, int, int));
  
  extern void echo_now P_ ((void));

diff --cc src/lread.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/xfns.c
Simple merge