aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-08-26 14:11:29 +0000
committerEli Zaretskii2005-08-26 14:11:29 +0000
commit8248b7cace199410e36858d26436266b2bbd59a5 (patch)
tree037b7f9f9e63c0f3333e84ddfa5c1d101b463b20
parent1f33471ddab9571aa1654e8b51a73fe61194d097 (diff)
downloademacs-8248b7cace199410e36858d26436266b2bbd59a5.tar.gz
emacs-8248b7cace199410e36858d26436266b2bbd59a5.zip
(truncate-lines, write-file, print-buffer)
(ps-print-buffer-faces, ps-print-buffer, split-window): Disable menu items when the frame they refer to is invisible, or when they refer to a buffer and the minibuffer is selected.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/menu-bar.el20
2 files changed, 24 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85e5dfabc00..0450dbdc61d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12005-08-26 David Reitter <david.reitter@gmail.com>
2
3 * menu-bar.el (truncate-lines, write-file, print-buffer)
4 (ps-print-buffer-faces, ps-print-buffer, split-window): Disable
5 menu items when the frame they refer to is invisible, or when they
6 refer to a buffer and the minibuffer is selected.
7
12005-08-26 Pavel Kobiakov <pk_at_work@yahoo.com> 82005-08-26 Pavel Kobiakov <pk_at_work@yahoo.com>
2 9
3 * progmodes/flymake.el (flymake-highlight-err-lines): Use 10 * progmodes/flymake.el (flymake-highlight-err-lines): Use
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1de753e75e5..302ede8c8ff 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -105,6 +105,10 @@ A large number or nil slows down menu responsiveness."
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)
109 (frame-visible-p menu-updating-frame )
110 (not (window-minibuffer-p
111 (frame-selected-window menu-updating-frame))))
108 :help "Split selected window in two windows")) 112 :help "Split selected window in two windows"))
109 113
110(define-key menu-bar-file-menu [separator-window] 114(define-key menu-bar-file-menu [separator-window]
@@ -116,6 +120,8 @@ A large number or nil slows down menu responsiveness."
116 :help "Pretty-print marked region in black and white to PostScript printer")) 120 :help "Pretty-print marked region in black and white to PostScript printer"))
117(define-key menu-bar-file-menu [ps-print-buffer] 121(define-key menu-bar-file-menu [ps-print-buffer]
118 '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer 122 '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
123 :enable (and (frame-live-p menu-updating-frame)
124 (frame-visible-p menu-updating-frame ))
119 :help "Pretty-print current buffer in black and white to PostScript printer")) 125 :help "Pretty-print current buffer in black and white to PostScript printer"))
120(define-key menu-bar-file-menu [ps-print-region-faces] 126(define-key menu-bar-file-menu [ps-print-region-faces]
121 '(menu-item "Postscript Print Region" ps-print-region-with-faces 127 '(menu-item "Postscript Print Region" ps-print-region-with-faces
@@ -123,6 +129,8 @@ A large number or nil slows down menu responsiveness."
123 :help "Pretty-print marked region to PostScript printer")) 129 :help "Pretty-print marked region to PostScript printer"))
124(define-key menu-bar-file-menu [ps-print-buffer-faces] 130(define-key menu-bar-file-menu [ps-print-buffer-faces]
125 '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces 131 '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
132 :enable (and (frame-live-p menu-updating-frame)
133 (frame-visible-p menu-updating-frame ))
126 :help "Pretty-print current buffer to PostScript printer")) 134 :help "Pretty-print current buffer to PostScript printer"))
127(define-key menu-bar-file-menu [print-region] 135(define-key menu-bar-file-menu [print-region]
128 '(menu-item "Print Region" print-region 136 '(menu-item "Print Region" print-region
@@ -130,6 +138,8 @@ A large number or nil slows down menu responsiveness."
130 :help "Print region between mark and current position")) 138 :help "Print region between mark and current position"))
131(define-key menu-bar-file-menu [print-buffer] 139(define-key menu-bar-file-menu [print-buffer]
132 '(menu-item "Print Buffer" print-buffer 140 '(menu-item "Print Buffer" print-buffer
141 :enable (and (frame-live-p menu-updating-frame)
142 (frame-visible-p menu-updating-frame ))
133 :help "Print current buffer with page headings")) 143 :help "Print current buffer with page headings"))
134 144
135(define-key menu-bar-file-menu [separator-print] 145(define-key menu-bar-file-menu [separator-print]
@@ -160,8 +170,10 @@ A large number or nil slows down menu responsiveness."
160 :help "Re-read current buffer from its file")) 170 :help "Re-read current buffer from its file"))
161(define-key menu-bar-file-menu [write-file] 171(define-key menu-bar-file-menu [write-file]
162 '(menu-item "Save As..." write-file 172 '(menu-item "Save As..." write-file
163 :enable (not (window-minibuffer-p 173 :enable (and (frame-live-p menu-updating-frame)
164 (frame-selected-window menu-updating-frame))) 174 (frame-visible-p menu-updating-frame )
175 (not (window-minibuffer-p
176 (frame-selected-window menu-updating-frame))))
165 :help "Write current buffer to another file")) 177 :help "Write current buffer to another file"))
166(define-key menu-bar-file-menu [save-buffer] 178(define-key menu-bar-file-menu [save-buffer]
167 '(menu-item "Save" save-buffer 179 '(menu-item "Save" save-buffer
@@ -1030,7 +1042,9 @@ mail status in mode line"))
1030 '(menu-item "Truncate Long Lines in this Buffer" 1042 '(menu-item "Truncate Long Lines in this Buffer"
1031 toggle-truncate-lines 1043 toggle-truncate-lines
1032 :help "Truncate long lines on the screen" 1044 :help "Truncate long lines on the screen"
1033 :button (:toggle . truncate-lines))) 1045 :button (:toggle . truncate-lines)
1046 :enable (and (frame-live-p menu-updating-frame)
1047 (frame-visible-p menu-updating-frame))))
1034 1048
1035(define-key menu-bar-options-menu [highlight-separator] 1049(define-key menu-bar-options-menu [highlight-separator]
1036 '("--")) 1050 '("--"))