Merge from trunk

8 files changed, 509 insertions, 219 deletions

diff --git a/etc/BABYL b/etc/BABYL
deleted file mode 100644
index 441d6771697..00000000000
--- a/etc/BABYL
+++ /dev/null
@@ -1,179 +0,0 @@
-Format of Version 5 Babyl Files:
-
-(Babyl was the storage format used by Rmail before Emacs 23.1.
-Since then it uses mbox format.)
-
-Warning:
-
-    This was written Tuesday, 12 April 1983 (by Eugene Ciccarelli),
-based on looking at a particular Babyl file and recalling various
-issues.  Therefore it is not guaranteed to be complete, but it is a
-start, and I will try to point the reader to various Babyl functions
-that will serve to clarify certain format questions.
-
-    Also note that this file will not contain control-characters,
-but instead have two-character sequences starting with Uparrow.
-Unless otherwise stated, an Uparrow <character> is to be read as
-Control-<character>, e.g. ^L is a Control-L.
-
-Versions:
-
-    First, note that each Babyl file contains in its BABYL OPTIONS
-section the version for the Babyl file format.  In principle, the
-format can be changed in any way as long as we increment the format
-version number; then programs can support both old and new formats.
-
-    In practice, version 5 is the only format version used, and the
-previous versions have been obsolete for so long that Emacs does not
-support them.
-
-
-Overall Babyl File Structure:
-
-    A Babyl file consists of a BABYL OPTIONS section followed by
-0 or more message sections.  The BABYL OPTIONS section starts
-with the line "BABYL OPTIONS:".  Message sections start with
-Control-Underscore Control-L Newline.  Each section ends
-with a Control-Underscore.  (That is also the first character
-of the starter for the next section, if any.)  Thus, a three
-message Babyl file looks like:
-
-BABYL OPTIONS:
-...the stuff within the Babyl Options section...
-^_^L
-...the stuff within the 1st message section...
-^_^L
-...the stuff within the 2nd message section...
-^_^L
-...the stuff within the last message section...
-^_
-
-    Babyl is tolerant about some whitespace at the end of the
-file -- the file may end with the final ^_ or it may have some
-whitespace, e.g. a newline, after it.
-
-
-The BABYL OPTIONS Section:
-
-    Each Babyl option is specified on one line (thus restricting
-string values these options can currently have).  Values are
-either numbers or strings.  The format is name, colon, and the
-value, with whitespace after the colon ignored, e.g.:
-
-Mail: ~/special-inbox
-
-    Unrecognized options are ignored.
-
-    Here are those options and the kind of values currently expected:
-
-    MAIL                Filename, the input mail file for this
-                        Babyl file.  You may also use several file names
-                        separated by commas.
-    Version             Number.  This should always be 5.
-    Labels              String, list of labels, separated by commas.
-
-
-Message Sections:
-
-    A message section contains one message and information
-associated with it.  The first line is the "status line", which
-contains a bit (0 or 1 character) saying whether the message has
-been reformed yet, and a list of the labels attached to this
-message.  Certain labels, called basic labels, are built into
-Babyl in a fundamental way, and are separated in the status line
-for convenience of operation.  For example, consider the status
-line:
-
-1, answered,, zval, bug,
-
-    The 1 means this message has been reformed.  This message is
-labeled "answered", "zval", and "bug".  The first, "answered", is
-a basic label, and the other two are user labels.  The basic
-labels come before the double-comma in the line.  Each label is
-preceded by ", " and followed by ",".  (The last basic label is
-in fact followed by ",,".)  If this message had no labels at all,
-it would look like:
-
-1,,
-
-    Or, if it had two basic labels, "answered" and "deleted", it
-would look like:
-
-1, answered, deleted,, zval, bug,
-
-    The & Label Babyl Message knows which are the basic labels.
-Currently they are:  deleted, unseen, recent, and answered.
-
-    After the status line comes the original header if any.
-Following that is the EOOH line, which contains exactly the
-characters "*** EOOH ***" (which stands for "end of original
-header").  Note that the original header, if a network format
-header, includes the trailing newline.  And finally, following the
-EOOH line is the visible message, header and text.  For example,
-here is a complete message section, starting with the message
-starter, and ending with the terminator:
-
-^_^L
-1,, wordab, eccmacs,
-Date: 11 May 1982 21:40-EDT
-From: Eugene C. Ciccarelli <ECC at MIT-AI>
-Subject: notes
-To: ECC at MIT-AI
-
-*** EOOH ***
-Date: Tuesday, 11 May 1982  21:40-EDT
-From: Eugene C. Ciccarelli <ECC>
-To:   ECC
-Re:   notes
-
-Remember to pickup check at cashier's office, and deposit it
-soon.  Pay rent.
-^_
-
-;;; Babyl File BNF:
-
-;;; Overall Babyl file structure:
-
-
-Babyl-File      ::= Babyl-Options-Section  (Message-Section)*
-
-
-;;; Babyl Options section:
-
-
-Babyl-Options-Section
-                ::= "BABYL OPTIONS:" newline (Babyl-Option)* Terminator
-
-Babyl-Option    ::= Option-Name ":" Horiz-Whitespace BOptValue newline
-
-BOptValue       ::= Number | 1-Line-String
-
-
-
-;;; Message section:
-
-
-Message-Section ::= Message-Starter  Status-Line  Orig-Header
-                    EOOH-Line  Message  Terminator
-
-Message-Starter ::= "^L" newline
-
-Status-Line     ::= Bit-Char  ","  (Basic-Label)* "," (User-Label)* newline
-
-Basic-Label     ::= Space  BLabel-Name  ","
-
-User-Label      ::= Space  ULabel-Name  ","
-
-EOOH-Line       ::= "*** EOOH ***" newline
-
-Message         ::= Visible-Header  Message-Text
-
-
-;;; Utilities:
-
-Terminator      ::= "^_"
-
-Horiz-Whitespace
-                ::= (Space | Tab)*
-
-Bit-Char        ::= "0" | "1"
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5b78767cfda..c084d4ff76b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tutorials/TUTORIAL.es: Fix typos.
+
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Mention `dynamic-library-alist'.
+
+2010-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * NEXTSTEP: New file, extracted from ../nextstep/{AUTHORS,README}.
+
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * TODO: Merge ../nextstep/FOR-RELEASE into this file.
+
+        * BABYL: Remove file.
+
 2010-09-21  Eric Ludlam  <zappo@gnu.org>
 
         * srecode/java.srt: Make NAME be a prompt.
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index de5318d45cb..ca2f2309b99 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -50,7 +50,7 @@ support for DIGEST-MD5 and NTLM.   *Note Emacs SASL: (sasl)Top.
 The primary change this brings is support for DIGEST-MD5 and NTLM, when
 the server supports it.
 
-** Gnus includes a password cache mechanism in password.el.
+** Gnus includes a password cache mechanism in password-cache.el.
 
 It is enabled by default (see `password-cache'), with a short timeout of
 16 seconds (see `password-cache-expiry').  If PGG is used as the PGP
diff --git a/etc/NEWS b/etc/NEWS
index 0535690dede..038eb4d8707 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -66,10 +66,15 @@ obsolete in Emacs 23.)
 
 * Changes in Emacs 24.1
 
-** New emacsclient argument --parent-id ID can be used to open a
+** emacsclient changes
+
+*** New emacsclient argument --parent-id ID can be used to open a
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
 
+*** If emacsclient shuts down as a result of Emacs signalling an
+error, its exit status is 1.
+
 ** Completion can cycle, depending on completion-cycle-threshold.
 
 ** auto-mode-case-fold is now enabled by default.
@@ -149,6 +154,11 @@ get and set the SELinux context of a file.
 *** Tramp offers handlers for file-selinux-context and set-file-selinux-context
 for remote machines which support SELinux.
 
+** The function kill-emacs is now run upon receipt of the signals SIGTERM
+and SIGHUP, and upon SIGINT in batch mode.
+
+** kill-emacs-hook is now also run in batch mode.
+
 ** New scrolling commands `scroll-up-command' and `scroll-down-command'
 (bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
 of buffer at first key-press (instead moves to top/bottom of buffer)
@@ -185,6 +195,13 @@ automatically when Emacs starts up.  To disable this, set
 `package-enable-at-startup' to nil.  To change which packages are
 loaded, customize `package-load-list'.
 
+** Custom Themes
+
+*** `M-x customize-themes' lists Custom themes which can be enabled.
+
+** The user option `remote-file-name-inhibit-cache' controls whether
+the remote file-name cache is used for read access.
+
 
 * Editing Changes in Emacs 24.1
 
@@ -213,22 +230,62 @@ should use delete-char with a negative argument instead.
 The default handling of clipboard and primary selections has been
 changed to conform with other X applications.
 
+The new behavior is that by default Emacs does not put text into the
+clipboard, and does not add it to kill-ring, merely because the text
+was selected.  Only commands that kill text or copy it to the
+kill-ring (C-w, M-w, C-k, etc.) put the killed text into the
+clipboard.  Selected text is put into the primary selection (on
+systems, such as X, that support the primary selection separately from
+the clipboard).
+
+Similarly, Emacs by default does not retrieve text from the clipboard
+when the mouse (e.g., mouse-2) is used for pasting text selected in
+another application.  Text from the clipboard is retrieved only by
+C-y, M-y and other commands that yank text from the kill-ring.  Mouse
+commands that paste text retrieve text from the primary selection, on
+systems that support it separately from the clipboard.
+
+In other words, the default behavior is that mouse gestures that
+select and paste text work with the primary selection, while keyboard
+commands that kill/copy and paste text work with the clipboard.
+
+This change also means that the "Copy", "Cut", and "Paste" items of
+the menu-bar "Edit" menu are now exactly equivalent to, respectively
+M-w, C-w, and C-y.
+
+To get back the previous behavior, whereby mouse gestures set the
+clipboard and retrieve text from there, customize the variables
+`mouse-drag-copy-region' and (on X only) `x-select-enable-primary'.
+If you don't want Emacs to put the text into the clipboard, only to
+the primary selection, additionally customize
+`x-select-enable-clipboard' to nil.
+
+These changes in the default behavior are reflected in the default
+values of several variables:
+
 *** `select-active-regions' now defaults to t, so active regions set
-the primary selection.
+the primary selection.  It was nil in previous versions.
 
-It also accepts a new value, `lazy', which means to only set the
+It also accepts a new value, `only', which means to only set the
 primary selection for temporarily active regions (usually made by
 mouse-dragging or shift-selection).
 
 *** `mouse-2' is now bound to `mouse-yank-primary'.
+Previously, it was bound to `mouse-yank-at-click' (which is now
+unbound by default.
 
-*** `x-select-enable-clipboard' now defaults to t.
+*** `x-select-enable-clipboard' now defaults to t on all platforms.
 Thus, killing and yanking now use the clipboard (in addition to the
-kill ring).
+kill ring).  Note that this variable was already non-nil by default on
+MS-Windows, which does not support the primary selection between
+applications.
 
 *** `x-select-enable-primary' now defaults to nil.
+This variable exists only on X; its default value was t in previous
+versions.
 
 *** `mouse-drag-copy-region' now defaults to nil.
+Its previous default value was t.
 
 *** Support for X cut buffers has been removed.
 
@@ -237,7 +294,7 @@ kill ring).
 
 ** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
 
-** FIXME: xdg-open for browse-url and reportbug, 2010/08.  (Close bug#4546?)
+** FIXME: xdg-open for browse-url and reportbug, 2010/08.
 
 ** Archive Mode has basic support to browse 7z archives.
 
@@ -259,6 +316,21 @@ You can get a comparable behavior with:
 
 ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags.
 
+** Calendar, Diary, and Appt
+
+---
+*** The obsolete (since Emacs 22.1) method of enabling the appt package
+by adding appt-make-list to diary-hook has been removed.  Use appt-activate.
+
+---
+*** Some appt variables (obsolete since Emacs 22.1) have been removed:
+appt-issue-message (use the function appt-activate)
+appt-visible/appt-msg-window (use the variable appt-display-format)
+
+---
+*** Some diary function aliases (obsolete since Emacs 22.1) have been removed:
+view-diary-entries, list-diary-entries, show-all-diary-entries
+
 ** Customize
 
 *** Customize buffers now contain a search field.
@@ -290,6 +362,10 @@ data is available locally.
 *** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and
 vc-log-outgoing, respectively.
 
+*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
+reruns the corresponding VC command to compute an up to date version
+of the buffer.
+
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
 *** Special markup can be added to log-edit buffers.
@@ -518,9 +594,35 @@ similar to the ones created by shift-selection.  In previous Emacs
 versions, these regions were delineated by `mouse-drag-overlay', which
 has now been removed.
 
+** cl.el no longer provides `cl-19'.
+
+** The following functions and aliases, obsolete since at least Emacs 21.1,
+have been removed:
+comint-kill-output, decompose-composite-char, outline-visible,
+internal-find-face, internal-get-face, frame-update-faces,
+frame-update-face-colors, x-frob-font-weight, x-frob-font-slant,
+x-make-font-bold, x-make-font-demibold, x-make-font-unbold
+x-make-font-italic, x-make-font-oblique, x-make-font-unitalic
+x-make-font-bold-italic, mldrag-drag-mode-line, mldrag-drag-vertical-line,
+iswitchb-default-keybindings, char-bytes, isearch-return-char,
+make-local-hook
+
+** The following variables and aliases, obsolete since at least Emacs 21.1,
+have been removed:
+checkdoc-minor-keymap, vc-header-alist, directory-sep-char,
+font-lock-defaults-alist
+
+** The following files, obsolete since at least Emacs 21.1, have been removed:
+sc.el, x-menu.el, rnews.el, rnewspost.el
+
 
 * Lisp changes in Emacs 24.1
 
+** `image-library-alist' is renamed to `dynamic-library-alist'.
+The variable is now used to load all kind of supported dynamic libraries,
+not just image libraries.  The previous name is still available as an
+obsolete alias.
+
 ** New variable syntax-propertize-function to set syntax-table properties.
 Replaces font-lock-syntactic-keywords which are now obsolete.
 This allows syntax-table properties to be set independently from font-lock:
@@ -569,6 +671,7 @@ Emacs Lisp parse tree.
 
 FIXME: These should be front-ended by xml.el.
 
+** FIXME GnuTLS
 
 ** Isearch
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index bee89d368b5..e1e7ba79d41 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -21,6 +21,9 @@ with a prefix argument or by typing C-u C-h C-n.
 
 * Changes in Emacs 23.3
 
+** The nextstep port can have different modifiers for the left and right
+alt/option key by customizing the value for ns-right-alternate-modifier.
+
 
 * Editing Changes in Emacs 23.3
 
@@ -31,6 +34,11 @@ with a prefix argument or by typing C-u C-h C-n.
 ** The appt-add command takes an optional argument for the warning time.
 This can be used in place of the default appt-message-warning-time.
 
+** Obsolete packages
+
++++
+*** lmenu.el and cl-compat.el are now obsolete.
+
 
 * New Modes and Packages in Emacs 23.3
 
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
new file mode 100644
index 00000000000..d55bd65d884
--- /dev/null
+++ b/etc/NEXTSTEP
@@ -0,0 +1,311 @@
+Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+This file contains information about GNU Emacs on "Nextstep" platforms.
+The Nextstep support code works on many POSIX systems (and possibly
+W32) using the GNUstep libraries, and on MacOS X systems using the
+Cocoa libraries.
+
+Background
+----------
+Within Emacs, the port and its code are referred to using the term
+"Nextstep", despite the fact that no system or API has been released
+under this name in more than 10 years.  Here's some background on why:
+
+NeXT, Inc. introduced the NeXTstep API with its computer and operating
+system in the late 1980's.  Later on, in collaboration with Sun, this
+API was published as a specification called OpenStep.  The GNUstep
+project started in the early 1990's to provide a free implementation
+of this API.  Later on, Apple bought NeXT (some would say "NeXT bought
+Apple") and made OpenStep the basis of OS X, calling the API "Cocoa".
+Since then, Cocoa has evolved beyond the OpenStep specification, and
+GNUstep has followed it.
+
+Thus, calling this port "OpenStep" is not technically accurate, and in
+the absence of any other determinant, we are using the term
+"Nextstep", both because it signifies the original inspiration that
+created these APIs, and because all of the classes and functions still
+begin with the letters "NS".
+
+(See http://en.wikipedia.org/wiki/Nextstep)
+
+This Emacs port was first released in the early 1990's on the NeXT
+computer, and was successively updated to OpenStep, Rhapsody, OS X,
+and then finally GNUstep, tracking GNU emacs core releases in the
+meantime.
+
+
+Release History
+---------------
+
+1990-1992       1.0-3.0 (?)     Michael Brouwer's socket/terminal communication 
+                                based version (GUI ran as a separate process.)
+
+1993/10/25      3.0.1           Last (?) release of Brouwer version.  Supports
+                                NeXTstep 3.x and below.
+
+1994/04/24      4.0             Carl Edman's version using direct API following
+                                the X-Windows port.  NeXTstep 3.x only.
+
+1995/06/15      4.1             Second (and last) Carl Edman release, based on
+                                Emacs 19.28.
+
+1996/07/28      4.2             First Christian Limpach release, based on
+                                Emacs 19.29.
+
+??              5.0             ??
+
+1997/12/??      6.0b1           Ported to OpenStep by Scott Bender.  Updated
+                                to Emacs 20.2.
+
+??              6.0b2           (?) Scott Bender: ported to Rhapsody.
+
+1999/05/??      6.0b3           Scott Bender: "OS X Server", Emacs 20.3.
+
+2001/06/25      7.0             Ported to MacOS X (10.1) by Christophe de
+                                Dinechin. Release based on Emacs 20.7. Hosting
+                                moved to SourceForge.
+
+2002/01/03      7.0.1           Bug fixes.
+
+2002/08/27      7.0.2           Jaguar (OS X 10.2) support. Added an autoconf
+                                option for sys_nerr being in stdio. Added
+                                libncurses to the build libraries. Fixed a
+                                problem with ns-alternate-is-meta. Changed the
+                                icon color to blue, since Jaguar is yellow.
+
+2004/10/07      8.0-pre1        Ported to GNUstep by Adrian Robert.
+
+2004/11/04      8.0-pre2        Restored functionality on OS X (menu code
+                                cleanup).  Improved scrollbar handling and
+                                paste from other applications.  File icons
+                                obtained properly from NSWorkspace.  Dropped
+                                Gorm and Nib files.  Background refresh bug
+                                fixed (in GNUstep).  Various small fixes and
+                                code cleanups.  Now starts up under Art.
+
+2005/01/27      8.0-pre3        Bold and italic faces supported.  Cursor and
+                                mouse highlighting rendering bugs
+                                fixed. Drag/drop and cut/paste interaction
+                                w/external apps fixed.  File load/save panels
+                                available.  Stability and rendering speed
+                                improvements. Some ObjC and VC mode bugs fixed.
+
+2005/02/27      8.0-rc1         Dynamic path detection at startup so Emacs.app
+                                can be moved anywhere.  Added binary packages
+                                and simplified source installation to running
+                                two scripts.  Thorough cleanup of menu code;
+                                now fully functional.  Fixed all detected
+                                memory leaks.  Minor frame focus and title
+                                bugs fixed.
+
+2005/03/30      8.0-rc2         "Configure" info directory now uses dynamic
+                                path setting, so info files can go under .app.
+                                Improved select() handling and PTY fixes so
+                                shell mode and tramp run smoothly.
+                                Significant rendering optimizations under
+                                GNUstep, and now works under Art backend.
+                                Non-Latin text rendering works (but not
+                                fontsets), and LEIM is bundled.  UTF8 is used
+                                for clipboard interaction.
+                                Arrow cursor now used on scrollbar.
+                                objc-mode and tramp now bundled in site-lisp.
+
+2005/05/30      8.0-rc3         Fixed bug with parsing of "easymenu" menus.
+                                Many problems with modes such as SLIME, MatLab,
+                                and Planner go away.  Improved scrollbar
+                                handling and rendering speed.  Color panel
+                                and other bug fixes. mac-fix-env utility.
+                                Font handling improvements (OS X 10.3, 10.4):
+                                - heed 'GSFontAntiAlias' default
+                                - heed system antialiasing threshold
+                                - added 'UseQuickdrawSmoothing' default to
+                                  invoke less heavy antialiasing
+
+2005/07/05      8.0-rc4         Added a Preferences panel.  Cleaned up
+                                rendering for synthetic italic fonts.  Further
+                                improved menu parsing.  Use system highlight
+                                color.  Added previous- and next-mark history
+                                navigation commmands bound to M-p,M-n.
+                                Miscellaneous bug fixes.
+
+2005/08/04      8.0-rc5         All internal string handling changed to UTF-8.
+                                This means menu items, color and color list
+                                names, and a few other things will now display
+                                properly.  It does NOT mean UTF-8 filenames
+                                are displayed correctly in the minibuffer.
+                                Also relating to UTF-8, contents of files
+                                using this coding can now be displayed (though
+                                not auto-recognized; add extensions to your
+                                default coding alist).  Limited mac-roman
+                                support was also added (also sans recognition).
+                                Certain characters are not displayed properly
+                                due to a translation problem.  (UTF-8 based on
+                                work by Otfried Cheong; mac-roman from
+                                emacs-21.)  Partial support for "dead-key"
+                                handling now added.  Transparency (e.g., M-x
+                                set-background-color ARGB88FFFFFF) improved:
+                                only the background is made transparent.
+                                Cursor drawing glitches fixed.  Preferences 
+                                handling improved.  Fixed some portability
+                                problems on Tiger and Puma.
+
+2005/09/12      8.0             Bundled ispell on OS X.  Minor bug fixes and
+                                stability improvements.  Compiles under gcc-4.
+
+2005/09/26      8.0.1           Correct clipped rendering for synthetic
+                                italics. Include the info directory.
+                                Fix grabenv. Bundle whitespace package.
+
+2005/10/27      8.0.2           Correct rendering for wide characters during
+                                cursor movement.  Fix bungled hack in ispell
+                                bundling.
+
+2005/11/05      9.0-pre1        Updated to latest Emacs CVS code on unicode-2
+                                branch (proposed to be released 2006/2007 as
+                                Emacs 23).
+
+2005/11/11      9.0-pre2        Fix crashes for deiconifying and loading
+                                certain images.  Improve vertical font metrics
+                                (fixes inaccurate page up/down, window size,
+                                and partial lines).  Support better remapping
+                                of Alt/Opt and remapping of Command.  More
+                                insistent defaulting of scrollbar to right.
+                                Modest improvements to build process.
+
+2006/04/22      9.0-pre2a       Stopgap interim release to sync w/latest
+                                unicode-2 CVS.  Includes XPM and partial
+                                toolbar support.
+
+2006/06/08      9.0-pre3        Major upgrade to keyboard handling:
+                                system-selected compositional input methods
+                                should now work, as well as more keys /
+                                keyboards.  XPM, toolbar, and tooltip support.
+                                Some improvements to scrollbars, zoom, italic
+                                rendering, pasting, Color panel.  Added function
+                                ns-set-background-alpha to work around
+                                inability to customize with numeric colors.
+                                
+2006/12/24      9.0-rc1         Reworked font handling and text rendering to
+                                use Kenichi Handa's new font back-end system.
+                                Font sets are now supported and automatically
+                                created when a font is selected.  Added recent
+                                X11 colors to Emacs.clr (remove
+                                ~/Library/Colors/Emacs.clr to pick up).  Added
+                                ns-option-modifier, ns-control-modifier,
+                                ns-function-modifier customization variables.
+                                Update menus to Emacs 21+ conventions.  Right
+                                mouse button now generates mouse-3 events.
+                                Various bug fixes and rendering improvements.
+
+2007/09/10      9.0-rc2         Improve menubar, popup menu, and scrollbar
+                                behavior, let accented char entry work in
+                                isearch, follow system keymap for shortcut
+                                keys, fix border and box drawing, remove
+                                glitches in modeline drawing, support
+                                overstrike for unavailable bold fonts, fix XPM
+                                related crasher bugs.  Incremental font
+                                metrics caching and other performance
+                                improvements.  Shared-lisp builds now possible.
+
+2007/09/20      9.0-rc2a        Interim release.  New features: composed
+                                character display, colored fringe bitmaps,
+                                colored relief drawing, dynamic resizing,
+                                Bug fixes: popup menu position and selection,
+                                font width calculation, face color adaptation
+                                to background, submenu keyboard navigation.
+                                NOT TESTED ON GNUSTEP.
+
+2007/11/19      9.0-rc3         Integrated the multi-TTY functionality from
+                                emacs core (however, mixed TTY and GUI
+                                sessions are not working yet).  Support 10.5.
+                                Give site-lisp load precedence over lisp and
+                                add a compile option to prefer an additional
+                                directory, use miniaturized miniwindow images
+                                in some cases, rename cursor types for
+                                consistency w/other emacs terms, improved font
+                                selection for symbol scripts.
+                                Bug fixes: fringe and bitmap, frame deletion,
+                                resizing, cursor blink, workspace open-file,
+                                image backgrounds, toolbar item enablement,
+                                context menu positioning.
+
+2008/07/15      (none)          Merge to GNU Emacs CVS trunk.
+
+
+Contributors
+------------
+In addition to the folks listed in etc/AUTHORS responsible for GNU Emacs
+itself, the NeXTstep port owes to the following people:
+
+Carl Edman
+    original author and maintainer, mainly UI
+Michael Brouwer
+    heavy contributor, input handling and other areas
+Christian Limpach
+    help / maintenance on NeXTstep
+Scott Bender
+    OpenStep, Rhapsody ports
+Christophe de Dinechin
+    MacOS X port
+Adrian Robert
+    GNUstep port, update Emacs 20 -> 21+
+
+Joe Reiss
+    popup menu, dialog boxes; icons
+Andrew Athan
+    font panel integration
+Scott Byer
+    improved rendering code
+Scott Hess
+    keyboard handling suggestions
+
+Rahul Abrol
+    "hide others" patch
+Adam Ratcliffe
+    preferences panel documentation
+Peter Dyballa
+    assistance with non-ASCII rendering and keyboard handling
+David M. Cooke
+    fix to XPM crash bug
+Carsten Bormann
+    initial patch and assistance getting dired working for non-ASCII filenames
+Andrew Moore
+    assistance on ns-mark-nav extension
+
+The GNUstep port was made possible through the assistance of Adam
+Fedor, Fred Kiefer, M. Uli Klusterer, Alexander Malmberg, Jonas
+Matton, and Riccardo Mottola.  Leigh Smith maintained the SourceForge
+project for a period.
+
+Suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David
+Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley
+Taylor all helped things along at one point or another.  Axel Seibert
+and Paul J. Sanchez offered their time and machines to make a
+binary release possible.
+
+We would also like to thank a number of people who kept up the
+constant supply of bug reports, suggested features and praise: Hardy
+Mayer, Gisli Ottarsson, Anthony Heading, David Bau, Jamie Zawinski,
+Martin Moncrieffe, Simson L. Garfinkel, Richard Stallman, Stephen
+Anderson, Ivo Welch, Magnus Nordborg, Tom Epperly, Andreas Koenig,
+Yves Arrouye, Anil Somayaji, Gregor Hoffleit; and the few hundred
+other people on the mailing list from whom we didn't hear much, but
+the presence of which assured us that maybe this project was actually
+worth doing.
+
+
+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 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/etc/TODO b/etc/TODO
index 966d3eb6976..296800dd1e3 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -627,6 +627,35 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
 
 * Things to be done for specific packages or features
 
+** NeXTstep port
+
+*** Bugs
+
+**** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back
+up on top of all others
+
+**** free_frame_resources, face colors
+
+**** Numeric keysetting bug.
+
+*** Mac-related
+
+**** Open file:/// URLs.
+
+**** Put frame autopositioning into C code somewhere -- if loc = same, offset.
+
+**** Automap ctrl-mouse-1 to mouse-3.
+
+**** Deal with Finder aliases somehow.
+
+**** Ctrl-F2 won't pull up menus.
+
+*** Other / Low Priority:
+
+**** Better recognition of unicode scripts / Greek / composition.
+
+**** Undo for color-drag face customization.
+
 ** ImageMagick support
 
 *** image-type-header-regexps priorities the jpeg loader over the
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 7fb7ac2c2a3..7b8198a915b 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -1,4 +1,4 @@
-Tutorial de Emacs. Vea al final las condiciones de copiado.
+Tutorial de Emacs.  Vea al final las condiciones de copiado.
 
 Generalmente los comandos de Emacs involucran la tecla CONTROL
 (algunas veces llamada CTRL O CTL) o la tecla meta (algunas veces
@@ -17,7 +17,7 @@ Nota importante: para terminar la sesión de Emacs teclee C-x C-c (dos
 caracteres).  Los caracteres ">>" en el margen izquierdo indican
 instrucciones para que usted trate de usar un comando.  Por ejemplo:
 <<Blank lines inserted around following line by help-with-tutorial>>
-[Mitad de página en blanco para propósitos didácticos. El texto continúa abajo]
+[Mitad de página en blanco para propósitos didácticos.  El texto continúa abajo]
 >> Ahora teclee C-v (ver la próxima pantalla) para desplazarse a la
         siguiente pantalla (hágalo manteniendo la tecla control
         oprimida mientras teclea v).  Desde ahora debería hacer esto
@@ -75,7 +75,7 @@ equivalentes a las cuatro teclas de flechas, de esta manera:
                         Línea siguiente, C-n
 
 >> Mueva el cursor a la línea en la mitad del diagrama
-   usando C-n o C-p. Luego teclee C-l para ver el
+   usando C-n o C-p.  Luego teclee C-l para ver el
    diagrama completo centrado en la pantalla.
 
 Le resultará fácil recordar estas letras por las palabras que
@@ -200,7 +200,7 @@ manera de pasarle un factor de repetición a un comando es tecleando
 C-u y luego los dígitos antes de introducir los comandos.  Si tiene
 una tecla META (o EDIT o ALT), hay una manera alternativa para
 ingresar un argumento numérico: teclear los dígitos mientras presiona
-la tecla META.  Recomendamos aprender el método C-u porque este
+la tecla META.  Recomendamos aprender el método C-u porque éste
 funciona en cualquier terminal.  El argumento numérico es también
 llamado un "argumento prefijo", porque usted teclea el argumento antes
 del comando al que se aplica.
@@ -321,13 +321,13 @@ Puede borrar el último carácter que escribió oprimiendo <Delback>.
 <Delback> es una tecla en el teclado--la misma que normalmente usa
 fuera de emacs para borrar el último carácter que escribió.
 Normalmente es una tecla una o dos filas arriba de la tecla <Return>,
-y que esta usualmente rotulada como "Backspace", "Del" o simplemente
+y que está usualmente rotulada como "Backspace", "Del" o simplemente
 con una flecha en dirección izquierda que no es parte de las teclas de
 flecha.
 
-Si la tecla larga esta rotulada "Backspace", entonces esa es la que
-debe de usar para <Delback>. Puede haber otra tecla llamada "Del" en
-otra parte, pero esa no es <Delback>.
+Si la tecla larga está rotulada "Backspace", entonces ésa es la que
+debe de usar para <Delback>.  Puede haber otra tecla llamada "Del" en
+otra parte, pero ésa no es <Delback>.
 
 Generalmente, <Delback> borra el carácter inmediatamente anterior a la
 posición actual del cursor.
@@ -393,7 +393,7 @@ otro extremo de esa parte, y teclee C-w.  Eso elimina todo el texto
 entre las dos posiciones.
 
 >> Mueva el cursor a la letra T del inicio del párrafo anterior.
->> Teclee C-SPC. Emacs debe mostrar el mensaje "Mark set" en la parte
+>> Teclee C-SPC.  Emacs debe mostrar el mensaje "Mark set" en la parte
    de abajo de la pantalla.
 >> Mueva el cursor a la x en "extremo", en la segunda línea del
    párrafo.
@@ -405,7 +405,7 @@ puede ser reinsertado, mientras que las cosas "borradas" no pueden ser
 reinsertadas.  La reinserción de texto eliminado se llama "yanking" o
 "pegar".  Generalmente, los comandos que pueden quitar mucho texto lo
 eliminan, mientras que los comandos que quitan solo un carácter, o
-solo lineas en blanco y espacios, borran (para que no pueda pegar ese
+solo líneas en blanco y espacios, borran (para que no pueda pegar ese
 texto).
 
 >> Mueva el cursor al comienzo de una línea que no esté vacía.
@@ -417,14 +417,14 @@ Note que al teclear C-k una sola vez elimina el contenido de la línea,
 y un segundo C-k elimina la línea misma, y hace que todas las otras
 líneas se muevan hacia arriba.  C-k trata un argumento numérico
 especialmente: Elimina ese número de líneas y TAMBIÉN sus
-contenidos. Esto no es una simple repetición.  C-u 2 C-k elimina dos
+contenidos.  Esto no es una simple repetición.  C-u 2 C-k elimina dos
 líneas y sus nuevas líneas, tecleando C-k dos veces no hace esto.
 
 Traer texto eliminado de regreso es llamado "yanking" o "pegar".
 (Piense en ello como pegar de nuevo, o traer de vuelta, algún texto
 que le fue quitado.)  Puede pegar el texto eliminado en, ya sea el
 lugar en que fue eliminado, o en otra parte del buffer, o hasta en un
-archivo diferente. Puede pegar el texto varias veces, lo que hace
+archivo diferente.  Puede pegar el texto varias veces, lo que hace
 varias copias de él.
 
 El comando para pegar es C-y.  Reinserta el último texto eliminado, en
@@ -460,7 +460,7 @@ eliminación más reciente).
    Luego teclee M-y y será reemplazado por la primera línea eliminada.
    Teclee más veces M-y y vea lo que obtiene.  Siga haciéndolo hasta
    que la segunda línea eliminada regrese, y entonces unas pocas
-   más. Si quiere, puede tratar de darle a M-y argumentos positivos y
+   más.  Si quiere, puede tratar de darle a M-y argumentos positivos y
    negativos.
 
 
@@ -477,7 +477,7 @@ adicional.
 Pero hay dos excepciones: los comandos que no cambian el texto no
 cuentan (esto incluye los comandos de movimiento del cursor y el
 comando de desplazamiento), y los caracteres de autoinserción se
-manejan usualmente en grupos de hasta 20. (Esto es para reducir el
+manejan usualmente en grupos de hasta 20.  (Esto es para reducir el
 numero de C-x u que tenga que teclear para deshacer una inserción en
 el texto.)
 
@@ -504,7 +504,7 @@ si puede pegarlo con C-y; no hay diferencia alguna para deshacer.
 Para que pueda hacer permanente el texto que edite, lo debe colocar en
 un archivo.  De otra manera, éste se perderá cuando cierre Emacs.
 Para poder poner su texto en un archivo, debe "encontrar" el archivo
-antes de ingresar el texto. (Esto se llama también "visitar" el
+antes de ingresar el texto.  (Esto se llama también "visitar" el
 archivo.)
 
 Encontrar un archivo significa que puede ver su contenido dentro de
@@ -556,7 +556,7 @@ teclee el comando
 
 Esto copia el texto dentro de Emacs al archivo.  La primera vez que
 haga esto, Emacs renombrará el archivo original con un nuevo nombre
-para que este no se pierda. El nuevo nombre se hace agregando "~" al
+para que éste no se pierda.  El nuevo nombre se hace agregando "~" al
 final del nombre del archivo original.
 
 Cuando guardar haya terminado, Emacs mostrará el nombre del archivo
@@ -595,13 +595,13 @@ Emacs almacena cada texto del archivo dentro de un objeto llamado
 Emacs.  Para mirar la lista de los buffers que existen actualmente en
 su sesión de Emacs, teclee:
 
-        C-x C-b   Lista de Buffers
+        C-x C-b   Lista de buffers
 
 >> Pruebe C-x C-b ahora.
 
 Vea como cada buffer tiene un nombre, y además puede tener un nombre
-de archivo para el archivo que contiene. CUALQUIER texto que vea en
-una ventana de Emacs es siempre parte de algún Buffer.
+de archivo para el archivo que contiene.  CUALQUIER texto que vea en
+una ventana de Emacs es siempre parte de algún buffer.
 
 >> Teclee C-x 1 para deshacerse de la lista de buffers.
 
@@ -610,14 +610,14 @@ momento.  Ese buffer es el que actualmente edita.  Si quiere editar
 otro buffer, necesita "cambiar" a él.  Si quiere cambiar a un buffer
 que corresponde a un archivo, puede hacerlo visitando el archivo de
 nuevo con C-x C-f.  Pero existe una manera más rápida: use el comando
-C-x b. En ese comando, necesita teclear el nombre de buffer.
+C-x b.  En ese comando, necesita teclear el nombre de buffer.
 
 >> Teclee C-x b foo <Return> para volver al buffer "foo" que contiene
    el texto del archivo "foo".  Después teclee C-x b TUTORIAL.es
    <Return> para regresar a este tutorial.
 
 La mayoría del tiempo el nombre del buffer es el mismo que el nombre
-del archivo (sin la parte del directorio del archivo). Sin embargo,
+del archivo (sin la parte del directorio del archivo).  Sin embargo,
 esto no es así siempre.  La lista de buffers que hace con C-x C-b
 siempre muestra el nombre de todos los buffers.
 
@@ -638,7 +638,7 @@ dentro de Emacs en ese buffer del archivo.  La creación o edición del
 segundo buffer de archivo no afecta al primero.  Esto es muy útil,
 pero también significa que necesita una forma conveniente para guardar
 el archivo del primer buffer.  Sería una molestia tener que volver a
-este con C-x C-f para guardarlo con C-x C-s. Así tenemos
+éste con C-x C-f para guardarlo con C-x C-s.  Así tenemos
 
         C-x s   Guardar algunos buffers
 
@@ -655,10 +655,10 @@ guardada.  Le pregunta, por cada buffer, si quiere guardarlo o no.
 
 Hay muchísimos más comandos de Emacs que los que podrían asignarse a
 todos los caracteres control y meta.  Emacs puede darle la vuelta a
-esto usando el comando X (eXtendido).  Este viene de dos formas:
+esto usando el comando X (eXtendido).  Éste viene de dos formas:
 
-        C-x     Carácter eXtendido. Seguido por un carácter.
-        M-x     Comando eXtendido por nombre. Seguido por un nombre
+        C-x     Carácter eXtendido.  Seguido por un carácter.
+        M-x     Comando eXtendido por nombre.  Seguido por un nombre
                 largo.
 
 Estos comandos son generalmente útiles pero menos usados que los
@@ -713,7 +713,7 @@ El comando replace-string requiere dos argumentos: la cadena de
 caracteres a reemplazar, y la cadena de caracteres para reemplazarla.
 Debe terminar cada argumento con <Return>.
 
->> Mueva el cursor hacia la línea en blanco dos líneas abajo de esta.
+>> Mueva el cursor hacia la línea en blanco dos líneas abajo de ésta.
    A continuación escriba
    M-x repl s<Return>cambiado<Return>alterado<Return>.
 
@@ -762,7 +762,7 @@ que está editando.
 Ya sabe qué significa el nombre del archivo: es el archivo que usted
 ha encontrado.  -NN%-- indica su posición actual en el texto; esto
 significa que NN por ciento del texto está encima de la parte superior
-de la pantalla.  Si el principio del archivo está en la pantalla, este
+de la pantalla.  Si el principio del archivo está en la pantalla, éste
 dirá --Top-- en vez de --00%--.  Si el final del texto está en la
 pantalla, dirá --Bot--.  Si está mirando un texto tan pequeño que cabe
 en la pantalla, el modo de línea dirá --All--.
@@ -776,7 +776,7 @@ parte de la línea de modo no muestra asteriscos, solo guiones.
 
 La parte de la línea de modo dentro de los paréntesis es para
 indicarle en qué modo de edición está.  El modo por omisión es
-Fundamental, el cual está usando ahora.  Este es un ejemplo de un
+Fundamental, el cual está usando ahora.  Éste es un ejemplo de un
 "modo mayor".
 
 Emacs tiene diferentes modos mayores.  Algunos están hechos para
@@ -841,7 +841,7 @@ Decimos que el comando "cambia el modo".
    Debe intercalar espacios porque Auto Fill sólo rompe líneas en los
    espacios.
 
-El margen esta normalmente puesto en 70 caracteres, pero puede
+El margen está normalmente puesto en 70 caracteres, pero puede
 cambiarlo con el comando C-x f.  Debe indicar el margen deseado como
 un argumento numérico.
 
@@ -1079,7 +1079,7 @@ Un comando similar, C-h v, muestra la documentación de variables cuyos
 valores pueda poner para adecuar el comportamiento de Emacs.  Necesita
 teclear el nombre de la variable cuando Emacs pregunte por ella.
 
-   C-h a        Comando Apropos. Teclee una palabra y Emacs hará una
+   C-h a        Comando Apropos.  Teclee una palabra y Emacs hará una
                 lista de todos los comandos que contengan esa palabra.
                 Todos estos comandos pueden ser invocados con META-x.
                 Para algunos comandos, el Comando Apropos también
@@ -1113,7 +1113,7 @@ correspondientes tales como find-file.
 ---------------------
 
 Puede aprender más de Emacs leyendo su manual, ya sea como libro o en
-línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r). Dos
+línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r).  Dos
 características que pueden gustarle son la completación, que ahorra
 teclear, y dired, que simplifica el manejo de archivos.
 
@@ -1126,7 +1126,7 @@ llamado "Completation".
 
 Dired le permite listar los archivos en un directorio (y opcionalmente
 sus subdirectorios), moverse alrededor de esa lista, visitar,
-renombrar, borrar y aparte de eso operar en los archivos.  Dired esta
+renombrar, borrar y aparte de eso operar en los archivos.  Dired está
 descrito en el Info en el manual de Emacs en el nodo llamado "Dired".
 
 El manual también describe otras características de Emacs.
@@ -1189,7 +1189,7 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
    posterior como lo permite esta nota.
 
    Se permite distribuir versiones modificadas de este documento, o
-   porciones de este, bajo las condiciones anteriores, siempre que
+   porciones de éste, bajo las condiciones anteriores, siempre que
    ellas tengan nota visible especificando quién fue el último en
    alterarlas.