comparison lisp/menu-bar.el @ 65399:e64417edd9c6

("Split Window", "Postscript Print Buffer (B+W)") ("Postscript Print Buffer", "Print Region", "Save As...") ("Save", "Insert File...", "Open Directory...") ("Open File...", "Visit New File..."") ("Truncate Long Lines in this Buffer"): Don't look at menu-updating-frame if this display does not support multiple frames.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 09 Sep 2005 13:40:46 +0000
parents a1ea2d5f0190
children b50dda01c73d
comparison
equal deleted inserted replaced
65398:61acf14bf03f 65399:e64417edd9c6
103 :enable (not (one-window-p t nil)) 103 :enable (not (one-window-p t nil))
104 :help "Selected window grows to fill the whole frame")) 104 :help "Selected window grows to fill the whole frame"))
105 105
106 (define-key menu-bar-file-menu [split-window] 106 (define-key menu-bar-file-menu [split-window]
107 '(menu-item "Split Window" split-window-vertically 107 '(menu-item "Split Window" split-window-vertically
108 :enable (and (frame-live-p menu-updating-frame) 108 :enable (or (not (display-multi-frame-p))
109 (frame-visible-p menu-updating-frame ) 109 (and (frame-live-p menu-updating-frame)
110 (not (window-minibuffer-p 110 (frame-visible-p menu-updating-frame )
111 (frame-selected-window menu-updating-frame)))) 111 (not (window-minibuffer-p
112 (frame-selected-window
113 menu-updating-frame)))))
112 :help "Split selected window in two windows")) 114 :help "Split selected window in two windows"))
113 115
114 (define-key menu-bar-file-menu [separator-window] 116 (define-key menu-bar-file-menu [separator-window]
115 '(menu-item "--")) 117 '(menu-item "--"))
116 118
118 '(menu-item "Postscript Print Region (B+W)" ps-print-region 120 '(menu-item "Postscript Print Region (B+W)" ps-print-region
119 :enable mark-active 121 :enable mark-active
120 :help "Pretty-print marked region in black and white to PostScript printer")) 122 :help "Pretty-print marked region in black and white to PostScript printer"))
121 (define-key menu-bar-file-menu [ps-print-buffer] 123 (define-key menu-bar-file-menu [ps-print-buffer]
122 '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer 124 '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
123 :enable (and (frame-live-p menu-updating-frame) 125 :enable (or (not (display-multi-frame-p))
124 (frame-visible-p menu-updating-frame )) 126 (and (frame-live-p menu-updating-frame)
127 (frame-visible-p menu-updating-frame)))
125 :help "Pretty-print current buffer in black and white to PostScript printer")) 128 :help "Pretty-print current buffer in black and white to PostScript printer"))
126 (define-key menu-bar-file-menu [ps-print-region-faces] 129 (define-key menu-bar-file-menu [ps-print-region-faces]
127 '(menu-item "Postscript Print Region" ps-print-region-with-faces 130 '(menu-item "Postscript Print Region" ps-print-region-with-faces
128 :enable mark-active 131 :enable mark-active
129 :help "Pretty-print marked region to PostScript printer")) 132 :help "Pretty-print marked region to PostScript printer"))
130 (define-key menu-bar-file-menu [ps-print-buffer-faces] 133 (define-key menu-bar-file-menu [ps-print-buffer-faces]
131 '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces 134 '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
132 :enable (and (frame-live-p menu-updating-frame) 135 :enable (or (not (display-multi-frame-p))
133 (frame-visible-p menu-updating-frame )) 136 (and (frame-live-p menu-updating-frame)
137 (frame-visible-p menu-updating-frame)))
134 :help "Pretty-print current buffer to PostScript printer")) 138 :help "Pretty-print current buffer to PostScript printer"))
135 (define-key menu-bar-file-menu [print-region] 139 (define-key menu-bar-file-menu [print-region]
136 '(menu-item "Print Region" print-region 140 '(menu-item "Print Region" print-region
137 :enable mark-active 141 :enable mark-active
138 :help "Print region between mark and current position")) 142 :help "Print region between mark and current position"))
139 (define-key menu-bar-file-menu [print-buffer] 143 (define-key menu-bar-file-menu [print-buffer]
140 '(menu-item "Print Buffer" print-buffer 144 '(menu-item "Print Buffer" print-buffer
141 :enable (and (frame-live-p menu-updating-frame) 145 :enable (or (not (display-multi-frame-p))
142 (frame-visible-p menu-updating-frame )) 146 (and (frame-live-p menu-updating-frame)
147 (frame-visible-p menu-updating-frame)))
143 :help "Print current buffer with page headings")) 148 :help "Print current buffer with page headings"))
144 149
145 (define-key menu-bar-file-menu [separator-print] 150 (define-key menu-bar-file-menu [separator-print]
146 '(menu-item "--")) 151 '(menu-item "--"))
147 152
168 (not (verify-visited-file-modtime 173 (not (verify-visited-file-modtime
169 (current-buffer)))))) 174 (current-buffer))))))
170 :help "Re-read current buffer from its file")) 175 :help "Re-read current buffer from its file"))
171 (define-key menu-bar-file-menu [write-file] 176 (define-key menu-bar-file-menu [write-file]
172 '(menu-item "Save As..." write-file 177 '(menu-item "Save As..." write-file
173 :enable (and (frame-live-p menu-updating-frame) 178 :enable (or (not (display-multi-frame-p))
174 (frame-visible-p menu-updating-frame ) 179 (and (frame-live-p menu-updating-frame)
175 (not (window-minibuffer-p 180 (frame-visible-p menu-updating-frame )
176 (frame-selected-window menu-updating-frame)))) 181 (not (window-minibuffer-p
182 (frame-selected-window
183 menu-updating-frame)))))
177 :help "Write current buffer to another file")) 184 :help "Write current buffer to another file"))
178 (define-key menu-bar-file-menu [save-buffer] 185 (define-key menu-bar-file-menu [save-buffer]
179 '(menu-item "Save" save-buffer 186 '(menu-item "Save" save-buffer
180 :enable (and (buffer-modified-p) 187 :enable (and (buffer-modified-p)
181 (buffer-file-name) 188 (buffer-file-name)
182 (not (window-minibuffer-p 189 (or (not (display-multi-frame-p))
183 (frame-selected-window menu-updating-frame)))) 190 (not (window-minibuffer-p
191 (frame-selected-window
192 menu-updating-frame)))))
184 :help "Save current buffer to its file")) 193 :help "Save current buffer to its file"))
185 194
186 (define-key menu-bar-file-menu [separator-save] 195 (define-key menu-bar-file-menu [separator-save]
187 '(menu-item "--")) 196 '(menu-item "--"))
188 197
190 '(menu-item "Close" kill-this-buffer 199 '(menu-item "Close" kill-this-buffer
191 :enable (kill-this-buffer-enabled-p) 200 :enable (kill-this-buffer-enabled-p)
192 :help "Discard (kill) current buffer")) 201 :help "Discard (kill) current buffer"))
193 (define-key menu-bar-file-menu [insert-file] 202 (define-key menu-bar-file-menu [insert-file]
194 '(menu-item "Insert File..." insert-file 203 '(menu-item "Insert File..." insert-file
195 :enable (not (window-minibuffer-p 204 :enable (or (not (display-multi-frame-p))
196 (frame-selected-window menu-updating-frame))) 205 (and (not (window-minibuffer-p
206 (frame-selected-window
207 menu-updating-frame)))))
197 :help "Insert another file into current buffer")) 208 :help "Insert another file into current buffer"))
198 (define-key menu-bar-file-menu [dired] 209 (define-key menu-bar-file-menu [dired]
199 '(menu-item "Open Directory..." dired 210 '(menu-item "Open Directory..." dired
200 :enable (not (window-minibuffer-p 211 :enable (or (not (display-multi-frame-p))
201 (frame-selected-window menu-updating-frame))) 212 (not (window-minibuffer-p
213 (frame-selected-window menu-updating-frame))))
202 :help "Read a directory, operate on its files")) 214 :help "Read a directory, operate on its files"))
203 (define-key menu-bar-file-menu [open-file] 215 (define-key menu-bar-file-menu [open-file]
204 '(menu-item "Open File..." find-file-existing 216 '(menu-item "Open File..." find-file-existing
205 :enable (not (window-minibuffer-p 217 :enable (or (not (display-multi-frame-p))
206 (frame-selected-window menu-updating-frame))) 218 (not (window-minibuffer-p
219 (frame-selected-window menu-updating-frame))))
207 :help "Read an existing file into an Emacs buffer")) 220 :help "Read an existing file into an Emacs buffer"))
208 (define-key menu-bar-file-menu [new-file] 221 (define-key menu-bar-file-menu [new-file]
209 '(menu-item "Visit New File..." find-file 222 '(menu-item "Visit New File..." find-file
210 :enable (not (window-minibuffer-p 223 :enable (or (not (display-multi-frame-p))
211 (frame-selected-window menu-updating-frame))) 224 (not (window-minibuffer-p
225 (frame-selected-window menu-updating-frame))))
212 :help "Read or create a file and edit it")) 226 :help "Read or create a file and edit it"))
213 227
214 228
215 ;; The "Edit" menu items 229 ;; The "Edit" menu items
216 230
1041 (define-key menu-bar-options-menu [truncate-lines] 1055 (define-key menu-bar-options-menu [truncate-lines]
1042 '(menu-item "Truncate Long Lines in this Buffer" 1056 '(menu-item "Truncate Long Lines in this Buffer"
1043 toggle-truncate-lines 1057 toggle-truncate-lines
1044 :help "Truncate long lines on the screen" 1058 :help "Truncate long lines on the screen"
1045 :button (:toggle . truncate-lines) 1059 :button (:toggle . truncate-lines)
1046 :enable (and (frame-live-p menu-updating-frame) 1060 :enable (or (not (display-multi-frame-p))
1047 (frame-visible-p menu-updating-frame)))) 1061 (and (frame-live-p menu-updating-frame)
1062 (frame-visible-p menu-updating-frame)))))
1048 1063
1049 (define-key menu-bar-options-menu [highlight-separator] 1064 (define-key menu-bar-options-menu [highlight-separator]
1050 '("--")) 1065 '("--"))
1051 (define-key menu-bar-options-menu [highlight-paren-mode] 1066 (define-key menu-bar-options-menu [highlight-paren-mode]
1052 (menu-bar-make-mm-toggle show-paren-mode 1067 (menu-bar-make-mm-toggle show-paren-mode