* term/ns-win.el:

* version.el (emacs-version):
* loadup.el:
* frame.el (make-frame-on-display): Check for ns instead of
ns-windowing.

5 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0412b67a76d..a12829d0f6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * term/ns-win.el:
+        * version.el (emacs-version):
+        * loadup.el:
+        * frame.el (make-frame-on-display): Check for ns instead of
+        ns-windowing.
+
         * dired.el (dired-mode-map): Show the key binding for wdired.
 
         * menu-bar.el (menu-bar-file-menu): Show the key binding for
diff --git a/lisp/frame.el b/lisp/frame.el
index 3682d1cc5e7..d959ce6571b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -611,7 +611,7 @@ is not considered (see `next-frame')."
   "Make a frame on X display DISPLAY.
 The optional second argument PARAMETERS specifies additional frame parameters."
   (interactive "sMake frame on display: ")
-  (if (featurep 'ns-windowing)
+  (if (featurep 'ns)
       (progn
         (when (and (boundp 'ns-initialized) (not ns-initialized))
           (setq x-display-name display)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 64433b2058a..e444fc5dcaa 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -214,7 +214,7 @@
 (if (featurep 'mac-carbon)
     (progn
       (load "term/mac-win")))
-(if (featurep 'ns-windowing)
+(if (featurep 'ns)
     (progn
       (load "emacs-lisp/easymenu")  ;; for platform-related menu adjustments
       (load "term/ns-win")))
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index cdb5018e230..d6416c1b16e 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -39,7 +39,7 @@
 ;;; Code:
 
 
-(if (not (featurep 'ns-windowing))
+(if (not (featurep 'ns))
     (error "%s: Loading ns-win.el but not compiled for GNUStep/MacOS"
            (invocation-name)))
 
diff --git a/lisp/version.el b/lisp/version.el
index 5f136a5f4e1..74dd878d7e3 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -65,7 +65,7 @@ to the system configuration; look at `system-configuration' instead."
                        ((featurep 'gtk)
                         (concat ", GTK+ Version " gtk-version-string))
                        ((featurep 'x-toolkit) ", X toolkit")
-                       ((featurep 'ns-windowing)
+                       ((featurep 'ns)
                         (format ", *Step %s" ns-version-string))
                        ((boundp 'mac-carbon-version-string)
                         (concat ", Carbon Version " mac-carbon-version-string))