2008-03-10 merge from emacs--rel--22 that partly reverted
2008-02-28 change that added initial message to *scratch* buffer
regardless of the value of `inhibit-startup-screen'.
Now keep this change in the trunk, but not in the 22 branch.
Remove unused binding `prev-buffer'. Let-bind `splash-buffer'
to the created buffer. If `concise' is non-nil, call
`display-buffer', otherwise `switch-to-buffer'. Doc fix.
(display-startup-screen): Add argument `concise' to the call to
`normal-splash-screen'.
Remove unused binding `prev-buffer'. Let-bind `splash-buffer'
to the created buffer. If `concise' is non-nil, call
`display-buffer', otherwise `switch-to-buffer'. Doc fix.
(display-startup-screen): Add argument `concise' to the call to
`normal-splash-screen'.
`initial-scratch-message' is non-nil regardless of the value of
`inhibit-startup-screen'.
(inhibit-startup-screen, initial-scratch-message): Doc fix.
(command-line-1): Move code that inserts `initial-scratch-message'
up before the if-form that checks for `inhibit-startup-screen'.
Suggested by Jonathan Rockway <jon@jrock.us>.
`initial-scratch-message' is non-nil regardless of the value of
`inhibit-startup-screen'.
(inhibit-startup-screen, initial-scratch-message): Doc fix.
(command-line-1): Move code that inserts `initial-scratch-message'
up before the if-form that checks for `inhibit-startup-screen'.
Suggested by Jonathan Rockway <jon@jrock.us>.
* startup.el (command-line): Use custom-reevaluate-setting for
transient-mark-mode.
* callint.c (syms_of_callint): Initialize Vmark_even_if_inactive
with Qt.
frame-local as done originally by multi-tty).
* startup.el (window-system): Remove. Don't make it frame-local.
* keyboard.h (struct kboard): Add Vwindow_system.
* keyboard.c (init_kboard): Set a default for Vwindow_system.
(mark_kboards): Mark Vwindow_system.
* dispnew.c (syms_of_display) <window-system>: Declare terminal-local.
(init_display): Don't set the obsolete `window-system' frame-param.
* xterm.c (x_term_init):
* w32term.c (w32_create_terminal):
* term.c (init_tty): Set Vwindow_system.
* macterm.c (mac_create_terminal): Set a keyboard (missing piece of the
multi-tty merge maybe?), copied from w32term.c. Set Vwindow_system.
* xfns.c (Fx_create_frame, x_create_tip_frame):
* w32fns.c (Fx_create_frame, x_create_tip_frame):
* macfns.c (Fx_create_frame):
Don't set the obsolete `window-system' frame-param.
* frame.h (Qwindow_system): Remove.
* frame.c (Qwindow_system): Remove. In `syms_of_frame' as well.
(Fmake_terminal_frame): Don't set obsolete `window-system' frame-param.
dismiss ("Dismiss this startup screen"). Use text "Never show
it again" for the checkbox after this button.
(fancy-startup-screen, fancy-about-screen): Put point before the
first link, so the user can quickly select links with the keyboard.
(normal-mouse-startup-screen): Add more useful text describing how
to follow a link.
leftover logic regarding dedicated frames. If showing concise startup
screen, fit window to buffer.
(command-line-1): If we will be using the splash screen, use find-file
instead of find-file-other-window to find additional files.
Add help-echo to external links and to links without description.
(fancy-splash-insert): Use help-echo from the 3rd element of the
link specification list, or "Follow this link" if it's nil. Doc fix.
`inhibit-startup-screen'.
(fancy-about-text): Use shorter label for "Ordering Manuals".
(fancy-startup-tail): Add optional arg `concise'. When `concise'
is nil, display a line with "To start..." and 3 links to useful
tasks. Display the "Dismiss" button and "Don't show this message
again" only when concise is non-nil.
(fancy-startup-screen): Call `fancy-startup-tail' with optional
arg `concise'. If CONCISE is non-nil, display a concise version
of the splash screen in another window. Otherwise, switch to the
startup buffer in the same window.
(startup-echo-area-message): Change displayed binding from
C-h C-p (describe-project) to C-h C-a (about-emacs), and change
text "about the GNU system and GNU/Linux" to "about GNU Emacs and
the GNU system".
(display-startup-screen): Fix buffer name from "*About GNU Emacs*"
to "*GNU Emacs*".
(display-about-screen): Don't check the existence of the buffer
"*About GNU Emacs*".
(display-splash-screen): Make alias to `display-startup-screen'.
(command-line-1): Rename `inhibit-startup-message' to
`inhibit-startup-screen'. Inhibit startup screen when Emacs is
started with command line options "-f", "-funcall", "-e", "-eval",
"-execute", "-insert", "-find-file", "-file", "-visit".
Inhibit startup screen when Emacs is started with a file name only
on tty (i.e. don't inhibit it when started with a file name like
"emacs FILE..." on a window system).
(command-line-1): Simplify logic of displaying the startup screen:
if file-count > 0, then display the concise version in another
window, otherwise display full version in the same window.
