(x-menu-bar-open): Delete duplicated function from

the merge.
(global-set-key): Delete f10 mapping, now done in menu-bar.el.
(provide): Move to the end of file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c63c019d5abd1bf7aeb401c1eaf8e52c1f1a126a..84fca46593300cd62d73d60652103252d5bbb764 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-31  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * term/x-win.el (x-menu-bar-open): Delete duplicated function from
+       the merge.
+       (global-set-key): Delete f10 mapping, now done in menu-bar.el.
+       (provide): Move to the end of file.
+
        * vc-svn.el (vc-svn-diff-tree): Pass a list to vc-svn-diff.
 
 2007-08-31  Micha\e,Ak\e(Bl Cadilhac  <michael@cadilhac.name>

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index de0d99ab3c04a627043491cdd3d5168b8395e4ea..bde34f4b0d12dede580aa8a9c97beb4da99057cc 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2561,22 +2561,10 @@ order until succeed.")
 (add-to-list 'frame-creation-function-alist '(x . x-create-frame-with-faces))
 (add-to-list 'window-system-initialization-alist '(x . x-initialize-window-system))
 
-(provide 'x-win)
-
 ;; Initiate drag and drop
 (add-hook 'after-make-frame-functions 'x-dnd-init-frame)
 (define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
 
-;; Let F10 do menu bar navigation.
-(defun x-menu-bar-open (&optional frame)
-  "Open the menu bar if `menu-bar-mode' is on. otherwise call `tmm-menubar'."
-  (interactive "i")
-  (if menu-bar-mode (menu-bar-open frame)
-    (tmm-menubar)))
-                  
-(and (fboundp 'menu-bar-open)
-     (global-set-key [f10] 'x-menu-bar-open))
-
 (defcustom x-gtk-stock-map
   '(
     ("etc/images/new" . "gtk-new")
@@ -2614,5 +2602,7 @@ Emacs must be compiled with the Gtk+ toolkit for this to have any effect."
         (value (assoc-string (or key file-sans) x-gtk-stock-map)))
     (and value (cdr value))))
 
+(provide 'x-win)
+
 ;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
 ;;; x-win.el ends here