# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1291376904 -3600
# Node ID 8f6857157cb561c3cf1b9545d86ba49822252896
# Parent  9117da225c2c36d1484f9da203ba6582899c87db
Restore dock New Frame and Preferences menu functions (Bug#7535).

* term/common-win.el (x-setup-function-keys): Restore ns-new-frame
and ns-show-prefs.

* term/ns-win.el (global-map): Restore ns-new-frame and ns-show-prefs
bindings.

diff -r 9117da225c2c -r 8f6857157cb5 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 03 11:54:44 2010 +0100
+++ b/lisp/ChangeLog	Fri Dec 03 12:48:24 2010 +0100
@@ -1,3 +1,11 @@
+2010-12-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* term/common-win.el (x-setup-function-keys): Restore ns-new-frame
+	and ns-show-prefs (Bug#7535).
+
+	* term/ns-win.el (global-map): Restore ns-new-frame and ns-show-prefs
+	bindings (Bug#7535).
+
 2010-12-03  Glenn Morris  <rgm@gnu.org>
 
 	* nxml/nxml-mode.el: Require rng-nxml.
diff -r 9117da225c2c -r 8f6857157cb5 lisp/term/common-win.el
--- a/lisp/term/common-win.el	Fri Dec 03 11:54:44 2010 +0100
+++ b/lisp/term/common-win.el	Fri Dec 03 12:48:24 2010 +0100
@@ -125,9 +125,9 @@
 ;;;	       (cons (logior (lsh 0 16)   9) 'ns-insert-working-text)
 ;;;	       (cons (logior (lsh 0 16)  10) 'ns-delete-working-text)
 	       (cons (logior (lsh 0 16)  11) 'ns-spi-service-call)
-;;;	       (cons (logior (lsh 0 16)  12) 'ns-new-frame)
+	       (cons (logior (lsh 0 16)  12) 'ns-new-frame)
 	       (cons (logior (lsh 0 16)  13) 'ns-toggle-toolbar)
-;;;	       (cons (logior (lsh 0 16)  14) 'ns-show-prefs)
+	       (cons (logior (lsh 0 16)  14) 'ns-show-prefs)
 	       ))))
     (set-terminal-parameter frame 'x-setup-function-keys t)))
 
diff -r 9117da225c2c -r 8f6857157cb5 lisp/term/ns-win.el
--- a/lisp/term/ns-win.el	Fri Dec 03 11:54:44 2010 +0100
+++ b/lisp/term/ns-win.el	Fri Dec 03 12:48:24 2010 +0100
@@ -171,7 +171,9 @@
 (define-key global-map [ns-change-font] 'ns-respond-to-change-font)
 (define-key global-map [ns-open-file-line] 'ns-open-file-select-line)
 (define-key global-map [ns-spi-service-call] 'ns-spi-service-call)
+(define-key global-map [ns-new-frame] 'make-frame)
 (define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar)
+(define-key global-map [ns-show-prefs] 'customize)
 
 
 ;; Set up a number of aliases and other layers to pretend we're using