Merge from emacs--devo--0

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

16 files changed, 368 insertions, 38 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 56693064c98..ab485360138 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -43,4 +43,322 @@ FRAME_WINDOW_P	A GUI frame (like X, w32, etc.)
 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.  ** 
+
+ABORT_RETURN_TYPE
+ADDR_CORRECT
+ADJUST_EXEC_HEADER
+ADJUST_TEXTBASE
+ADJUST_TEXT_SCNHDR_SIZE
+A_TEXT_OFFSET
+A_TEXT_SEEK
+BAUD_CONVERT
+BROKEN_FIONREAD
+BROKEN_SELECT_NON_X
+BROKEN_SIGIO
+BROKEN_START
+BROKEN_TIOCGETC
+BROKEN_TIOCGWINSZ
+BSD4_2
+BSD4_3
+BSD4_4
+BSD_PGRPS
+BSD_SYSTEM
+BSTRING
+CANNOT_DUMP
+CLASH_DETECTION
+COFF
+COFF_BSD_SYMBOLS
+COFF_ENCAPSULATE
+CRT0_COMPILE
+CRT0_DUMMIES
+C_DEBUG_SWITCH
+C_OPTIMIZE_SWITCH
+C_SWITCH_ASM
+C_SWITCH_MACHINE
+C_SWITCH_SYSTEM
+DATA_END
+DATA_SECTION_ALIGNMENT
+DATA_SEG_BITS
+DATA_START
+DEBUG
+DECLARE_GETPWUID_WITH_UID_T
+DEFAULT_ENTRY_ADDRESS
+DONT_NEED_ENVIRON
+DOT_GLOBAL_START
+DUMMIES
+EEOF
+ELF
+ERROR0
+ERROR1
+ERROR2
+EXEC_HDR_TYPE
+EXEC_MAGIC
+EXEC_PAGESIZE
+EXPLICIT_SIGN_EXTEND
+EXTRA_INITIALIZE
+FIRST_PTY_LETTER
+FREE_RETURN_TYPE
+FSCALE
+F_SETOWN_BUG
+GC_MARK_STACK
+GC_SETJMP_WORKS
+GETPGRP_NO_ARG
+GNU_MALLOC
+HAVE_ALLOCA
+HAVE_BROKEN_INET_ADDR
+HAVE_CLOSEDIR
+HAVE_CONFIG_H
+HAVE_CRTN
+HAVE_GETTIMEOFDAY
+HAVE_INET_SOCKETS
+HAVE_LIBDNET
+HAVE_LIBINTL
+HAVE_LIBRESOLV
+HAVE_PTYS
+HAVE_SELECT
+HAVE_SOCKETS
+HAVE_SYSVIPC
+HAVE_SYSV_SIGPAUSE
+HAVE_SYS_WAIT_H
+HAVE_TCATTR
+HAVE_TERMIO
+HAVE_TERMIOS
+HAVE_TEXT_START
+HAVE_UNION_WAIT
+HAVE_UNISTD_H
+HAVE_UNIX_DOMAIN
+HAVE_UTIMES
+HAVE_WAIT_HEADER
+HAVE_X11R6
+HAVE_XFREE386
+HAVE_XSCREENNUMBEROFSCREEN
+HAVE_X_WINDOWS
+HEADER_INCL_IN_TEXT
+IBMAIX
+INHIBIT_X11R6_XIM
+INIT_BAUD_RATE
+INTEL386
+INTERRUPT_INPUT
+IN_UNEXEC
+IRIS
+IRIS_4D
+IRIX6_5
+IRIX_FORCE_32_BITS
+ISC4_0
+ISI68K
+KEEP_OLD_PADDR
+KEEP_OLD_TEXT_SCNPTR
+KERNEL_FILE
+LDAV_SYMBOL
+LD_SWITCH_MACHINE
+LD_SWITCH_SYSTEM
+LD_SWITCH_SYSTEM_TEMACS
+LD_TEXT_START_ADDR
+LIBS_DEBUG
+LIBS_MACHINE
+LIBS_SYSTEM
+LIBS_TERMCAP
+LIBX11_MACHINE
+LIBX11_SYSTEM
+LIBXMU
+LIB_GCC
+LIB_MOTIF
+LIB_STANDARD
+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
+NEED_SIOCTL
+NEW_PROGRAM_H
+NEW_SECTION_H
+NLIST_NAME_UNION
+NLIST_STRUCT
+NOMULTIPLEJOBS
+NONSYSTEM_DIR_LIBRARY
+NOT_C_CODE
+NO_ARG_ARRAY
+NO_GET_LOAD_AVG
+NO_MODE_T
+NO_PTY_H
+NO_REMAP
+NO_SIOCTL_H
+NO_SOCKETS_IN_FILE_SYSTEM
+NO_TERMIO
+NO_UNION_TYPE
+NSIG
+NSIG_MINIMUM
+OBJECTS_MACHINE
+OLDXMENU_OPTIONS
+OLD_PROGRAM_H
+OLD_SECTION_H
+ORDINARY_LINK
+OSF1
+O_NDELAY
+PATCH_INDEX
+PENDING_OUTPUT_COUNT
+PERROR
+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
+SEGMENT_MASK
+SEGSIZ
+SETUP_SLAVE_PTY
+SHORTNAMES
+SHORT_CAST_BUG
+SIGMASKTYPE
+SIGNALS_VIA_CHARACTERS
+SIGN_EXTEND_CHAR
+SIGTYPE
+SIG_BLOCK
+SKTPAIR
+SMAIL
+START_FILES
+SUNOS4
+SUNOS4_SHARED_LIBRARIES
+SUNOS_LOCALTIME_BUG
+SVR4
+SWITCH_ENUM_BUG
+SYMS_START
+SYSTEM_MALLOC
+SYSTEM_TYPE
+SYSV_PTYS
+SYSV_SYSTEM_DIR
+S_IEXEC
+S_IFDIR
+S_IFLNK
+S_IFMT
+S_IREAD
+S_IWRITE
+TAHOE_REGISTER_BUG
+TERMCAP
+TERMINFO
+TEXT_END
+TEXT_START
+TEXT_START_ADDR
+THIS_IS_MAKEFILE
+TPIX
+ULIMIT_BREAK_VALUE
+UMAX
+UMAX4_2
+UNEXEC
+USE_DL_STUBS
+USE_GETOBAUD
+USE_MMAP_FOR_BUFFERS
+USE_NONANSI_DEFUN
+USG
+USG5
+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
+_longjmp
+_setjmp
+_sobuf
+aix386
+alloca
+amdahl_uts
+aouthdr
+celerity
+clipper
+convex
+data_start
+drem
+dsize
+elxsi
+emacs
+entry
+etext
+fatal
+fchmod
+getpgrp
+ghs
+hp9000s800
+index
+internal_with_output_to_temp_buffer
+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/ChangeLog b/admin/ChangeLog
index 516cecfbb6d..9dff071be3d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-08  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): Add doc/man/emacs.1.
+
+2008-01-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * notes/copyright:
+        * MAINTAINERS: Remove references to files that have been removed.
+
+2008-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-copyright): Add lib-src/ebrowse.c.
+
 2007-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * CPP-DEFINES: New file.
