Fix previous change.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 52b94f9bbb972d614cf53501b8cf8d7dca496c60..58572aa1d9fb0fc80a642068918ab00e83d0708b 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -46,7 +46,8 @@
 (message "Using load-path %s" load-path)
 
 ;; We don't want to have any undo records in the dumped Emacs.
-(buffer-disable-undo "*scratch*")
+(set-buffer "*scratch*")
+(setq buffer-undo-list t)
 
 (load "emacs-lisp/byte-run")
 (load "emacs-lisp/backquote")
@@ -102,6 +103,7 @@
 (load "language/devanagari")    ; This should be loaded after indian.
 (load "language/malayalam")     ; This should be loaded after indian.
 (load "language/tamil")                 ; This should be loaded after indian.
+(load "language/kannada")       ; This should be loaded after indian.
 (load "language/english")
 (load "language/ethiopic")
 (load "language/european")
@@ -190,6 +192,7 @@
 
 (load "vc-hooks")
 (load "ediff-hook")
+(if (fboundp 'x-show-tip) (load "tooltip"))
 (message "%s" (garbage-collect))
 
 ;If you want additional libraries to be preloaded and their
@@ -329,7 +332,7 @@
       (dump-emacs "emacs" "temacs")
       (message "%d pure bytes used" pure-bytes-used)
       ;; Recompute NAME now, so that it isn't set when we dump.
-      (if (not (memq system-type '(ms-dos windows-nt)))
+      (if (not (memq system-type '(ms-dos windows-nt cygwin)))
          (let ((name (concat "emacs-" emacs-version)))
            (while (string-match "[^-+_.a-zA-Z0-9]+" name)
              (setq name (concat (downcase (substring name 0 (match-beginning 0)))