Mercurial > emacs
comparison lisp/term/x-win.el @ 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 | f5b3f6bef1a1 |
| children | c441663cac09 |
comparison
equal
deleted
inserted
replaced
| 83821:86c05b1c8884 | 83822:8404d44e8ab8 |
|---|---|
| 2559 | 2559 |
| 2560 (add-to-list 'handle-args-function-alist '(x . x-handle-args)) | 2560 (add-to-list 'handle-args-function-alist '(x . x-handle-args)) |
| 2561 (add-to-list 'frame-creation-function-alist '(x . x-create-frame-with-faces)) | 2561 (add-to-list 'frame-creation-function-alist '(x . x-create-frame-with-faces)) |
| 2562 (add-to-list 'window-system-initialization-alist '(x . x-initialize-window-system)) | 2562 (add-to-list 'window-system-initialization-alist '(x . x-initialize-window-system)) |
| 2563 | 2563 |
| 2564 (provide 'x-win) | |
| 2565 | |
| 2566 ;; Initiate drag and drop | 2564 ;; Initiate drag and drop |
| 2567 (add-hook 'after-make-frame-functions 'x-dnd-init-frame) | 2565 (add-hook 'after-make-frame-functions 'x-dnd-init-frame) |
| 2568 (define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event) | 2566 (define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event) |
| 2569 | |
| 2570 ;; Let F10 do menu bar navigation. | |
| 2571 (defun x-menu-bar-open (&optional frame) | |
| 2572 "Open the menu bar if `menu-bar-mode' is on. otherwise call `tmm-menubar'." | |
| 2573 (interactive "i") | |
| 2574 (if menu-bar-mode (menu-bar-open frame) | |
| 2575 (tmm-menubar))) | |
| 2576 | |
| 2577 (and (fboundp 'menu-bar-open) | |
| 2578 (global-set-key [f10] 'x-menu-bar-open)) | |
| 2579 | 2567 |
| 2580 (defcustom x-gtk-stock-map | 2568 (defcustom x-gtk-stock-map |
| 2581 '( | 2569 '( |
| 2582 ("etc/images/new" . "gtk-new") | 2570 ("etc/images/new" . "gtk-new") |
| 2583 ("etc/images/open" . "gtk-open") | 2571 ("etc/images/open" . "gtk-open") |
| 2612 (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans) | 2600 (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans) |
| 2613 (match-string 1 file-sans))) | 2601 (match-string 1 file-sans))) |
| 2614 (value (assoc-string (or key file-sans) x-gtk-stock-map))) | 2602 (value (assoc-string (or key file-sans) x-gtk-stock-map))) |
| 2615 (and value (cdr value)))) | 2603 (and value (cdr value)))) |
| 2616 | 2604 |
| 2605 (provide 'x-win) | |
| 2606 | |
| 2617 ;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78 | 2607 ;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78 |
| 2618 ;;; x-win.el ends here | 2608 ;;; x-win.el ends here |