@@ -15,9 +28,8 @@
 
 2007-12-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
-        * FOR-RELEASE: Remove Gnus send mail problem.  Other Gnus bugs
-        have been fixed in Gnus CVS but have not yet been synched to
-        Emacs.
+        * FOR-RELEASE: Remove Gnus send mail problem.  Other Gnus bugs have
+        been fixed in Gnus CVS but have not yet been synched to Emacs.
 
 2007-11-17  Glenn Morris  <rgm@gnu.org>
 
@@ -213,7 +225,7 @@
 
 2005-08-31  Romain Francoise  <romain@orebokech.com>
 
-        * FOR-RELEASE: (New features): Remove vhdl-mode.el update
+        * FOR-RELEASE (New features): Remove vhdl-mode.el update
         item (Done).
 
 2005-08-27  Romain Francoise  <romain@orebokech.com>
@@ -369,7 +381,7 @@
         * admin.el (add-release-logs): Expand the directory name before
         calling find(1).
         (add-release-logs): Use the same methods as add-log.el for writing
-        the date and the user's name and address
+        the date and the user's name and address.
 
 2003-01-07  Miles Bader  <miles@gnu.org>
 
@@ -472,7 +484,7 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-      2007  Free Software Foundation, Inc.
+      2007, 2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 1d5cfc9ddf0..0aa75f301a8 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -113,6 +113,13 @@ 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
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index f14bc2068db..805b19a6b7d 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -143,7 +143,6 @@ src/cmds.c
 src/coding.c
 src/composite.c
 src/config.in
-src/cxux-crt0.s
 src/data.c
 src/dispnew.c
 src/doc.c
@@ -196,15 +195,11 @@ src/tparam.c
 src/undo.c
 src/unexaix.c
 src/unexalpha.c
-src/unexapollo.c
-src/unexconvex.c
 src/unexec.c
 src/unexelf.c
-src/unexenix.c
 src/unexhp9k800.c
 src/unexmips.c
 src/unexnext.c
-src/unexsni.c
 src/unexsunos4.c
 src/unexw32.c
 src/vm-limit.c
