X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fstartup.el;h=32deb9279811ed6c990dbe616cb1d875db1e0c07;hb=f2dc6b73cf1cf279e72f9a17a235c749ff6d19a7;hp=3ac3778826040c247088e1ab9cb4475a92a9da11;hpb=976b002b16336930724ae22476014583ad022e7d;p=chise%2Fxemacs-chise.git
diff --git a/lisp/startup.el b/lisp/startup.el
index 3ac3778..32deb92 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -200,12 +200,18 @@ remaining command-line args are in the variable `command-line-args-left'.")
(princ (concat "\n" (emacs-version) "\n\n"))
(princ
(if (featurep 'x)
- (concat (emacs-name)
- " accepts all standard X Toolkit command line options.\n"
- "In addition, the")
+ (concat "When creating a window on an X display, "
+ (emacs-name)
+ " accepts all standard X Toolkit
+command line options plus the following:
+ -iconname
Use title as the icon name.
+ -mc Use color as the mouse color.
+ -cr Use color as the text-cursor foregound color.
+ -private Install a private colormap.
+
+In addition, the")
"The"))
(princ " following options are accepted:
-
-t Use TTY instead of the terminal for input
and output. This implies the -nw option.
-nw Inhibit the use of any window-system-specific
@@ -395,10 +401,15 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
debug-paths))
(startup-setup-paths-warning))
- (if (and (not inhibit-autoloads)
- lisp-directory)
- (load (expand-file-name (file-name-sans-extension autoload-file-name)
- lisp-directory) nil t))
+ (when (and (not inhibit-autoloads)
+ lisp-directory)
+ (load (expand-file-name (file-name-sans-extension autoload-file-name)
+ lisp-directory) nil t)
+ (if (featurep 'utf-2000)
+ (load (expand-file-name
+ (file-name-sans-extension autoload-file-name)
+ (expand-file-name "utf-2000" lisp-directory))
+ nil t)))
(if (not inhibit-autoloads)
(progn
@@ -962,11 +973,12 @@ XEmacs, by either running the command `xemacs-mule', or by using the X resource
"\n--\n"
(face italic "\
Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1995-1999 Electrotechnical Laboratory, JAPAN.
Copyright (C) 1990-1994 Lucid, Inc.
Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
Copyright (C) 1994-1996 Board of Trustees, University of Illinois
Copyright (C) 1995-1996 Ben Wing\n"))
-
+
((face (blue bold underline) "\nInformation, on-line help:\n\n")
"XEmacs comes with plenty of documentation...\n\n"
,@(if (string-match "beta" emacs-version)