diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-12-03 12:48:24 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-12-03 12:48:24 +0100 |
| commit | 3e972d981f033b0197cf2c9026d0edea451a2daa (patch) | |
| tree | 6ed247b824131105ca98f69eba995d11fadc8513 /lisp | |
| parent | 146490c35d54bb78d24082c33e04ddcb518ef015 (diff) | |
| download | emacs-3e972d981f033b0197cf2c9026d0edea451a2daa.tar.gz emacs-3e972d981f033b0197cf2c9026d0edea451a2daa.tar.bz2 emacs-3e972d981f033b0197cf2c9026d0edea451a2daa.zip | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/term/common-win.el | 4 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f8ef108670a..4ed0393594e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/term/common-win.el b/lisp/term/common-win.el index 0df5e57ee27..f43056976a2 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -125,9 +125,9 @@ is not used)." ;;; (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 --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 89fcfde9358..77a2d3f2bc0 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -171,7 +171,9 @@ The properties returned may include `top', `left', `height', and `width'." (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 |