diff --git a/admin/README b/admin/README
index 888c3cc242b..4dd14b335a3 100644
--- a/admin/README
+++ b/admin/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
diff --git a/admin/admin.el b/admin/admin.el
index a490442a44b..05cd7f94467 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -78,6 +78,10 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "doc/lispref/elisp.texi" version
                        (rx (and "EMACSVER" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "doc/man/emacs.1" version
+                       (rx (and ".TH EMACS" (1+ not-newline)
+                                "GNU Emacs" (1+ space)
+                                (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "lib-src/makefile.w32-in" version
                        (rx (and "VERSION" (0+ space) "=" (0+ space)
                                 (submatch (1+ (in "0-9."))))))
@@ -148,6 +152,7 @@ Root must be the root of an Emacs source tree."
                 "/* development, alpha, beta, or final (release) */"))))))
 
 ;; Note this makes some assumptions about form of short copyright.
+;; FIXME add the \year in the refcards/*.tex files.
 (defun set-copyright (root copyright)
   "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
@@ -162,6 +167,9 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "lisp/version.el" copyright
                        (rx (and "emacs-copyright" (0+ space)
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
+  (set-version-in-file root "lib-src/ebrowse.c" copyright
+                       (rx (and "emacs_copyright" (0+ (not (in ?\")))
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/etags.c" copyright
                        (rx (and "emacs_copyright" (0+ (not (in ?\")))
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 22447643e5e..b0d4893181c 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,5 +1,5 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/admin/build-configs b/admin/build-configs
index f36a05ca701..66c4f4d71b9 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index ac0c7b37909..96fae1f70e4 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 18d95451751..0d142768bfc 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/make-announcement b/admin/make-announcement
index 1c7b4574fea..b98dce5030d 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ##   Free Software Foundation, Inc.
 
 ## Author: Francesco Potorti` <pot@gnu.org>
diff --git a/admin/make-emacs b/admin/make-emacs
index 94bf2092a8b..f54bc481cfa 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 4ab01feeae3..975caef3b30 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -405,7 +405,7 @@ lisp/term/README
 
   Accordingly, FSF copyright was added.
 
-src/unexhp9k800.c  (and dependent src/m/sr2k.h)
+src/unexhp9k800.c
   http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
   - briefly removed due to legal uncertainly Jan-Mar 2007. The
   relevant assignment is under "hp9k800" in copyright.list. File was
@@ -480,7 +480,7 @@ says it is obsolete:
 
 src/m/mips4.h, news-risc.h, pmax.h
 src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
-isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, usg5-4-2.h
+netbsd.h, sol2-3.h, usg5-4-2.h
   - all these (not obviously trivial) files were missing copyrights
   till Feb 2007, when FSF copyright was added. Matt Norwood advised:
 
@@ -515,16 +515,6 @@ pmax.h
   I would say started non-trivial (1993, jimb, heavily based
   on irix4-0.h). A few borderline non-tiny changes since.
 
-? isc2-2.h
- started trivial. 2 non-tiny change, in 1993. looks to
- be made up of several small tweaks from various sources. maybe
- non-tiny total changes from Karl Berry (no emacs assignment).
-
-osf1.h
-  started trivial. grown in tiny changes (one borderline tiny change
-  by fx in 2000, but most code was later removed). non-tiny addition
-  in 2002 from m/alpha.h, but that was and is copyright FSF.
-
 usg5-4-2.h
  started non-trivial, but was heavily based on usg5-4.h, which was and is
  copyright FSF. only tiny changes since installed.
@@ -533,7 +523,7 @@ sol2-3.h
  started trivial. only non-tiny change (1994) incorporated code from
  usg5-4.h, which was and is copyright FSF.
 
-aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h, sunos4-0.h
+aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h
   started trivial, grown in tiny changes.
 
 netbsd.h:
@@ -548,8 +538,8 @@ Someone might want to tweak the copyright years (for dates before
 Note: erring on the side of caution, I also added notices to some
 files I thought might be considered non-trivial (if one includes
 comment) in s/:
-  aix4-1.h hiuxmpp.h hiuxwe2.h hpux10.h irix6-0.h irix6-5.h isc3-0.h
-  ptx4.h sol2.h sunos4-0.h
+  aix4-1.h hpux10.h irix6-0.h irix6-5.h
+  ptx4.h sol2.h 
 
 (everything with > 30 non-blank lines, which at least is _some_ kind of
 system)
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index db9446db36e..4cd1da6c316 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -1,6 +1,6 @@
 @echo off

 

-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007

+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

 rem   Free Software Foundation, Inc.

 rem

 rem Cannot use brackets in andrewi's email below because

diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index e451cfcb2aa..e4e77a14f2c 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ##   Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
diff --git a/admin/revdiff b/admin/revdiff
index d9ea41782ba..9e47a1eba2c 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.