aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/startup.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7608adc8f89..cc5e9071802 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12001-05-17 Gerd Moellmann <gerd@gnu.org> 12001-05-17 Gerd Moellmann <gerd@gnu.org>
2 2
3 * startup.el (fancy-splash-screens): Ignore events on the mode-line.
4
3 * net/ange-ftp.el (ange-ftp-write-region): Make sure to record the 5 * net/ange-ftp.el (ange-ftp-write-region): Make sure to record the
4 last coding system used before calling set-buffer-modified-p 6 last coding system used before calling set-buffer-modified-p
5 because that function changes last-coding-system. 7 because that function changes last-coding-system.
diff --git a/lisp/startup.el b/lisp/startup.el
index 4006ca70092..84266811be1 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1181,11 +1181,12 @@ where FACE is a valid face specification, as it can be used with
1181 (use-local-map map) 1181 (use-local-map map)
1182 (define-key map [t] 'fancy-splash-default-action) 1182 (define-key map [t] 'fancy-splash-default-action)
1183 (define-key map [mouse-movement] 'ignore) 1183 (define-key map [mouse-movement] 'ignore)
1184 (define-key map [mode-line t] 'ignore)
1184 (setq cursor-type nil 1185 (setq cursor-type nil
1185 display-hourglass nil 1186 display-hourglass nil
1186 buffer-undo-list t 1187 buffer-undo-list t
1187 mode-line-format 1188 mode-line-format (propertize "---- %b %-"
1188 (propertize "---- %b %-" 'face '(:weight bold)) 1189 'face '(:weight bold))
1189 fancy-splash-stop-time (+ (float-time) 1190 fancy-splash-stop-time (+ (float-time)
1190 (max 60 fancy-splash-max-time)) 1191 (max 60 fancy-splash-max-time))
1191 timer (run-with-timer 0 fancy-splash-delay 1192 timer (run-with-timer 0 fancy-splash-delay