Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-216
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-217
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-218
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-219
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-220
   Improve tq.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-221
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-222
   Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * emacs@sv.gnu.org/emacs--devo--0--patch-223
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-224
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-225
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-226
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-227
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-228
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-229
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-230
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-231
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-232
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-233
   Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-84
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-85
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-86
   Update from CVS

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

diff --cc lisp/env.el
index 22a86f13f3d7fe85ab46bf5636b70985271d6cbb,1b6c038cbea8eed6ac6a4e533d3978198b8b0b74..66d505ee0111dc5bb4e2d0c7c5ab13afb8c06c3c
--- 1/lisp/env.el
--- 2/lisp/env.el
+++ b/lisp/env.el
@@@ -92,36 -88,26 +92,38 @@@ Use `$$' to insert a single dollar sign
                   start (+ (match-beginning 0) 1)))))
      string))
  
 -;; Fixme: Should `process-environment' be recoded if LC_CTYPE &c is set?
 +;; Fixme: Should the environment be recoded if LC_CTYPE &c is set?
  
- (defun setenv (variable &optional value unset substitute-env-vars frame)
 -(defun setenv (variable &optional value substitute-env-vars)
++(defun setenv (variable &optional value substitute-env-vars frame)
    "Set the value of the environment variable named VARIABLE to VALUE.
  VARIABLE should be a string.  VALUE is optional; if not provided or
  nil, the environment variable VARIABLE will be removed.
- UNSET if non-nil means to remove VARIABLE from the environment.
- SUBSTITUTE-ENV-VARS, if non-nil, means to substitute environment
- variables in VALUE with `substitute-env-vars', where see.
- Value is the new value if VARIABLE, or nil if removed from the
- environment.
  
 -Interactively, a prefix argument means to unset the variable.
 -Interactively, the current value (if any) of the variable
 -appears at the front of the history list when you type in the new value.
 -Interactively, always replace environment variables in the new value.
 +Interactively, a prefix argument means to unset the variable, and
 +otherwise the current value (if any) of the variable appears at
 +the front of the history list when you type in the new value.
 +This function always replaces environment variables in the new
 +value when called interactively.
 +
 +If VARIABLE is set in `process-environment', then this function
 +modifies its value there.  Otherwise, this function works by
 +modifying either `global-environment' or the environment
 +belonging to the selected frame, depending on the value of
 +`local-environment-variables'.
  
 -This function works by modifying `process-environment'.
+ SUBSTITUTE-ENV-VARS, if non-nil, means to substitute environment
+ variables in VALUE with `substitute-env-vars', which see.
+ This is normally used only for interactive calls.
+ 
+ The return value is the new value of VARIABLE, or nil if
+ it was removed from the environment.
+ 
 +If optional parameter FRAME is non-nil, then it should be a a
 +frame.  If the specified frame has its own set of environment
 +variables, this function will modify VARIABLE in it.  Note that
 +frames on the same terminal device usually share their
 +environment, so calling `setenv' on one of them affects the
 +others as well.
  
  As a special case, setting variable `TZ' calls `set-time-zone-rule' as
  a side-effect."

diff --cc lisp/files.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
index 468b699fb0634f70a206a8630ed81b7db13d948a,4cf2a4fd5395cfafa86fac824919691c7f64daa6..0df41a0d1f4bf14d8697dea471dfd654ec9d53df
--- 1/src/lisp.h
--- 2/src/lisp.h
+++ b/src/lisp.h
@@@ -3206,10 -3198,7 +3206,10 @@@ extern void syms_of_dired P_ ((void))
  extern void syms_of_term P_ ((void));
  extern void fatal () NO_RETURN;
  
- #ifdef HAVE_X_WINDOWS
 +/* Defined in terminal.c */
 +extern void syms_of_terminal P_ ((void));
 +
+ #ifdef HAVE_WINDOW_SYSTEM
  /* Defined in fontset.c */
  extern void syms_of_fontset P_ ((void));
  EXFUN (Fset_fontset_font, 4);

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/puresize.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xmenu.c
Simple merge