[Emacs-diffs] Changes to emacs/src/emacs.c

[Jan Djärv]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.376 emacs/src/emacs.c:1.377
*** emacs/src/emacs.c:1.376     Fri Sep 30 22:38:15 2005
--- emacs/src/emacs.c   Sun Oct  9 06:57:00 2005
***************
*** 311,317 ****
  --fullscreen, -fs               make first frame fullscreen\n\
  --fullwidth, -fw                make the first frame wide as the screen\n\
  --geometry, -g GEOMETRY         window geometry\n\
! --icon-type, -i                 use picture of gnu for Emacs icon\n\
  --iconic                        start Emacs in iconified state\n\
  --internal-border, -ib WIDTH    width between text and main border\n\
  --line-spacing, -lsp PIXELS     additional space to put between lines\n\
--- 311,317 ----
  --fullscreen, -fs               make first frame fullscreen\n\
  --fullwidth, -fw                make the first frame wide as the screen\n\
  --geometry, -g GEOMETRY         window geometry\n\
! --no-bitmap-icon, -nb           do not use picture of gnu for Emacs icon\n\
  --iconic                        start Emacs in iconified state\n\
  --internal-border, -ib WIDTH    width between text and main border\n\
  --line-spacing, -lsp PIXELS     additional space to put between lines\n\
***************
*** 1828,1835 ****
    { "-u", "--user", 30, 1 },
    { "-user", 0, 30, 1 },
    { "-debug-init", "--debug-init", 20, 0 },
!   { "-i", "--icon-type", 15, 0 },
!   { "-itype", 0, 15, 0 },
    { "-iconic", "--iconic", 15, 0 },
    { "-D", "--basic-display", 12, 0},
    { "-basic-display", 0, 12, 0},
--- 1828,1834 ----
    { "-u", "--user", 30, 1 },
    { "-user", 0, 30, 1 },
    { "-debug-init", "--debug-init", 20, 0 },
!   { "-nb", "--no-bitmap-icon", 15, 0 },
    { "-iconic", "--iconic", 15, 0 },
    { "-D", "--basic-display", 12, 0},
    { "-basic-display", 0, 12, 0},