aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/startup.el3
2 files changed, 13 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56f9588264a..e1dbf0ae27d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
12000-02-09 Dave Love <fx@gnu.org>
2
3 * bindings.el (mode-line-input-method-map): New variable.
4 (mode-line-mule-info): Use it; fix last change.
5 (mode-line-mode-menu): Move definition.
6 (mode-line-mouse-sensitive-p): Deleted.
7 (mode-line-mode-name): Don't use mode-line-mouse-sensitive-p.
8 (make-mode-line-mouse-sensitive): Deleted. Body moved to top
9 level.
10
11 * startup.el (command-line-1): Don't call
12 make-mode-line-mouse-sensitive.
13
12000-02-07 Francesco Potorti` <F.Potorti@cnuce.cnr.it> 142000-02-07 Francesco Potorti` <F.Potorti@cnuce.cnr.it>
2 15
3 * mail/rmail.el (rmail-retry-failure): Use 16 * mail/rmail.el (rmail-retry-failure): Use
diff --git a/lisp/startup.el b/lisp/startup.el
index e0fac712788..e997eaea72f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -820,9 +820,6 @@ If this is nil, no message will be displayed."
820 "For information about the GNU Project and its goals, type C-h C-p." 820 "For information about the GNU Project and its goals, type C-h C-p."
821 (substitute-command-keys 821 (substitute-command-keys
822 "For information about the GNU Project and its goals, type \\[describe-project].")))) 822 "For information about the GNU Project and its goals, type \\[describe-project]."))))
823 (when (and (not noninteractive)
824 (memq window-system '(x w32 pc)))
825 (make-mode-line-mouse-sensitive))
826 (if (null command-line-args-left) 823 (if (null command-line-args-left)
827 (cond ((and (not inhibit-startup-message) (not noninteractive) 824 (cond ((and (not inhibit-startup-message) (not noninteractive)
828 ;; Don't clobber a non-scratch buffer if init file 825 ;; Don't clobber a non-scratch buffer if init file