2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0337982f044..194c76b28ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-21  Juri Linkov  <juri@jurta.org>
+
+        * frame.el: Bind `f10' in `esc-map' to `toggle-frame-maximized'
+        in addition to existing separate binding `meta f10' in `global-map'.
+        (Bug#13484)
+
 2013-01-21  Michael Albinus  <michael.albinus@gmx.de>
 
         Improve XEmacs compatibility.
diff --git a/lisp/frame.el b/lisp/frame.el
index 243f524c403..2c17b781caa 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1707,6 +1707,7 @@ See also `toggle-frame-maximized'."
 (define-key ctl-x-5-map "o" 'other-frame)
 (define-key global-map [f11] 'toggle-frame-fullscreen)
 (define-key global-map [(meta f10)] 'toggle-frame-maximized)
+(define-key esc-map    [f10]        'toggle-frame-maximized)
 
 
 ;; Misc.