Changeset 4220 for trunk/admin

Timestamp:

04/04/08 22:04:40 (8 months ago)

Author:

miyoshi

Message:

Sync up with Emacs22.2.

Files:

• trunk/admin/ChangeLog (modified) (3 diffs)
• trunk/admin/FOR-RELEASE (modified) (2 diffs)
• trunk/admin/README (modified) (2 diffs)
• trunk/admin/admin.el (modified) (2 diffs)
• trunk/admin/alloc-colors.c (modified) (2 diffs)
• trunk/admin/build-configs (modified) (2 diffs)
• trunk/admin/cus-test.el (modified) (2 diffs)
• trunk/admin/diff-tar-files (modified) (2 diffs)
• trunk/admin/make-announcement (modified) (2 diffs)
• trunk/admin/make-emacs (modified) (2 diffs)
• trunk/admin/make-tarball.txt (modified) (2 diffs)
• trunk/admin/notes/copyright (modified) (2 diffs)
• trunk/admin/nt/README-UNDUMP.W32 (modified) (2 diffs)
• trunk/admin/nt/README-ftp-server (modified) (7 diffs)
• trunk/admin/nt/README.W32 (modified) (3 diffs)
• trunk/admin/nt/makedist.bat (modified) (4 diffs)
• trunk/admin/quick-install-emacs (modified) (2 diffs)
• trunk/admin/revdiff (modified) (2 diffs)

trunk/admin/ChangeLog

@@ +1 @@
+2008-03-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 22.2 released.
+
+2008-03-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * FOR-RELEASE (WINDOWS SUPPORT BUGS): Add two issues.
+
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * Relicense all FSF files to GPLv3 or later.
+
-2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
-
@@ -420 +432 @@
-
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-
+, 2008
-
-  This file is part of GNU Emacs.
@@ -426 +438 @@
-  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
-2
+3
-  any later version.
-

trunk/admin/FOR-RELEASE

@@ -1 +1 @@
-Tasks needed before the next release.
-
-* TO BE DONE SHORTLY BEFORE RELEASE
-
-** Check for widow and orphan lines in manuals;
-make sure all the pages really look ok in the manual as formatted.
-
-** Regenerate the postscript files of the reference cards in etc.
-
-** Ask maintainers of refcard translations to update them.
-
-Requests to have been sent out on 2006-05-23 (Reiner Steib).
-
-LANG    Translator            Status
-cs      Pavel Janík           Can't work on it now.
-de      Sven Joachim          Done
-fr      Eric Jacoboni         Done
-pl      Włodek Bzyl           Done
-pt-br   Rodrigo Real          Done
-ru      Alex Ott              Done
-sk      Miroslav Vaško        No response
-
-Reminders sent out on 2006-06-08.
-
-* WINDOWS SUPPORT BUGS.
@@ -28 +6 @@
-attention of Windows users to fixing them.
-
-** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind
-Windows only bug. Bug appears only when Cleartype enabled, probably related
-to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
-
-** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
-  (Did we decide that is unreproducible?)
-
+* BUGS WAITING FOR MORE USER INPUT
+
+** undefined reference getopt_long
+Report by Daniel C. Bastos <dbast0s@yahoo.com.br> on bug-gnu-emacs
+from 2007-08-27.  Impossible to procede without more input from OP (as
+of 20070912, emails are bouncing) or someone else who can reproduce this.
+http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01497.html
+
+** emacs-22.1 with GTK problems (with patches)
+Only outstanding issue seems to be whether Solaris 2.6 GTK can be
+supported in the absence of recursive mutexes, via a change to
+alloc.c, or whether configure should abort.
+http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html
+
-* BUGS
-
-FIXES FOR EMACS 22.2
+Bugs and feature requests for 22.3 or later
-
-
-
+
-
-Changes to six pbm icons in etc/images.
-
+etags support for php5
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-* DOCUMENTATION
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-

trunk/admin/README

