Mercurial > emacs

comparison lisp/menu-bar.el @ 11067:a73305d0a6b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(menu-bar-files-menu): Renamed from ...-file-menu. (menu-bar-tools-menu, menu-bar-search-menu): New menu bar menus. Items moved from Edit and Files menus. Add Split Window, One Window, Find Tag and Postscript print menu items. (nonincremental-search-forward, nonincremental-search-backward) (nonincremental-re-search-forward, nonincremental-re-search-backward) (noninteractive-repeat-search-forward) (noninteractive-repeat-search-backward) (noninteractive-repeat-re-search-forward) (noninteractive-repeat-re-search-backward): New commands.
author Richard M. Stallman <rms@gnu.org>
date Sun, 19 Mar 1995 21:11:13 +0000
parents 796be3f4f8a1
children 238b3b5adefd
comparison
equal deleted inserted replaced
11066:2a3d961889b4 11067:a73305d0a6b4
26 ;; Don't clobber an existing menu-bar keymap, to preserve any menu-bar key 26 ;; Don't clobber an existing menu-bar keymap, to preserve any menu-bar key
27 ;; definitions made in loaddefs.el. 27 ;; definitions made in loaddefs.el.
28 (or (lookup-key global-map [menu-bar]) 28 (or (lookup-key global-map [menu-bar])
29 (define-key global-map [menu-bar] (make-sparse-keymap "menu-bar"))) 29 (define-key global-map [menu-bar] (make-sparse-keymap "menu-bar")))
30 (defvar menu-bar-help-menu (make-sparse-keymap "Help")) 30 (defvar menu-bar-help-menu (make-sparse-keymap "Help"))
31 ;; Put Help item last. 31
32 ;; Force Help item to come last, after the major mode's own items.
32 (setq menu-bar-final-items '(help)) 33 (setq menu-bar-final-items '(help))
34
33 (define-key global-map [menu-bar help] (cons "Help" menu-bar-help-menu)) 35 (define-key global-map [menu-bar help] (cons "Help" menu-bar-help-menu))
36 (defvar menu-bar-search-menu (make-sparse-keymap "Search"))
37 (define-key global-map [menu-bar search] (cons "Search" menu-bar-search-menu))
34 (defvar menu-bar-edit-menu (make-sparse-keymap "Edit")) 38 (defvar menu-bar-edit-menu (make-sparse-keymap "Edit"))
35 (define-key global-map [menu-bar edit] (cons "Edit" menu-bar-edit-menu)) 39 (define-key global-map [menu-bar edit] (cons "Edit" menu-bar-edit-menu))
36 (defvar menu-bar-file-menu (make-sparse-keymap "File")) 40 (defvar menu-bar-tools-menu (make-sparse-keymap "Tools"))
37 (define-key global-map [menu-bar file] (cons "File" menu-bar-file-menu)) 41 (define-key global-map [menu-bar tools] (cons "Tools" menu-bar-tools-menu))
42 (defvar menu-bar-files-menu (make-sparse-keymap "Files"))
43 (define-key global-map [menu-bar files] (cons "Files" menu-bar-files-menu))
38 44
39 (defvar vc-menu-map (make-sparse-keymap "Version Control")) 45 (defvar vc-menu-map (make-sparse-keymap "Version Control"))
40 46
41 (define-key menu-bar-file-menu [exit-emacs] 47 (define-key menu-bar-tools-menu [calendar] '("Calendar" . calendar))
48 (define-key menu-bar-tools-menu [rmail] '("Read Mail" . rmail))
49 (define-key menu-bar-tools-menu [gnus] '("Read Net News" . gnus))
50
51 (define-key menu-bar-tools-menu [separator-vc]
52 '("--"))
53
54 (define-key menu-bar-tools-menu [vc-menu]
55 (cons "Version Control" vc-menu-map))
56
57 (define-key menu-bar-tools-menu [separator-compare]
58 '("--"))
59
60 (define-key menu-bar-tools-menu [epatch]
61 '("Apply Patch" . menu-bar-epatch-menu))
62 (define-key menu-bar-tools-menu [ediff-merge]
63 '("Merge" . menu-bar-ediff-merge-menu))
64 (define-key menu-bar-tools-menu [ediff]
65 '("Compare" . menu-bar-ediff-menu))
66
67 (define-key menu-bar-tools-menu [separator-print]
68 '("--"))
69
70 (put 'print-region 'menu-enable 'mark-active)
71 (put 'ps-print-region-with-faces 'menu-enable 'mark-active)
72
73 (define-key menu-bar-tools-menu [ps-print-region]
74 '("Postscript Print Region" . ps-print-region-with-faces))
75 (define-key menu-bar-tools-menu [ps-print-buffer]
76 '("Postscript Print Buffer" . ps-print-buffer-with-faces))
77 (define-key menu-bar-tools-menu [print-region]
78 '("Print Region" . print-region))
79 (define-key menu-bar-tools-menu [print-buffer]
80 '("Print Buffer" . print-buffer))
81
82 (define-key menu-bar-files-menu [exit-emacs]
42 '("Exit Emacs" . save-buffers-kill-emacs)) 83 '("Exit Emacs" . save-buffers-kill-emacs))
43 84
44 (define-key menu-bar-file-menu [separator-compare] 85 (define-key menu-bar-files-menu [separator-exit]
45 '("--")) 86 '("--"))
46 87
47 (define-key menu-bar-file-menu [epatch] 88 (define-key menu-bar-files-menu [one-window]
48 '("Apply Patch" . menu-bar-epatch-menu)) 89 '("One Window" . delete-other-windows))
49 (define-key menu-bar-file-menu [ediff-merge] 90
50 '("Merge" . menu-bar-ediff-merge-menu)) 91 (define-key menu-bar-files-menu [split-window]
51 (define-key menu-bar-file-menu [ediff] 92 '("Split Window" . split-window-vertically))
52 '("Compare" . menu-bar-ediff-menu))
53
54 (define-key menu-bar-file-menu [separator-misc]
55 '("--"))
56
57 (define-key menu-bar-file-menu [calendar] '("Calendar" . calendar))
58 (define-key menu-bar-file-menu [rmail] '("Read Mail" . rmail))
59 (define-key menu-bar-file-menu [gnus] '("Read Net News" . gnus))
60 93
61 (if (fboundp 'delete-frame) 94 (if (fboundp 'delete-frame)
62 (progn 95 (progn
63 (define-key menu-bar-file-menu [separator-frames] 96 (define-key menu-bar-files-menu [delete-frame]
64 '("--"))
65
66 (define-key menu-bar-file-menu [delete-frame]
67 '("Delete Frame" . delete-frame)) 97 '("Delete Frame" . delete-frame))
68 (define-key menu-bar-file-menu [make-frame-on-display] 98 (define-key menu-bar-files-menu [make-frame-on-display]
69 '("Make Frame on Display" . make-frame-on-display)) 99 '("Open New Display..." . make-frame-on-display))
70 (define-key menu-bar-file-menu [make-frame] 100 (define-key menu-bar-files-menu [make-frame]
71 '("Make New Frame" . make-frame)))) 101 '("Make New Frame" . make-frame))))
72 102
73 (define-key menu-bar-file-menu [separator-buffers] 103 (define-key menu-bar-files-menu [separator-buffers]
74 '("--")) 104 '("--"))
75 105
76 (define-key menu-bar-file-menu [bookmark] 106 (define-key menu-bar-files-menu [kill-buffer]
77 '("Bookmarks" . menu-bar-bookmark-map)) 107 '("Kill Current Buffer" . kill-this-buffer))
78 (define-key menu-bar-file-menu [print-buffer] 108 (define-key menu-bar-files-menu [insert-file]
79 '("Print Buffer" . print-buffer))
80 (define-key menu-bar-file-menu [kill-buffer]
81 '("Kill (Current) Buffer" . kill-this-buffer))
82 (define-key menu-bar-file-menu [insert-file]
83 '("Insert File" . insert-file)) 109 '("Insert File" . insert-file))
84 (define-key menu-bar-file-menu [vc-menu] 110 (define-key menu-bar-files-menu [revert-buffer]
85 (cons "Version Control" vc-menu-map))
86 (define-key menu-bar-file-menu [revert-buffer]
87 '("Revert Buffer" . revert-buffer)) 111 '("Revert Buffer" . revert-buffer))
88 (define-key menu-bar-file-menu [write-file] 112 (define-key menu-bar-files-menu [write-file]
89 '("Save Buffer As..." . write-file)) 113 '("Save Buffer As..." . write-file))
90 (define-key menu-bar-file-menu [save-buffer] '("Save Buffer" . save-buffer)) 114 (define-key menu-bar-files-menu [save-buffer] '("Save Buffer" . save-buffer))
91 (define-key menu-bar-file-menu [dired] '("Open Directory..." . dired)) 115 (define-key menu-bar-files-menu [dired] '("Open Directory..." . dired))
92 (define-key menu-bar-file-menu [open-file] '("Open File..." . find-file)) 116 (define-key menu-bar-files-menu [open-file] '("Open File..." . find-file))
93 117
94 ;; This is just one element of the ediff menu--the first. 118 ;; This is just one element of the ediff menu--the first.
95 (define-key menu-bar-ediff-menu [window] 119 (define-key menu-bar-ediff-menu [window]
96 '("This Window And Next Window" . compare-windows)) 120 '("This Window And Next Window" . compare-windows))
97 121
98 (define-key menu-bar-edit-menu [query-replace] 122 (defun nonincremental-search-forward (string)
123 "Read a string and search for it nonincrementally."
124 (interactive "sSearch for string: ")
125 (if (equal string "")
126 (search-forward (car search-ring))
127 (isearch-update-ring string nil)
128 (search-forward string)))
129
130 (defun nonincremental-search-backward (string)
131 "Read a string and search backward for it nonincrementally."
132 (interactive "sSearch for string: ")
133 (if (equal string "")
134 (search-backward (car search-ring))
135 (isearch-update-ring string nil)
136 (search-backward string)))
137
138 (defun nonincremental-re-search-forward (string)
139 "Read a regular expression and search for it nonincrementally."
140 (interactive "sSearch for regexp: ")
141 (if (equal string "")
142 (re-search-forward (car regexp-search-ring))
143 (isearch-update-ring string t)
144 (re-search-forward string)))
145
146 (defun nonincremental-re-search-backward (string)
147 "Read a regular expression and search backward for it nonincrementally."
148 (interactive "sSearch for regexp: ")
149 (if (equal string "")
150 (re-search-backward (car regexp-search-ring))
151 (isearch-update-ring string t)
152 (re-search-backward string)))
153
154 (defun noninteractive-repeat-search-forward ()
155 "Search forward for the previous search string."
156 (interactive)
157 (search-forward (car search-ring)))
158
159 (defun noninteractive-repeat-search-backward ()
160 "Search backward for the previous search string."
161 (interactive)
162 (search-backward (car search-ring)))
163
164 (defun noninteractive-repeat-re-search-forward ()
165 "Search forward for the previous regular expression."
166 (interactive)
167 (re-search-forward (car regexp-search-ring)))
168
169 (defun noninteractive-repeat-re-search-backward ()
170 "Search backward for the previous regular expression."
171 (interactive)
172 (re-search-backward (car regexp-search-ring)))
173
174 (define-key menu-bar-search-menu [query-replace]
99 '("Query Replace" . query-replace)) 175 '("Query Replace" . query-replace))
100 (define-key menu-bar-edit-menu [re-search-back] 176 (define-key menu-bar-search-menu [find-tag]
101 '("Regexp Search Backwards" . re-search-backward)) 177 '("Find Tag" . find-tag))
102 (define-key menu-bar-edit-menu [search-back] 178 (put 'find-tag 'menu-enable 'tags-table-list)
103 '("Search Backwards" . search-backward)) 179 (define-key menu-bar-search-menu [bookmark]
104 (define-key menu-bar-edit-menu [re-search-fwd] 180 '("Bookmarks" . menu-bar-bookmark-map))
105 '("Regexp Search" . re-search-forward)) 181
106 (define-key menu-bar-edit-menu [search-fwd] 182 (define-key menu-bar-search-menu [separator-search]
107 '("Search" . search-forward)) 183 '("--"))
108 184
109 (define-key menu-bar-edit-menu [separator-misc] 185 (define-key menu-bar-search-menu [nonincremental-repeat-re-search-back]
110 '("--")) 186 '("Repeat Regexp Backwards" . nonincremental-repeat-re-search-backward))
111 187 (define-key menu-bar-search-menu [nonincremental-repeat-search-back]
188 '("Repeat Backwards" . nonincremental-repeat-search-backward))
189 (define-key menu-bar-search-menu [nonincremental-repeat-re-search-fwd]
190 '("Repeat Regexp" . nonincremental-repeat-re-search-forward))
191 (define-key menu-bar-search-menu [nonincremental-repeat-search-fwd]
192 '("Repeat Search" . nonincremental-repeat-search-forward))
193
194 (define-key menu-bar-search-menu [separator-repeat]
195 '("--"))
196
197 (define-key menu-bar-search-menu [re-search-back]
198 '("Regexp Search Backwards" . nonincremental-re-search-backward))
199 (define-key menu-bar-search-menu [search-back]
200 '("Search Backwards" . nonincremental-search-backward))
201 (define-key menu-bar-search-menu [re-search-fwd]
202 '("Regexp Search" . nonincremental-re-search-forward))
203 (define-key menu-bar-search-menu [search-fwd]
204 '("Search" . nonincremental-search-forward))
205
112 (define-key menu-bar-edit-menu [spell] '("Spell" . ispell-menu-map)) 206 (define-key menu-bar-edit-menu [spell] '("Spell" . ispell-menu-map))
113 (define-key menu-bar-edit-menu [fill] '("Fill" . fill-region)) 207 (define-key menu-bar-edit-menu [fill] '("Fill" . fill-region))
114 208
115 (define-key menu-bar-edit-menu [separator-edit] 209 (define-key menu-bar-edit-menu [separator-edit]
116 '("--")) 210 '("--"))