# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1216792881 0
# Node ID 72d6895432c741282544f1b0af617bc0a34eabcf
# Parent  3aa8d40c321843a2a99fa28f27ccac18364e8cc4
* term/ns-win.el:
* version.el (emacs-version):
* loadup.el:
* frame.el (make-frame-on-display): Check for ns instead of
ns-windowing.

diff -r 3aa8d40c3218 -r 72d6895432c7 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jul 23 05:58:24 2008 +0000
+++ b/lisp/ChangeLog	Wed Jul 23 06:01:21 2008 +0000
@@ -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 -r 3aa8d40c3218 -r 72d6895432c7 lisp/frame.el
--- a/lisp/frame.el	Wed Jul 23 05:58:24 2008 +0000
+++ b/lisp/frame.el	Wed Jul 23 06:01:21 2008 +0000
@@ -611,7 +611,7 @@
   "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 -r 3aa8d40c3218 -r 72d6895432c7 lisp/loadup.el
--- a/lisp/loadup.el	Wed Jul 23 05:58:24 2008 +0000
+++ b/lisp/loadup.el	Wed Jul 23 06:01:21 2008 +0000
@@ -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 -r 3aa8d40c3218 -r 72d6895432c7 lisp/term/ns-win.el
--- a/lisp/term/ns-win.el	Wed Jul 23 05:58:24 2008 +0000
+++ b/lisp/term/ns-win.el	Wed Jul 23 06:01:21 2008 +0000
@@ -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 -r 3aa8d40c3218 -r 72d6895432c7 lisp/version.el
--- a/lisp/version.el	Wed Jul 23 05:58:24 2008 +0000
+++ b/lisp/version.el	Wed Jul 23 06:01:21 2008 +0000
@@ -65,7 +65,7 @@
 		       ((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))