@@ -1 @@
-
+, 2008
-  Free Software Foundation, Inc.
-See the end of the file for license conditions.
@@ -72 +72 @@
-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
-2
+3
-any later version.
-

trunk/admin/admin.el

@@ -1 +1 @@
-;;; admin.el --- utilities for Emacs administration
-
-
+, 2008
-;;   Free Software Foundation, Inc.
-
@@ -8 +8 @@
-;; 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
-2
+3
-;; any later version.
-

trunk/admin/alloc-colors.c

@@ -1 +1 @@
-/* Allocate X colors.  Used for testing with dense colormaps.
-
+, 2008
-     Free Software Foundation, Inc.
-
@@ -7 +7 @@
-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
-2
+3
-any later version.
-

trunk/admin/build-configs

@@ -1 +1 @@
-#! /usr/bin/perl
-
-
+, 2008
-#   Free Software Foundation, Inc.
-#
@@ -8 +8 @@
-# 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
-2
+3
-# any later version.
-#

trunk/admin/cus-test.el

@@ -1 +1 @@
-;;; cus-test.el --- tests for custom types and load problems
-
-
+, 2008
-;;   Free Software Foundation, Inc.
-
@@ -13 +13 @@
-;; 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
-2
+3
-;; any later version.
-

trunk/admin/diff-tar-files

@@ -1 +1 @@
-#! /bin/sh
-
-
+, 2008
-#   Free Software Foundation, Inc.
-#
@@ -8 +8 @@
-# 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
-2
+3
-# any later version.
-#

trunk/admin/make-announcement

@@ -1 +1 @@
-#! /bin/bash
-
-
+, 2008
-##   Free Software Foundation, Inc.
-
@@ -10 +10 @@
-## 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
-2
+3
-## any later version.
-

trunk/admin/make-emacs

@@ -1 +1 @@
-#! /usr/bin/perl
-
-
+, 2008
-#   Free Software Foundation, Inc.
-#
@@ -8 +8 @@
-# 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
-2
+3
-# any later version.
-#

trunk/admin/make-tarball.txt

@@ -22 +22 @@
-5.   rm configure; make bootstrap
-
-
-
-
-
-
+
+
+
+
+
+
-
-7.   make-dist --snapshot.  Check the contents of the new tar with
@@ -73 +74 @@
-    ftp://ftp.gnu.org/gnu/emacs/ for a release.
-
-
-
-
-
-
+
+
+
+
+
+
-
-# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390

trunk/admin/notes/copyright

@@ -1 @@
-
+, 2008
-See the end of the file for license conditions.
-
@@ -604 +604 @@
-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
-2
+3
-any later version.
-

trunk/admin/nt/README-UNDUMP.W32

@@ +1 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
-                           Emacs for Windows
-
@@ -35 +39 @@
-
-Enjoy!
+
+
+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.

trunk/admin/nt/README-ftp-server

@@ +1 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
-                      Precompiled Distributions of
-                           Emacs for Windows
-
-1
-
-y 22, 2007
+2
+
+rch 26, 2008
-                
-  This directory contains source and precompiled distributions for GNU
@@ -27 +31 @@
-  If you want to redistribute any of the precompiled distributions of
-  Emacs, be careful to check the implications of the GPL.  For instance,
-1
+2
-  an Internet site, you must arrange to distribute the source files of
-1
+2
-
-  Making a link to our copy of the source is NOT sufficient, since we
@@ -35 +39 @@
-  old binaries.
-
+
+* Files in this directory
+
+  + emacs-22.2-bin-i386.zip
+    Windows binaries of Emacs-22.2, with all lisp code and documentation
+    included.
+
+    Download this file if you want a single installation package, and
+    are not interested in the C source code for Emacs. After
+    unpacking, you can optionally run the file bin/addpm.exe to have
+    Emacs add icons to the Start Menu.
+
+    If you need the C source code at a later date, it will be safe to
+    unpack the source distribution on top of this installation.
+
+  + emacs-22.2-barebin-i386.zip
+    Windows binaries of Emacs-22.2, without lisp code or documentation.
+
+    Download this file if you already have the source distribution, or
+    if you need to redump the emacs.exe executable.
+
+    Unpack this over the top of either the source distribution or the
+    bin distribution above. It contains the bin subdirectory and etc/DOC
+    file, plus temacs.exe and dump.bat, which are required if you want to
+    redump emacs without recompiling it.
+
+  + libxpm-3.5.7-w32-src.zip
+    Source code required to compile libXpm-3.5.7 on Windows. Contains
+    a basic Makefile for compiling with mingw32 and a .def file for
+    generating a DLL with the appropriate exports in addition to the
+    source code to provide the subset of functionality Emacs uses from
+    libXpm. This corresponds to the libXpm.dll in emacs-22.2-bin-i386.zip
+    and emacs-22.2-barebin-i386.zip.
+
+
+    The following are provided for users who require older versions.
+
+  + emacs-22.1-bin-i386.zip
+  + emacs-22-1-barebin-i386.zip
+    Windows binaries of Emacs 22.1, contents as above.
+
+  + emacs-21.3-bin-i386.tar.gz
+    Windows binaries of Emacs 21.3, with compiled lisp code and some
+    documentation included.
+
+  + emacs-21.3-leim.tar.gz
+    Compiled lisp input methods. This optional addition to Emacs-21.3
+    is required if you want to enter languages that are not directly
+    supported by your keyboard.
+
+* Image support
+
+  Emacs 22.2 contains support for images, however for most image formats
+  supporting libraries are required.  This distribution has been tested
+  with the libraries that are distributed with GTK for Windows, and the
+  libraries found at http://gnuwin32.sourceforge.net/. The following image
+  formats are supported:
+
+      PBM/PGM/PPM: Supported natively by Emacs. This format is used for
+      the black and white versions of the toolbar icons.
+
+      XPM: a Windows port of the XPM library corresponding to the x.org
+      release of X11R7.3 is included with the binary distribution, but
+      can be replaced by other versions with the name xpm4.dll,
+      libxpm-nox4.dll or libxpm.dll.
+
+      PNG: requires the PNG reference library 1.2 or later, which will
+      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
+      or libpng.dll. LibPNG requires zlib, which should come from the same
+      source as you got libpng.
+
+      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
+
+      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
+      or libtiff.dll.
+
+      GIF: requires libungif or giflib 4.1 or later, which will be
+      called giflib4.dll, libungif4.dll or libungif.dll.
-
-* Distributions in .tar.gz and .zip format
@@ -47 +130 @@
-  latest versions of Windows support these natively, the Windows binaries
-  of Emacs are now distributed as .zip files.
-  Here are the combinations (i386 in the name indicates a zipfile contains
-  executables compiled for Intel-compatible x86 systems):
-
-  + Primary precompiled distribution, including lisp source:
-
-      emacs-22.1-bin-i386.zip
-
-  NB. If you just want to run Emacs, get one of the distributions above.
-
-  + Bare executables, useful if you want to get the complete source
-    release, but can't compile Emacs yourself:
-
-      emacs-22.1-barebin-i386.zip  (requires ../emacs-22.1.tar.gz)
-
-  + The complete official source for Emacs:
-
-      ../emacs-22.1.tar.gz
-
-* Distributions for non-x86 platforms
@@ -109 +175 @@
-  djtarnt: simply type return to continue (this is harmless).
-
-The precompiled binari
+Zip fil
-  if you do not already have other tools to do this.
-
@@ -166 +232 @@
-
-  This document serves as an FAQ and a source for further information
-
+
+
+
+
-
-  In addition to the FAQ, there is a mailing list for discussing issues
@@ -201 +270 @@
-  Most of this README was contributed by former maintainer Andrew Innes
-  (andrewi@gnu.org)
+
+
+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.

trunk/admin/nt/README.W32

@@ +1 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
-                           Emacs for Windows
-
@@ -64 +68 @@
-  (non-windowed) mode of operation is most useful if you have a telnet
-  server on your machine, allowing you to run Emacs remotely.
+
+* EXE files included
+
+  Emacs comes with the following executable files in the bin directory.
+
+  + emacs.exe - The main Emacs executable. As this is designed to run
+    as both a text-mode application (emacs -nw) and as a GUI application,
+    it will pop up a command prompt window if run directly from Explorer.
+
+  + runemacs.exe - A wrapper for running Emacs as a GUI application
+    without popping up a command prompt window.
+
+  + emacsclient.exe - A command-line client program that can
+    communicate with a running Emacs process. See the `Emacs Server'
+    node of the Emacs manul.
+
+  + emacsclientw.exe - A version of emacsclient that does not open
+    a command-line window.
+
+  + addpm.exe - A basic installer that creates Start Menu icons for Emacs.
+    Running this is optional.
+
+  + cmdproxy.exe - Used internally by Emacs to work around problems with
+    the native shells in various versions of Windows.
+
+  + ctags.exe, etags.exe - Tools for generating tag files.  See the
+  `Tags' node of the Emacs manual.
+
+  + ebrowse.exe - A tool for generating C++ browse information.  See the
+    `Ebrowse' manual.
+
+  + ddeclient.exe - A tool for interacting with DDE servers.
+
+  + hexl.exe - A tool for converting files to hex dumps.  See the
+    `Editing Binary Files' node of the Emacs manual.
+
+  + movemail.exe - A helper application for safely moving mail from
+    a mail spool or POP server to a local user mailbox.  See the
+    `Movemail' node of the Emacs manual.
+
+  + digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
+  built-in documentation.
+
+* Image support
+
+  Emacs has built in support for XBM and PPM/PGM/PBM images, and the
+  libXpm library is bundled, providing XPM support (required for color
+  toolbar icons and splash screen). Source for libXpm should be available
+  on the same place as you got this binary distribution from. The version
+  of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
+  libXpm library from X11R7.3.
+
+  Emacs can also support some other image formats with appropriate
+  libraries. These libraries are all available as part of GTK, or from
+  gnuwin32.sourceforge.net. Emacs will find them if the directory they
+  are installed in is on the PATH.
+
+      PNG: requires the PNG reference library 1.2 or later, which will
+      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
+      or libpng.dll. LibPNG requires zlib, which should come from the same
+      source as you got libpng.
+
+      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
+
+      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
+      or libtiff.dll.
+
+      GIF: requires libungif or giflib 4.1 or later, which will be
+      called giflib4.dll, libungif4.dll or libungif.dll.
+
-
-* Uninstalling Emacs
@@ -186 +261 @@
-
-  Enjoy!
+
+
+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.

trunk/admin/nt/makedist.bat

@@ -1 +1 @@
-@echo off
-
-
+, 2008
-rem   Free Software Foundation, Inc.
-rem
@@ -13 +13 @@
-rem GNU Emacs is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-2
+3
-rem any later version.
-rem
@@ -36 +36 @@
-rem It always writes to zip.zip and treats the zipfile argument as one
-rem of the files to go in it.
-README emacs-%1/README.W32
-README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim 
+COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL
+COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
-del emacs-%1\README.W32
-if not (%4) == () goto end
@@ -50 +50 @@
-rem It always writes to zip.zip and treats the zipfile argument as one
-rem of the files to go in it.
-
-
+ emacs-%1/COPYING
+ emacs-%1/COPYING
-del emacs-%1\README.W32
-if not (%4) == () goto end

trunk/admin/quick-install-emacs

@@ -2 +2 @@
-### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
-
-
+, 2008
-##   Free Software Foundation, Inc.
-
@@ -11 +11 @@
-## 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
-2
+3
-## any later version.
-

trunk/admin/revdiff

@@ -1 +1 @@
-#! /usr/bin/perl
-
-
+, 2008
-#   Free Software Foundation, Inc.
-#
@@ -8 +8 @@
-# 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
-2
+3
-# any later version.
-#