[Emacs-diffs] /srv/bzr/emacs/trunk r103496: Reduce some of the many, many variant spellings of NeXTstep.

[Glenn Morris]

------------------------------------------------------------
revno: 103496
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-03 00:03:01 -0800
message:
  Reduce some of the many, many variant spellings of NeXTstep.
  
  http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html
modified:
  configure.in
  doc/misc/faq.texi
  etc/NEWS.23
  lisp/find-file.el
  nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj
  nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
  src/nsterm.m

=== modified file 'configure.in'
--- a/configure.in      2011-02-25 06:42:06 +0000
+++ b/configure.in      2011-03-03 08:03:01 +0000
@@ -162,7 +162,7 @@
 OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
 OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
 OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
-OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
+OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
 
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux 
console])
 OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])

=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2011-02-16 08:39:19 +0000
+++ b/doc/misc/faq.texi 2011-03-03 08:03:01 +0000
@@ -1042,11 +1042,11 @@
 @item
 Emacs can be started as a daemon in the background.
 
address@hidden NeXTSTEP port
address@hidden NeXTstep port
 @cindex GNUstep port
 @cindex Mac OS X Cocoa
 @item
-There is a new NeXTSTEP port of Emacs.  This supports GNUstep and Mac OS
+There is a new NeXTstep port of Emacs.  This supports GNUstep and Mac OS
 X (via the Cocoa libraries).  The Carbon port of Emacs, which supported
 Mac OS X in Emacs 22, has been removed.
 

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2011-02-28 01:07:29 +0000
+++ b/etc/NEWS.23       2011-03-03 08:03:01 +0000
@@ -129,7 +129,7 @@
 
 * Changes in Emacs 23.3 on non-free operating systems
 
-** The nextstep port can have different modifiers for the left and right
+** The NeXTstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
 
 
@@ -697,7 +697,7 @@
 
 *** Emacs now supports multi-page TIFF images.
 
-** New NeXTSTEP-based port.
+** New NeXTstep-based port.
 This provides support for GNUstep (via the GNUstep libraries) and Mac
 OS X (via the Cocoa libraries).
 
@@ -707,7 +707,7 @@
 nextstep/README and nextstep/INSTALL in the Emacs source directory.
 
 ** Mac OS X is no longer supported via Carbon.
-Use the NeXTSTEP port, described above.
+Use the NeXTstep port, described above.
 
 ** The new configuration option "--with-dbus" enables D-Bus language
 bindings for Emacs.

=== modified file 'lisp/find-file.el'
--- a/lisp/find-file.el 2011-01-25 04:08:28 +0000
+++ b/lisp/find-file.el 2011-03-03 08:03:01 +0000
@@ -183,7 +183,7 @@
 ;;;###autoload
 (defvar ff-special-constructs
   `(
-    ;; C/C++ include, for NeXTSTEP too
+    ;; C/C++ include, for NeXTstep too
     (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") .
      (lambda ()
        (buffer-substring (match-beginning 2) (match-end 2))))

=== modified file 'nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj'
--- a/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj    2009-06-04 23:21:22 
+0000
+++ b/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj    2011-03-03 08:03:01 
+0000
@@ -245,7 +245,7 @@
                        name = Products;
                        sourceTree = "<group>";
                };
-               289FC26B00C69A287F000001 /* NeXTStep */ = {
+               289FC26B00C69A287F000001 /* NeXTstep */ = {
                        isa = PBXGroup;
                        children = (
                                3C4D6D710DE50D5D00B20D4E /* nsfont.m */,
@@ -257,13 +257,13 @@
                                090AF68100C61DCD7F000001 /* nsselect.m */,
                                090AF68300C61DCD7F000001 /* nsterm.m */,
                        );
-                       name = NeXTStep;
+                       name = NeXTstep;
                        sourceTree = "<group>";
                };
                29B97314FDCFA39411CA2CEA /* Emacs */ = {
                        isa = PBXGroup;
                        children = (
-                               289FC26B00C69A287F000001 /* NeXTStep */,
+                               289FC26B00C69A287F000001 /* NeXTstep */,
                                3C15C23E0902E6B000A8542F /* emacs-hdr */,
                                3CDCED4D0902EA6800B2EF7E /* emacs-src */,
                                29B97317FDCFA39411CA2CEA /* Resources */,

=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist'
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2011-03-03 
07:57:49 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2011-03-03 
08:03:01 +0000
@@ -7,8 +7,8 @@
        "Adrian Robert (GNUstep)",
        "Christophe de Dinechin (MacOS X)",
        "Scott Bender (OpenStep)",
-       "Christian Limpach (NeXTStep)",
-       "Carl Edman (NeXTStep)",
+       "Christian Limpach (NeXTstep)",
+       "Carl Edman (NeXTstep)",
        "..see etc/NEXTSTEP"
     );
     Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-02-23 20:41:43 +0000
+++ b/src/nsterm.m      2011-03-03 08:03:01 +0000
@@ -189,7 +189,7 @@
   *ns_pending_service_args;
 static BOOL inNsSelect = 0;
 
-/* Convert modifiers in a NeXTSTEP event to emacs style modifiers.  */
+/* Convert modifiers in a NeXTstep event to emacs style modifiers.  */
 #define NS_FUNCTION_KEY_MASK 0x800000
 #define NSLeftControlKeyMask    (0x000001 | NSControlKeyMask)
 #define NSRightControlKeyMask   (0x002000 | NSControlKeyMask)