Mercurial > emacs
changeset 96921:72d6895432c7
* term/ns-win.el:
* version.el (emacs-version):
* loadup.el:
* frame.el (make-frame-on-display): Check for ns instead of
ns-windowing.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 23 Jul 2008 06:01:21 +0000 |
| parents | 3aa8d40c3218 |
| children | 35abcad873d6 |
| files | lisp/ChangeLog lisp/frame.el lisp/loadup.el lisp/term/ns-win.el lisp/version.el |
| diffstat | 5 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)
--- 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")))
--- 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)))
--- 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))