Merge nextstep/FOR-RELEASE outstanding issues into etc/TODO.

4 files changed, 33 insertions, 38 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 92af6e4f89e..25f8448ecb9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,5 +1,7 @@
 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>
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/nextstep/ChangeLog b/nextstep/ChangeLog
index aa856ce6ed0..a746b5f8538 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-12  Glenn Morris  <rgm@gnu.org>
 
+        * FOR-RELEASE: Merge into ../etc/TODO.
+
         * DEV-NOTES: Move to ../admin/notes/nextstep.
 
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/nextstep/FOR-RELEASE b/nextstep/FOR-RELEASE
deleted file mode 100644
index 0f8a6534ad0..00000000000
--- a/nextstep/FOR-RELEASE
+++ /dev/null
@@ -1,38 +0,0 @@
--*- outline -*-
-
-
-* CURSOR BUGS:
-
-** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back up
-   on top of all others
-
-
-* OTHER BUGS
-
-** free_frame_resources, face colors
-
-** numeric keysetting bug
-
-** http://debbugs.gnu.org/ns
-
-
-* 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 recog of unicode scripts / Greek / composition
-
-** Exec-dump not working on GNUstep (so slow startup).
-
-** undo for color-drag face customization