aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-08-29 09:31:50 +0000
committerGerd Moellmann2001-08-29 09:31:50 +0000
commitff4ec1f7bda9fff1ff7a0550eb4170a7f6cc1261 (patch)
tree3beb857b862406a3ff710f33ac1bfe1ee28367a0
parent042e6d91ae38a5a5ad76d1acae4920eb71347cb0 (diff)
downloademacs-ff4ec1f7bda9fff1ff7a0550eb4170a7f6cc1261.tar.gz
emacs-ff4ec1f7bda9fff1ff7a0550eb4170a7f6cc1261.zip
(fancy-splash-screens): Temporarily set
minor-mode-map-alist to nil while displaying splash screens.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7f0e617250..8878c8f1e09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-08-29 Gerd Moellmann <gerd@gnu.org>
2
3 * startup.el (fancy-splash-screens): Temporarily set
4 minor-mode-map-alist to nil while displaying splash screens.
5
12001-08-28 Andre Spiegel <spiegel@gnu.org> 62001-08-28 Andre Spiegel <spiegel@gnu.org>
2 7
3 * vc.el (vc-revert-file): Call the backend even if the FILE's 8 * vc.el (vc-revert-file): Call the backend even if the FILE's
diff --git a/lisp/startup.el b/lisp/startup.el
index 6b82b2b7b01..45de4ea80a2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1185,6 +1185,7 @@ where FACE is a valid face specification, as it can be used with
1185 (setq tab-width 20) 1185 (setq tab-width 20)
1186 (let ((old-hourglass display-hourglass) 1186 (let ((old-hourglass display-hourglass)
1187 (splash-buffer (current-buffer)) 1187 (splash-buffer (current-buffer))
1188 (old-minor-mode-map-alist minor-mode-map-alist)
1188 timer) 1189 timer)
1189 (catch 'stop-splashing 1190 (catch 'stop-splashing
1190 (unwind-protect 1191 (unwind-protect
@@ -1195,6 +1196,7 @@ where FACE is a valid face specification, as it can be used with
1195 (define-key map [mode-line t] 'ignore) 1196 (define-key map [mode-line t] 'ignore)
1196 (setq cursor-type nil 1197 (setq cursor-type nil
1197 display-hourglass nil 1198 display-hourglass nil
1199 minor-mode-map-alist nil
1198 buffer-undo-list t 1200 buffer-undo-list t
1199 mode-line-format (propertize "---- %b %-" 1201 mode-line-format (propertize "---- %b %-"
1200 'face '(:weight bold)) 1202 'face '(:weight bold))
@@ -1205,7 +1207,8 @@ where FACE is a valid face specification, as it can be used with
1205 splash-buffer)) 1207 splash-buffer))
1206 (recursive-edit)) 1208 (recursive-edit))
1207 (cancel-timer timer) 1209 (cancel-timer timer)
1208 (setq display-hourglass old-hourglass) 1210 (setq display-hourglass old-hourglass
1211 minor-mode-map-alist old-minor-mode-map-alist)
1209 (kill-buffer splash-buffer))))) 1212 (kill-buffer splash-buffer)))))
1210 1213
1211 1214