Contents in 1999-06-04-13 of release-21-2.

[chise/xemacs-chise.git.1] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 01a3d3f..8a73014 100644 (file)
--- 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)
     (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 <title>     Use title as the icon name.
+  -mc <color>           Use color as the mouse color.
+  -cr <color>           Use color as the text-cursor foregound color.
+  -private              Install a private colormap.
+
+In addition, the")

        "The"))
     (princ " following options are accepted:
        "The"))
     (princ " following options are accepted:

-

   -t <device>           Use TTY <device> instead of the terminal for input
                         and output.  This implies the -nw option.
   -nw                   Inhibit the use of any window-system-specific
   -t <device>           Use TTY <device> instead of the terminal for input
                         and output.  This implies the -nw option.
   -nw                   Inhibit the use of any window-system-specific

@@ -961,7 +967,7 @@ XEmacs, by either running the command `xemacs-mule', or by using the X resource
       ": how to get the latest version\n")
      "\n--\n"
      (face italic "\
       ": how to get the latest version\n")
      "\n--\n"
      (face italic "\

-Copyright (C) 1985-1998 Free Software Foundation, Inc.
+Copyright (C) 1985-1999 Free Software Foundation, Inc.

 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) 1990-1994 Lucid, Inc.
 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois

@@ -984,7 +990,7 @@ Copyright (C) 1995-1996 Ben Wing\n"))
       (face bold "Help") " menu)\n")
      ((key info) ": read the on-line documentation\n\n")
      ((key describe-project) ": read about the GNU project\n")
       (face bold "Help") " menu)\n")
      ((key info) ": read the on-line documentation\n\n")
      ((key describe-project) ": read about the GNU project\n")

-     ((key about-xemacs) ": see who's developping XEmacs\n"))
+     ((key about-xemacs) ": see who's developing XEmacs\n"))

 
     ((face (blue bold underline) "\nUseful stuff:\n\n")
      "Things that you should know rather quickly...\n\n"
 
     ((face (blue bold underline) "\nUseful stuff:\n\n")
      "Things that you should know rather quickly...\n\n"