* term/ns-win.el:

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0412b67a76d6ba0db93b8b69ad2f7c10d8cf4b9a..a12829d0f6db1537bcdf655603557f6296cb06d8 100644 (file)
--- 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 3682d1cc5e7b2782da5ad89f4f947cb1f33c01c5..d959ce6571b7e4fe9e0a6ffc2c855d11ee3dd960 100644 (file)
--- 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 64433b2058a7934eba1cca65e099b3989809e8de..e444fc5dcaa90047e0fc8e0c540ff7a839669145 100644 (file)
--- 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 cdb5018e23097b3d4a3145b0b408c1bbf8337b9f..d6416c1b16e3ebe637a960d8710df43f4cdc8fbf 100644 (file)
--- 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 5f136a5f4e1c9d4cab8710bc7aee2736083572e1..74dd878d7e3869bb8068e5c08ff9a76a6d5a725c 100644 (file)
--- 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))