Mercurial > emacs
changeset 83822:8404d44e8ab8
(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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 31 Aug 2007 15:39:18 +0000 |
| parents | 86c05b1c8884 |
| children | dd2bcc6758a0 |
| files | lisp/ChangeLog lisp/term/x-win.el |
| diffstat | 2 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 31 14:07:49 2007 +0000 +++ b/lisp/ChangeLog Fri Aug 31 15:39:18 2007 +0000 @@ -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,Ak(Bl Cadilhac <michael@cadilhac.name>
--- a/lisp/term/x-win.el Fri Aug 31 14:07:49 2007 +0000 +++ b/lisp/term/x-win.el Fri Aug 31 15:39:18 2007 +0000 @@ -2561,22 +2561,10 @@ (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 @@ (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