mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Reduce some of the many, many variant spellings of NeXTstep.

Browse source 
http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html
This commit is contained in:
Glenn Morris 2011-03-03 00:03:01 -08:00
parent 8dd979ade9
commit b612ffc94d
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -162,7 +162,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
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])

4
doc/misc/faq.texi
View file

@ -1042,11 +1042,11 @@ Emacs now supports using both X displays and ttys in the same session
@item
Emacs can be started as a daemon in the background.
@cindex NeXTSTEP port
@cindex 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.

6
etc/NEWS.23
View file

@ -129,7 +129,7 @@ starting from the first line of text below the header line.
* 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 @@ a GIF library.
*** 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 @@ other emacsen (e.g. X11 build) use --disable-ns-self-contained. See
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.

2
lisp/find-file.el
View file

@ -183,7 +183,7 @@ To override this, give an argument to `ff-find-other-file'."
;;;###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))))

6
nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj
View file

@ -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 */,

4
nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
View file

@ -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.";

2
src/nsterm.m
View file

@ -189,7 +189,7 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names,
*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)