Merge from trunk

[gnu-emacs] / lisp / term / common-win.el

diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 0df5e57ee273aa244ec740c0145135010d6d68de..c13d22dde71aca781e59064bab086e5df65cb5ac 100644 (file)
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -1,7 +1,6 @@
 ;;; common-win.el --- common part of handling window systems
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: terminals
@@ -125,9 +124,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)))