Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

5 files changed, 41 insertions, 72 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index ab485360138..b2c11459c85 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -3,10 +3,9 @@ of their use.  Feel free to add more macros and more categories.
 
 ** Distinguishing OSes **
 
-MAC_OS		Compiling for some version of Mac OS?
-MAC_OS8		Compiling for Mac OS version 8.  Requires MAC_OS?
-MAC_OSX		Compiling for Mac OS X?  Is that also valid for Darwin?
-MAC_OS_X	??  Apparently only used once in mac.c.
+MAC_OS		Compiling for the `mac' window-system.
+MAC_OS8		Compiling for Mac OS Classic (v8 or v9).
+MAC_OSX		Compiling for Mac OS X.  Not bare Darwin.
 CYGWIN		Compiling the Cygwin port.
 __CYGWIN__	Ditto
 MSDOS		Compiling the MS-DOS port.
@@ -44,25 +43,9 @@ REL_ALLOC	Compile in the relocatable memory allocator ralloc.c.
 SYSTEM_MALLOC	Use the system library's malloc.
 
 ** All references to these symbols should be removed, all their definitions are gone **
-ALLIANT
-ALLIANT_2800
-ALTOS
-APOLLO
-APOLLO_SR10
-RTU
-STRIDE
-UNIPLUS
-GOULD
+
 NU
-pyramid
-sps7
-tahoe
-tek4300
-__DGUX
-DGUX
 romp
-ibmrt 
-NEWSOS5
 
 ** Temporarily put defines from removed files here, check if these macros need to be documented or removed because they are not used anymore.  ** 
 
@@ -77,7 +60,6 @@ BAUD_CONVERT
 BROKEN_FIONREAD
 BROKEN_SELECT_NON_X
 BROKEN_SIGIO
-BROKEN_START
 BROKEN_TIOCGETC
 BROKEN_TIOCGWINSZ
 BSD4_2
@@ -110,9 +92,6 @@ DOT_GLOBAL_START
 DUMMIES
 EEOF
 ELF
-ERROR0
-ERROR1
-ERROR2
 EXEC_HDR_TYPE
 EXEC_MAGIC
 EXEC_PAGESIZE
@@ -122,6 +101,7 @@ FIRST_PTY_LETTER
 FREE_RETURN_TYPE
 FSCALE
 F_SETOWN_BUG
+F_SETOWN_SOCK_NEG
 GC_MARK_STACK
 GC_SETJMP_WORKS
 GETPGRP_NO_ARG
@@ -166,8 +146,6 @@ IRIS
 IRIS_4D
 IRIX6_5
 IRIX_FORCE_32_BITS
-ISC4_0
-ISI68K
 KEEP_OLD_PADDR
 KEEP_OLD_TEXT_SCNPTR
 KERNEL_FILE
@@ -190,19 +168,15 @@ LIB_X11_LIB
 LINKER
 LOAD_AVE_CVT
 LOAD_AVE_TYPE
-LONG_ALIGN
 L_SET
 MAIL_PROGRAM_NAME
 MAIL_USE_FLOCK
-MAKE_PARALLEL
 MAXNAMLEN
 MEMMOVE_MISSING
 MEMORY_IN_STRING_H
 MKDIR_PROTOTYPE
 MOTIF
-M_TERMINFO
 NARROWPROTO
-NBPC
 NEED_ERRNO
 NEED_NET_ERRNO_H
 NEED_PTEM_H
@@ -221,14 +195,13 @@ NO_PTY_H
 NO_REMAP
 NO_SIOCTL_H
 NO_SOCKETS_IN_FILE_SYSTEM
+NO_SOCK_SIGIO
 NO_TERMIO
 NO_UNION_TYPE
+NO_UNION_TYPE
 NSIG
 NSIG_MINIMUM
 OBJECTS_MACHINE
-OLDXMENU_OPTIONS
-OLD_PROGRAM_H
-OLD_SECTION_H
 ORDINARY_LINK
 OSF1
 O_NDELAY
@@ -239,16 +212,12 @@ PNTR_COMPARISON_TYPE
 POSIX_SIGNALS
 PREFER_VSUSP
 PTY_ITERATION
-PTY_MAJOR
-PTY_MINOR
 PTY_NAME_SPRINTF
 PTY_OPEN
 PTY_TTY_NAME_SPRINTF
 PURESIZE
 READ
 REL_ALLOC
-RISCiX
-RISCiX_1_1
 RUN_TIME_REMAP
 SECTION_ALIGNMENT
 SEEK
@@ -266,7 +235,6 @@ SKTPAIR
 SMAIL
 START_FILES
 SUNOS4
-SUNOS4_SHARED_LIBRARIES
 SUNOS_LOCALTIME_BUG
 SVR4
 SWITCH_ENUM_BUG
@@ -281,7 +249,6 @@ S_IFLNK
 S_IFMT
 S_IREAD
 S_IWRITE
-TAHOE_REGISTER_BUG
 TERMCAP
 TERMINFO
 TEXT_END
@@ -290,8 +257,6 @@ TEXT_START_ADDR
 THIS_IS_MAKEFILE
 TPIX
 ULIMIT_BREAK_VALUE
-UMAX
-UMAX4_2
 UNEXEC
 USE_DL_STUBS
 USE_GETOBAUD
@@ -303,20 +268,17 @@ USG5_3
 USG5_4
 USG_JOBCTRL
 USG_SHARED_LIBRARIES
-V3x
 VIRT_ADDR_VARIES
 WORDS_BIG_ENDIAN
 WORD_MACHINE
 WRITE
 X11R4
-XENIX
 XICCC
 XINT
 XSET
 XUINT
 X_DEFAULT_FONT
 _ABIN32
-_CX_UX
 _MIPS_SZLONG
 _POSIX_SOURCE
 __main
@@ -325,15 +287,10 @@ _setjmp
 _sobuf
 aix386
 alloca
-amdahl_uts
 aouthdr
-celerity
-clipper
-convex
 data_start
 drem
 dsize
-elxsi
 emacs
 entry
 etext
@@ -348,17 +305,12 @@ jmp_buf
 longjmp
 m68000
 m68k
-m88k
 magic
 mc68000
 mips
-orion
 sel
 subprocesses
 sun
-sun_68881
-sun_fpa
-sun_soft
 text_start
 
 # arch-tag: bc80061a-1168-4911-9766-46aaf2640250
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 0aa75f301a8..25d0483e09a 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -96,29 +96,23 @@ minimized.  I don't know what is left to do here.
 
 ** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect
 
-** Stephen.Berman@gmx.net: minibuffer and current-local-map
-
 ** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround
 
-** Get rid of old-style backquotes in cc-vars.el.
-ttn has a patch:
-http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
-
-** Fix or document the shortcoming of easymenu and :suffix.
-http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
-
 ** Fix problem with mode-name in SGML mode.
 If mode-name stays non-string, add NEWS entry and doc fix.
 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html
 
-** pot@gnu.org, 17 Dec: strange From line maker rmail-reply loop
-
 ** multi-tty does not work correctly.
 If the server is started from a tty frame and emacsclient creates an
 X11 frame, the tty frame gets confused, it thinks it is an X11 frame
 when trying to do a C-z.  This worked with server.el version 1.136, it
 broke after that.
 http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg00545.html
+Also emacsclient does not work on Windows, it also worked with
+server.el version 1.136.
+http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00710.html
+
+
 
 * DOCUMENTATION
 
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 9a202d62f85..a5be0ca1d6f 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -21,8 +21,8 @@ For each step, check for possible errors.
 
 5.   rm configure; make bootstrap
 
-6.  Commit configure, README, etc/AUTHORS, lisp/finder-inf.el,
-    lisp/version.el, man/emacs.texi, lispref/elisp.texi,
+6.  Commit configure, README, doc/emacs/emacs.texi,
+    doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,    
     mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
     mac/src/Emacs.r, nt/emacs.rc.  Copy lisp/loaddefs.el to
     lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.  For a release,
@@ -73,9 +73,9 @@ For each step, check for possible errors.
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
-    tell him to announce it using the announcement you prepared.  Remind
-    him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
+14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new
+    pretest and tell him to announce it using the announcement you prepared.
+    Remind him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
 
 15. Shortly before the release, cut the branch with the following commands:
 
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
index f5254d7a956..9246f1dc8c2 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -1,5 +1,7 @@
 Some lisp/emacs-lisp/ Features and Where They Are Documented
-Copyright (C) 2007 Free Software Foundation, Inc.
+
+Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
 
 * Status Key
@@ -102,6 +104,24 @@ Copyright (C) 2007 Free Software Foundation, Inc.
 
 
 * Etc
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
   Local variables:
   mode: outline
   End:
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 5895f59bddc..c20364ec576 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,5 +1,8 @@
 -*- coding: utf-8; mode: text; -*-
 
+Copyright (C) 2007, 2008  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 From README.multi-tty in the multi-tty branch.
 Some of this information may be out of date.