[Emacs-diffs] /srv/bzr/emacs/trunk r102571: Restore dock New Frame and Preferences menu functions (Bug#7535).

[Jan D.]

------------------------------------------------------------
revno: 102571
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-03 12:48:24 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/term/common-win.el
  lisp/term/ns-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-03 03:13:24 +0000
+++ b/lisp/ChangeLog    2010-12-03 11:48:24 +0000
@@ -1,3 +1,11 @@
+2010-12-03  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nxml/nxml-mode.el: Require rng-nxml.

=== modified file 'lisp/term/common-win.el'
--- a/lisp/term/common-win.el   2010-10-26 16:56:11 +0000
+++ b/lisp/term/common-win.el   2010-12-03 11:48:24 +0000
@@ -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)))
 

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2010-11-21 13:09:34 +0000
+++ b/lisp/term/ns-win.el       2010-12-03 11:48:24 +0000
@@ -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