annotate lisp/startup.el @ 97321:299a284fd85c

Fix quoting.
author Andreas Schwab <schwab@suse.de>
date Wed, 06 Aug 2008 09:29:17 +0000
parents c3512b2085a0
children bf45b2dcafff
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 650
diff changeset
1 ;;; startup.el --- process Emacs shell arguments
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 650
diff changeset
2
60415
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
3 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
87558
b848b52f4da3 (fancy-about-screen): Remove reference to deleted
Glenn Morris <rgm@gnu.org>
parents: 87519
diff changeset
4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
b848b52f4da3 (fancy-about-screen): Remove reference to deleted
Glenn Morris <rgm@gnu.org>
parents: 87519
diff changeset
5 ;; Free Software Foundation, Inc.
840
113281b361ec *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 823
diff changeset
6
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 779
diff changeset
7 ;; Maintainer: FSF
814
38b2499cb3e9 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 789
diff changeset
8 ;; Keywords: internal
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 779
diff changeset
9
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94512
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94512
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94512
diff changeset
15 ;; (at your option) any later version.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 ;; GNU General Public License for more details.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94512
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 779
diff changeset
25 ;;; Commentary:
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
54099
a401292753e2 Remove table of command line arguments from the Commentary section.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 52553
diff changeset
27 ;; This file parses the command line and gets Emacs running. Options
a401292753e2 Remove table of command line arguments from the Commentary section.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 52553
diff changeset
28 ;; on the command line are handled in precedence order. For priorities
a401292753e2 Remove table of command line arguments from the Commentary section.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 52553
diff changeset
29 ;; see the structure standard_args in the emacs.c file.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 779
diff changeset
31 ;;; Code:
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 779
diff changeset
32
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 (setq top-level '(normal-top-level))
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
35 (defvar command-line-processed nil
41155
f079abe99ced (command-line-processed): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40906
diff changeset
36 "Non-nil once command line has been processed.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
38 (defgroup initialization nil
64022
9a64c5484f9b (initialization): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63937
diff changeset
39 "Emacs start-up procedure."
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
40 :group 'environment)
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
41
82396
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
42 (defcustom initial-buffer-choice nil
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
43 "Buffer to show after starting Emacs.
84417
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
44 If the value is nil and `inhibit-startup-screen' is nil, show the
82396
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
45 startup screen. If the value is string, visit the specified file or
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
46 directory using `find-file'. If t, open the `*scratch*' buffer."
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
47 :type '(choice
84417
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
48 (const :tag "Startup screen" nil)
82396
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
49 (directory :tag "Directory" :value "~/")
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
50 (file :tag "File" :value "~/file.txt")
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
51 (const :tag "Lisp scratch buffer" t))
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
52 :version "23.1"
71b7e41a7415 (initialization): Change parent group from `internal'
Juri Linkov <juri@jurta.org>
parents: 82251
diff changeset
53 :group 'initialization)
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
54
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
55 (defcustom inhibit-startup-screen nil
68337
a3986bd22732 (inhibit-splash-screen, initial-scratch-message): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 68308
diff changeset
56 "Non-nil inhibits the startup screen.
a3986bd22732 (inhibit-splash-screen, initial-scratch-message): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 68308
diff changeset
57
77088
fdc3742495b5 (inhibit-splash-screen): Emphatically state that it can't be set in
Alan Mackenzie <acm@muc.de>
parents: 76560
diff changeset
58 This is for use in your personal init file (but NOT site-start.el), once
fdc3742495b5 (inhibit-splash-screen): Emphatically state that it can't be set in
Alan Mackenzie <acm@muc.de>
parents: 76560
diff changeset
59 you are familiar with the contents of the startup screen."
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
60 :type 'boolean
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
61 :group 'initialization)
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
62
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
63 (defvaralias 'inhibit-splash-screen 'inhibit-startup-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
64 (defvaralias 'inhibit-startup-message 'inhibit-startup-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
65
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
66 (defvar startup-screen-inhibit-startup-screen nil)
45530
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
67
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
68 (defcustom inhibit-startup-echo-area-message nil
5930
3cfd09c8ba8e (inhibit-startup-echo-area-message): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5481
diff changeset
69 "*Non-nil inhibits the initial startup echo area message.
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
70 Setting this variable takes effect
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
71 only if you do it with the customization buffer
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22512
diff changeset
72 or if your `.emacs' file contains a line of this form:
6119
9e150a376c32 (inhibit-startup-echo-area-message): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 5932
diff changeset
73 (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")
7880
3dd8448eee15 (inhibit-startup-echo-area-message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7658
diff changeset
74 If your `.emacs' file is byte-compiled, use the following form instead:
3dd8448eee15 (inhibit-startup-echo-area-message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7658
diff changeset
75 (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\"))
5930
3cfd09c8ba8e (inhibit-startup-echo-area-message): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5481
diff changeset
76 Thus, someone else using a copy of your `.emacs' file will see
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
77 the startup message unless he personally acts to inhibit it."
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
78 :type '(choice (const :tag "Don't inhibit")
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
79 (string :tag "Enter your user name, to inhibit"))
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
80 :group 'initialization)
5930
3cfd09c8ba8e (inhibit-startup-echo-area-message): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 5481
diff changeset
81
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
82 (defcustom inhibit-default-init nil
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
83 "*Non-nil inhibits loading the `default' library."
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
84 :type 'boolean
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
85 :group 'initialization)
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86
39556
c12d72aa46b9 (inhibit-startup-buffer-menu): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 39005
diff changeset
87 (defcustom inhibit-startup-buffer-menu nil
c12d72aa46b9 (inhibit-startup-buffer-menu): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 39005
diff changeset
88 "*Non-nil inhibits display of buffer list when more than 2 files are loaded."
c12d72aa46b9 (inhibit-startup-buffer-menu): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 39005
diff changeset
89 :type 'boolean
c12d72aa46b9 (inhibit-startup-buffer-menu): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 39005
diff changeset
90 :group 'initialization)
c12d72aa46b9 (inhibit-startup-buffer-menu): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 39005
diff changeset
91
16687
049c87a96dca Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16652
diff changeset
92 (defvar command-switch-alist nil
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 "Alist of command-line switches.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
54260
d115cf4b7731 (command-switch-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 54099
diff changeset
95 HANDLER-FUNCTION receives the switch string as its sole argument;
d115cf4b7731 (command-switch-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 54099
diff changeset
96 the remaining command-line args are in the variable `command-line-args-left'.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97
8335
e6afa5879de3 (command-line-args-left): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 8147
diff changeset
98 (defvar command-line-args-left nil
e6afa5879de3 (command-line-args-left): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 8147
diff changeset
99 "List of command-line args not yet processed.")
e6afa5879de3 (command-line-args-left): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 8147
diff changeset
100
84988
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
101 (defvaralias 'argv 'command-line-args-left
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
102 "List of command-line args not yet processed.
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
103 This is a convenience alias, so that one can write \(pop argv\)
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
104 inside of --eval command line arguments in order to access
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
105 following arguments.")
2e9aec8f7126 (argv): Alias for `command-line-args-left' to use as
David Kastrup <dak@gnu.org>
parents: 84879
diff changeset
106
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 (defvar command-line-functions nil ;; lrs 7/31/89
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 "List of functions to process unrecognized command-line arguments.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 Each function should access the dynamically bound variables
6593
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
110 `argi' (the current argument) and `command-line-args-left' (the remaining
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 arguments). The function should return non-nil only if it recognizes and
6593
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
112 processes `argi'. If it does so, it may consume successive arguments by
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
113 altering `command-line-args-left' to remove them.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114
7022
5635564a3064 (command-line-default-directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6980
diff changeset
115 (defvar command-line-default-directory nil
5635564a3064 (command-line-default-directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6980
diff changeset
116 "Default directory to use for command line arguments.
5635564a3064 (command-line-default-directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6980
diff changeset
117 This is normally copied from `default-directory' when Emacs starts.")
5635564a3064 (command-line-default-directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6980
diff changeset
118
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
119 ;;; This is here, rather than in x-win.el, so that we can ignore these
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
120 ;;; options when we are not using X.
27365
56c304580b79 (command-line): Check for compiled user-init-file and
Dave Love <fx@gnu.org>
parents: 27020
diff changeset
121 (defconst command-line-x-option-alist
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
122 '(("-bw" 1 x-handle-numeric-switch border-width)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
123 ("-d" 1 x-handle-display)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
124 ("-display" 1 x-handle-display)
15537
92107cc54a5f (command-line-x-option-alist): Don't handle -rn.
Richard M. Stallman <rms@gnu.org>
parents: 14986
diff changeset
125 ("-name" 1 x-handle-name-switch)
14985
c0edd24119bc (command-line-x-option-alist):
Richard M. Stallman <rms@gnu.org>
parents: 14928
diff changeset
126 ("-title" 1 x-handle-switch title)
14986
fd48987ee591 (command-line-x-option-alist): -T sets only the title.
Richard M. Stallman <rms@gnu.org>
parents: 14985
diff changeset
127 ("-T" 1 x-handle-switch title)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
128 ("-r" 0 x-handle-switch reverse t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
129 ("-rv" 0 x-handle-switch reverse t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
130 ("-reverse" 0 x-handle-switch reverse t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
131 ("-reverse-video" 0 x-handle-switch reverse t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
132 ("-fn" 1 x-handle-switch font)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
133 ("-font" 1 x-handle-switch font)
42711
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
134 ("-fs" 0 x-handle-initial-switch fullscreen fullboth)
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
135 ("-fw" 0 x-handle-initial-switch fullscreen fullwidth)
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
136 ("-fh" 0 x-handle-initial-switch fullscreen fullheight)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
137 ("-ib" 1 x-handle-numeric-switch internal-border-width)
13912
07d5e992fdc4 (auto-save-list-file-prefix): Under MS-DOS, use `.s-'.
Richard M. Stallman <rms@gnu.org>
parents: 13889
diff changeset
138 ("-g" 1 x-handle-geometry)
28694
22bde6ec328f (command-line-x-option-alist): Add `-lsp' and
Gerd Moellmann <gerd@gnu.org>
parents: 28282
diff changeset
139 ("-lsp" 1 x-handle-numeric-switch line-spacing)
13912
07d5e992fdc4 (auto-save-list-file-prefix): Under MS-DOS, use `.s-'.
Richard M. Stallman <rms@gnu.org>
parents: 13889
diff changeset
140 ("-geometry" 1 x-handle-geometry)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
141 ("-fg" 1 x-handle-switch foreground-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
142 ("-foreground" 1 x-handle-switch foreground-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
143 ("-bg" 1 x-handle-switch background-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
144 ("-background" 1 x-handle-switch background-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
145 ("-ms" 1 x-handle-switch mouse-color)
66054
9a0d9cf10142 * startup.el (command-line-x-option-alist): -nb => -nbi
Jan Djärv <jan.h.d@swipnet.se>
parents: 66046
diff changeset
146 ("-nbi" 0 x-handle-switch icon-type nil)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
147 ("-iconic" 0 x-handle-iconic)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
148 ("-xrm" 1 x-handle-xrm-switch)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
149 ("-cr" 1 x-handle-switch cursor-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
150 ("-vb" 0 x-handle-switch vertical-scroll-bars t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
151 ("-hb" 0 x-handle-switch horizontal-scroll-bars t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
152 ("-bd" 1 x-handle-switch)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
153 ("--border-width" 1 x-handle-numeric-switch border-width)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
154 ("--display" 1 x-handle-display)
15537
92107cc54a5f (command-line-x-option-alist): Don't handle -rn.
Richard M. Stallman <rms@gnu.org>
parents: 14986
diff changeset
155 ("--name" 1 x-handle-name-switch)
14985
c0edd24119bc (command-line-x-option-alist):
Richard M. Stallman <rms@gnu.org>
parents: 14928
diff changeset
156 ("--title" 1 x-handle-switch title)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
157 ("--reverse-video" 0 x-handle-switch reverse t)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
158 ("--font" 1 x-handle-switch font)
42711
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
159 ("--fullscreen" 0 x-handle-initial-switch fullscreen fullboth)
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
160 ("--fullwidth" 0 x-handle-initial-switch fullscreen fullwidth)
3388d70b1a06 (command-line-x-option-alist): New options "-fs",
Eli Zaretskii <eliz@gnu.org>
parents: 42664
diff changeset
161 ("--fullheight" 0 x-handle-initial-switch fullscreen fullheight)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
162 ("--internal-border" 1 x-handle-numeric-switch internal-border-width)
13912
07d5e992fdc4 (auto-save-list-file-prefix): Under MS-DOS, use `.s-'.
Richard M. Stallman <rms@gnu.org>
parents: 13889
diff changeset
163 ("--geometry" 1 x-handle-geometry)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
164 ("--foreground-color" 1 x-handle-switch foreground-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
165 ("--background-color" 1 x-handle-switch background-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
166 ("--mouse-color" 1 x-handle-switch mouse-color)
78187
926d0282c9f4 (command-line-x-option-alist): Use x-handle-no-bitmap-icon.
Jan Djärv <jan.h.d@swipnet.se>
parents: 77670
diff changeset
167 ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon)
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
168 ("--iconic" 0 x-handle-iconic)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
169 ("--xrm" 1 x-handle-xrm-switch)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
170 ("--cursor-color" 1 x-handle-switch cursor-color)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
171 ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
28694
22bde6ec328f (command-line-x-option-alist): Add `-lsp' and
Gerd Moellmann <gerd@gnu.org>
parents: 28282
diff changeset
172 ("--line-spacing" 1 x-handle-numeric-switch line-spacing)
50027
95d928fb74f3 (command-line-x-option-alist): Make --border-color set the border-color frame
Juanma Barranquero <lekktu@gmail.com>
parents: 49997
diff changeset
173 ("--border-color" 1 x-handle-switch border-color)
91627
4be63beaa601 * startup.el (command-line-x-option-alist): Add --parent-id.
Jan Djärv <jan.h.d@swipnet.se>
parents: 91327
diff changeset
174 ("--smid" 1 x-handle-smid)
4be63beaa601 * startup.el (command-line-x-option-alist): Add --parent-id.
Jan Djärv <jan.h.d@swipnet.se>
parents: 91327
diff changeset
175 ("--parent-id" 1 x-handle-parent-id))
13889
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
176 "Alist of X Windows options.
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
177 Each element has the form
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
178 (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
179 where NAME is the option name string, NUMARGS is the number of arguments
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
180 that the option accepts, HANDLER is a function to call to handle the option.
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
181 FRAME-PARAM (optional) is the frame parameter this option specifies,
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
182 and VALUE is the value which is given to that frame parameter
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
183 \(most options use the argument for this, so VALUE is not present).")
1c65a1e5f099 (command-line-x-option-alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13811
diff changeset
184
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
185 (defconst command-line-ns-option-alist
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
186 '(("-NSAutoLaunch" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
187 ("-NXAutoLaunch" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
188 ("-macosx" 0 ns-ignore-0-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
189 ("-NSHost" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
190 ("-_NSMachLaunch" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
191 ("-MachLaunch" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
192 ("-NXOpen" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
193 ("-NSOpen" 1 ns-handle-nxopen)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
194 ("-NXOpenTemp" 1 ns-ignore-1-arg)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
195 ("-NSOpenTemp" 1 ns-handle-nxopentemp)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
196 ("-GSFilePath" 1 ns-handle-nxopen)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
197 ;;("-bw" . x-handle-numeric-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
198 ;;("-d" . x-handle-display)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
199 ;;("-display" . x-handle-display)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
200 ("-name" 1 ns-handle-name-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
201 ("-title" 1 ns-handle-switch title)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
202 ("-T" 1 ns-handle-switch title)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
203 ("-r" 0 ns-handle-switch reverse t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
204 ("-rv" 0 ns-handle-switch reverse t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
205 ("-reverse" 0 ns-handle-switch reverse t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
206 ("-fn" 1 ns-handle-switch font)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
207 ("-font" 1 ns-handle-switch font)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
208 ("-ib" 1 ns-handle-numeric-switch internal-border-width)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
209 ;;("-g" . x-handle-geometry)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
210 ;;("-geometry" . x-handle-geometry)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
211 ("-fg" 1 ns-handle-switch foreground-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
212 ("-foreground" 1 ns-handle-switch foreground-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
213 ("-bg" 1 ns-handle-switch background-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
214 ("-background" 1 ns-handle-switch background-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
215 ; ("-ms" 1 ns-handle-switch mouse-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
216 ("-itype" 0 ns-handle-switch icon-type t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
217 ("-i" 0 ns-handle-switch icon-type t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
218 ("-iconic" 0 ns-handle-iconic icon-type t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
219 ;;("-xrm" . x-handle-xrm-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
220 ("-cr" 1 ns-handle-switch cursor-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
221 ("-vb" 0 ns-handle-switch vertical-scroll-bars t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
222 ("-hb" 0 ns-handle-switch horizontal-scroll-bars t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
223 ("-bd" 1 ns-handle-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
224 ;; ("--border-width" 1 ns-handle-numeric-switch border-width)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
225 ;; ("--display" 1 ns-handle-display)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
226 ("--name" 1 ns-handle-name-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
227 ("--title" 1 ns-handle-switch title)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
228 ("--reverse-video" 0 ns-handle-switch reverse t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
229 ("--font" 1 ns-handle-switch font)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
230 ("--internal-border" 1 ns-handle-numeric-switch internal-border-width)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
231 ;; ("--geometry" 1 ns-handle-geometry)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
232 ("--foreground-color" 1 ns-handle-switch foreground-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
233 ("--background-color" 1 ns-handle-switch background-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
234 ("--mouse-color" 1 ns-handle-switch mouse-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
235 ("--icon-type" 0 ns-handle-switch icon-type t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
236 ("--iconic" 0 ns-handle-iconic)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
237 ;; ("--xrm" 1 ns-handle-xrm-switch)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
238 ("--cursor-color" 1 ns-handle-switch cursor-color)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
239 ("--vertical-scroll-bars" 0 ns-handle-switch vertical-scroll-bars t)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
240 ("--border-color" 1 ns-handle-switch border-width))
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
241 "Alist of NS options.
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
242 Each element has the form
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
243 (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
244 where NAME is the option name string, NUMARGS is the number of arguments
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
245 that the option accepts, HANDLER is a function to call to handle the option.
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
246 FRAME-PARAM (optional) is the frame parameter this option specifies,
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
247 and VALUE is the value which is given to that frame parameter
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
248 \(most options use the argument for this, so VALUE is not present).")
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
249
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
250
688
23cbc2c463eb *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 658
diff changeset
251 (defvar before-init-hook nil
14623
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
252 "Normal hook run after handling urgent options but before loading init files.")
370
d56e16bd220a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 326
diff changeset
253
688
23cbc2c463eb *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 658
diff changeset
254 (defvar after-init-hook nil
14623
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
255 "Normal hook run after loading the init files, `~/.emacs' and `default.el'.
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
256 There is no `condition-case' around the running of these functions;
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
257 therefore, if you set `debug-on-error' non-nil in `.emacs',
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
258 an error in one of these functions will invoke the debugger.")
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
259
91883
984503c8d1a0 (emacs-startup-time): Rename to `before-init-time'.
Glenn Morris <rgm@gnu.org>
parents: 91809
diff changeset
260 (defvar before-init-time nil
984503c8d1a0 (emacs-startup-time): Rename to `before-init-time'.
Glenn Morris <rgm@gnu.org>
parents: 91809
diff changeset
261 "Value of `current-time' before Emacs begins initialization.")
91736
0e11ef90a122 (emacs-startup-time): New variable.
Glenn Morris <rgm@gnu.org>
parents: 91627
diff changeset
262
91893
1aaa6ac14ee4 (after-init-time): New variable.
Juri Linkov <juri@jurta.org>
parents: 91883
diff changeset
263 (defvar after-init-time nil
1aaa6ac14ee4 (after-init-time): New variable.
Juri Linkov <juri@jurta.org>
parents: 91883
diff changeset
264 "Value of `current-time' after loading the init files.")
1aaa6ac14ee4 (after-init-time): New variable.
Juri Linkov <juri@jurta.org>
parents: 91883
diff changeset
265
14623
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
266 (defvar emacs-startup-hook nil
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
267 "Normal hook run after loading init files and handling the command line.")
688
23cbc2c463eb *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 658
diff changeset
268
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 (defvar term-setup-hook nil
14623
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
270 "Normal hook run after loading terminal-specific Lisp code.
00ffbbef6304 (before-init-hook, after-init-hook): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 14565
diff changeset
271 It also follows `emacs-startup-hook'. This hook exists for users to set,
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 so as to override the definitions made by the terminal-specific file.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 Emacs never sets this variable itself.")
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274
49934
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
275 (defvar inhibit-startup-hooks nil
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
276 "Non-nil means don't run `term-setup-hook' and `emacs-startup-hook'.
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
277 This is because we already did so.")
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
278
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 (defvar keyboard-type nil
6593
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
280 "The brand of keyboard you are using.
64347
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
281 This variable is used to define the proper function and keypad
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
282 keys for use under X. It is used in a fashion analogous to the
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
283 environment variable TERM.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 (defvar window-setup-hook nil
6593
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
286 "Normal hook run to initialize window system display.
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
287 Emacs runs this hook after processing the command line arguments and loading
f7729c7b0aa7 Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 6119
diff changeset
288 the user's init file.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
290 (defcustom initial-major-mode 'lisp-interaction-mode
76560
b8e7b9e517f7 (inhibit-splash-screen, initial-major-mode): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 76483
diff changeset
291 "Major mode command symbol to use for the initial `*scratch*' buffer."
19941
d21ea4b5978e (initial-major-mode): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19927
diff changeset
292 :type 'function
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
293 :group 'initialization)
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294
68140
4baa8cfc2485 (init-file-user): defcustom -> defvar.
Luc Teirlinck <teirllm@auburn.edu>
parents: 68081
diff changeset
295 (defvar init-file-user nil
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 "Identity of user whose `.emacs' file is or was read.
16687
049c87a96dca Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16652
diff changeset
297 The value is nil if `-q' or `--no-init-file' was specified,
049c87a96dca Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16652
diff changeset
298 meaning do not load any init file.
049c87a96dca Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16652
diff changeset
299
68081
ec8a77d4aadf (init-file-user): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 67992
diff changeset
300 Otherwise, the value may be an empty string, meaning
ec8a77d4aadf (init-file-user): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 67992
diff changeset
301 use the init file for the user who originally logged in,
ec8a77d4aadf (init-file-user): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 67992
diff changeset
302 or it may be a string containing a user's name meaning
ec8a77d4aadf (init-file-user): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 67992
diff changeset
303 use that person's init file.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
304
6980
ef1b2bd0b19e (init-file-user): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6911
diff changeset
305 In either of the latter cases, `(concat \"~\" init-file-user \"/\")'
ef1b2bd0b19e (init-file-user): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6911
diff changeset
306 evaluates to the name of the directory where the `.emacs' file was
11083
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
307 looked for.
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
308
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
309 Setting `init-file-user' does not prevent Emacs from loading
68140
4baa8cfc2485 (init-file-user): defcustom -> defvar.
Luc Teirlinck <teirllm@auburn.edu>
parents: 68081
diff changeset
310 `site-start.el'. The only way to do that is to use `--no-site-file'.")
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
312 (defcustom site-run-file "site-start"
4599
e1d54ee1deea (site-run-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4293
diff changeset
313 "File containing site-wide run-time initializations.
e1d54ee1deea (site-run-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4293
diff changeset
314 This file is loaded at run-time before `~/.emacs'. It contains inits
e1d54ee1deea (site-run-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4293
diff changeset
315 that need to be in place for the entire site, but which, due to their
56731
ef128b3bd510 (normal-top-level-add-subdirs-to-load-path):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55801
diff changeset
316 higher incidence of change, don't make sense to load into Emacs's
4599
e1d54ee1deea (site-run-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4293
diff changeset
317 dumped image. Thus, the run-time load order is: 1. file described in
11083
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
318 this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
319
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
320 Don't use the `site-start.el' file for things some users may not like.
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
321 Put them in `default.el' instead, so that users can more easily
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
322 override them. Users can prevent loading `default.el' with the `-q'
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
323 option or by setting `inhibit-default-init' in their own init files,
2c55e8ceb8b4 (init-file-user, site-run-file): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 10444
diff changeset
324 but inhibiting `site-start.el' requires `--no-site-file', which
59169
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
325 is less convenient.
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
326
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
327 This variable is defined for customization so as to make
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
328 it visible in the relevant context. However, actually customizing it
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
329 is not allowed, since it would not work anyway. The only way to set
64347
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
330 this variable usefully is to set it while building and dumping Emacs."
23276
912ae6c6787d (site-run-file): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents: 22937
diff changeset
331 :type '(choice (const :tag "none" nil) string)
59169
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
332 :group 'initialization
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
333 :initialize 'custom-initialize-default
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
334 :set '(lambda (variable value)
5ba3e8b1f040 (site-run-file): Don't allow setting it with Custom.
Richard M. Stallman <rms@gnu.org>
parents: 58635
diff changeset
335 (error "Customizing `site-run-file' does not work")))
4599
e1d54ee1deea (site-run-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4293
diff changeset
336
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
337 (defcustom mail-host-address nil
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
338 "*Name of this machine, for purposes of naming users."
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
339 :type '(choice (const nil) string)
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
340 :group 'mail)
8989
54b7aaded223 (mail-host-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8759
diff changeset
341
47688
8c15fbf63f95 (user-mail-address): Initialize to a useful value
Richard M. Stallman <rms@gnu.org>
parents: 47331
diff changeset
342 (defcustom user-mail-address (if command-line-processed
72064
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
343 (or (getenv "EMAIL")
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
344 (concat (user-login-name) "@"
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
345 (or mail-host-address
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
346 (system-name))))
47688
8c15fbf63f95 (user-mail-address): Initialize to a useful value
Richard M. Stallman <rms@gnu.org>
parents: 47331
diff changeset
347 ;; Empty string means "not set yet".
8c15fbf63f95 (user-mail-address): Initialize to a useful value
Richard M. Stallman <rms@gnu.org>
parents: 47331
diff changeset
348 "")
13479
983cfcaf1fbd (command-line): Complain about unknown options.
Richard M. Stallman <rms@gnu.org>
parents: 13430
diff changeset
349 "*Full mailing address of this user.
72064
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
350 This is initialized with environment variable `EMAIL' or, as a
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
351 fallback, using `mail-host-address'. This is done after your
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
352 init file is read, in case it sets `mail-host-address'."
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
353 :type 'string
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
354 :group 'mail)
8048
5253d3981da6 (user-mail-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 7880
diff changeset
355
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
356 (defcustom auto-save-list-file-prefix
28698
668b53a3e5f6 (auto-save-list-file-prefix): Set default to
Gerd Moellmann <gerd@gnu.org>
parents: 28694
diff changeset
357 (cond ((eq system-type 'ms-dos)
668b53a3e5f6 (auto-save-list-file-prefix): Set default to
Gerd Moellmann <gerd@gnu.org>
parents: 28694
diff changeset
358 ;; MS-DOS cannot have initial dot, and allows only 8.3 names
81351
0e3f82f9067d (auto-save-list-file-prefix): Use user-emacs-directory.
Chong Yidong <cyd@stupidchicken.com>
parents: 81227
diff changeset
359 (concat user-emacs-directory "auto-save.list/_s"))
28698
668b53a3e5f6 (auto-save-list-file-prefix): Set default to
Gerd Moellmann <gerd@gnu.org>
parents: 28694
diff changeset
360 (t
81351
0e3f82f9067d (auto-save-list-file-prefix): Use user-emacs-directory.
Chong Yidong <cyd@stupidchicken.com>
parents: 81227
diff changeset
361 (concat user-emacs-directory "auto-save-list/.saves-")))
13811
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
362 "Prefix for generating `auto-save-list-file-name'.
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
363 This is used after reading your `.emacs' file to initialize
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
364 `auto-save-list-file-name', by appending Emacs's pid and the system name,
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
365 if you have not already set `auto-save-list-file-name' yourself.
28698
668b53a3e5f6 (auto-save-list-file-prefix): Set default to
Gerd Moellmann <gerd@gnu.org>
parents: 28694
diff changeset
366 Directories in the prefix will be created if necessary.
13811
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
367 Set this to nil if you want to prevent `auto-save-list-file-name'
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
368 from being initialized."
20063
8de4c2591c49 (auto-save-list-file-prefix): Fix custom type.
Karl Heuer <kwzh@gnu.org>
parents: 20030
diff changeset
369 :type '(choice (const :tag "Don't record a session's auto save list" nil)
8de4c2591c49 (auto-save-list-file-prefix): Fix custom type.
Karl Heuer <kwzh@gnu.org>
parents: 20030
diff changeset
370 string)
18294
0b9fc63738f9 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 18162
diff changeset
371 :group 'auto-save)
13117
3753d2ea3ab1 (auto-save-list-file-prefix): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13073
diff changeset
372
54852
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
373 (defvar emacs-quick-startup nil)
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
374
61452
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
375 (defvar emacs-basic-display nil)
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
376
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 (defvar init-file-debug nil)
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378
73703
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
379 (defvar init-file-had-error nil
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
380 "Non-nil if there was an error loading the user's init file.")
5109
062da10a4a6b (command-line): Set init-file-had-error to t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 5024
diff changeset
381
24198
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
382 (defvar normal-top-level-add-subdirs-inode-list nil)
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
383
60397
b796f66dc4d1 (no-blinking-cursor): New defvar.
Juri Linkov <juri@jurta.org>
parents: 60022
diff changeset
384 (defvar no-blinking-cursor nil)
b796f66dc4d1 (no-blinking-cursor): New defvar.
Juri Linkov <juri@jurta.org>
parents: 60022
diff changeset
385
63937
fa8a3545cd6b (default-frame-background-mode): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 63859
diff changeset
386 (defvar default-frame-background-mode)
fa8a3545cd6b (default-frame-background-mode): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 63859
diff changeset
387
51698
92ed57f99b98 (pure-space-overflow): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 51287
diff changeset
388 (defvar pure-space-overflow nil
92ed57f99b98 (pure-space-overflow): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 51287
diff changeset
389 "Non-nil if building Emacs overflowed pure space.")
92ed57f99b98 (pure-space-overflow): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 51287
diff changeset
390
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
391 (defvar pure-space-overflow-message "\
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
392 Warning Warning!!! Pure space overflow !!!Warning Warning
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
393 \(See the node Pure Storage in the Lisp manual for details.)\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
394
82800
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
395 (defvar tutorial-directory nil
82728
3a5502138995 (tutorial-directory): New constant.
Glenn Morris <rgm@gnu.org>
parents: 82489
diff changeset
396 "Directory containing the Emacs TUTORIAL files.")
3a5502138995 (tutorial-directory): New constant.
Glenn Morris <rgm@gnu.org>
parents: 82489
diff changeset
397
82800
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
398 ;; Get correct value in a dumped, installed Emacs.
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
399 (eval-at-startup
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
400 (setq tutorial-directory (file-name-as-directory
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
401 (expand-file-name "tutorials" data-directory))))
f25aaee01664 (tutorial-directory): Set with eval-at-startup so it gets the right
Glenn Morris <rgm@gnu.org>
parents: 82728
diff changeset
402
21264
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
403 (defun normal-top-level-add-subdirs-to-load-path ()
22024
bf37812dd6bb (normal-top-level-add-subdirs-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 21916
diff changeset
404 "Add all subdirectories of current directory to `load-path'.
bf37812dd6bb (normal-top-level-add-subdirs-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 21916
diff changeset
405 More precisely, this uses only the subdirectories whose names
22334
979317421863 (normal-top-level-add-subdirs-to-load-path): Ignore
Dave Love <fx@gnu.org>
parents: 22176
diff changeset
406 start with letters or digits; it excludes any subdirectory named `RCS'
979317421863 (normal-top-level-add-subdirs-to-load-path): Ignore
Dave Love <fx@gnu.org>
parents: 22176
diff changeset
407 or `CVS', and any subdirectory that contains a file named `.nosearch'."
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
408 (let (dirs
24198
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
409 attrs
21264
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
410 (pending (list default-directory)))
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
411 ;; This loop does a breadth-first tree walk on DIR's subtree,
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
412 ;; putting each subdir into DIRS as its contents are examined.
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
413 (while pending
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
414 (push (pop pending) dirs)
38516
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
415 (let* ((this-dir (car dirs))
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
416 (contents (directory-files this-dir))
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
417 (default-directory this-dir)
56731
ef128b3bd510 (normal-top-level-add-subdirs-to-load-path):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55801
diff changeset
418 (canonicalized (if (fboundp 'untranslated-canonical-name)
ef128b3bd510 (normal-top-level-add-subdirs-to-load-path):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55801
diff changeset
419 (untranslated-canonical-name this-dir))))
38516
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
420 ;; The Windows version doesn't report meaningful inode
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
421 ;; numbers, so use the canonicalized absolute file name of the
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
422 ;; directory instead.
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
423 (setq attrs (or canonicalized
e3a84598fe88 (normal-top-level-add-subdirs-to-load-path): On Windows,
Eli Zaretskii <eliz@gnu.org>
parents: 38463
diff changeset
424 (nthcdr 10 (file-attributes this-dir))))
24198
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
425 (unless (member attrs normal-top-level-add-subdirs-inode-list)
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
426 (push attrs normal-top-level-add-subdirs-inode-list)
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
427 (dolist (file contents)
34349
3d60bae71cd9 (normal-top-level-add-subdirs-to-load-path): Ignore
Eli Zaretskii <eliz@gnu.org>
parents: 34286
diff changeset
428 ;; The lower-case variants of RCS and CVS are for DOS/Windows.
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
429 (unless (member file '("." ".." "RCS" "CVS" "rcs" "cvs"))
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
430 (when (and (string-match "\\`[[:alnum:]]" file)
24923
702b3d792db9 (normal-top-level-add-subdirs-to-load-path): Avoid doing a `stat' when
Richard M. Stallman <rms@gnu.org>
parents: 24884
diff changeset
431 ;; Avoid doing a `stat' when it isn't necessary
702b3d792db9 (normal-top-level-add-subdirs-to-load-path): Avoid doing a `stat' when
Richard M. Stallman <rms@gnu.org>
parents: 24884
diff changeset
432 ;; because that can cause trouble when an NFS server
702b3d792db9 (normal-top-level-add-subdirs-to-load-path): Avoid doing a `stat' when
Richard M. Stallman <rms@gnu.org>
parents: 24884
diff changeset
433 ;; is down.
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
434 (not (string-match "\\.elc?\\'" file))
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
435 (file-directory-p file))
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
436 (let ((expanded (expand-file-name file)))
24198
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
437 (unless (file-exists-p (expand-file-name ".nosearch"
ee8046b6187d (command-line-1): Up-date copyright.
Richard M. Stallman <rms@gnu.org>
parents: 24138
diff changeset
438 expanded))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
439 (setq pending (nconc pending (list expanded)))))))))))
21292
5d62016adafd (normal-top-level-add-subdirs-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 21264
diff changeset
440 (normal-top-level-add-to-load-path (cdr (nreverse dirs)))))
21264
9eb6fcceba90 (normal-top-level-add-subdirs-to-load-path): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20695
diff changeset
441
22176
050c1872b04b Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22162
diff changeset
442 ;; This function is called from a subdirs.el file.
050c1872b04b Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22162
diff changeset
443 ;; It assumes that default-directory is the directory
050c1872b04b Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22162
diff changeset
444 ;; in which the subdirs.el file exists,
050c1872b04b Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22162
diff changeset
445 ;; and it adds to load-path the subdirs of that directory
050c1872b04b Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22162
diff changeset
446 ;; as specified in DIRS. Normally the elements of DIRS are relative.
9443
5eaca32b6af6 (normal-top-level-add-to-load-path): New function.
Richard M. Stallman <rms@gnu.org>
parents: 9348
diff changeset
447 (defun normal-top-level-add-to-load-path (dirs)
19955
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
448 (let ((tail load-path)
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
449 (thisdir (directory-file-name default-directory)))
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
450 (while (and tail
28722
a4c4a68597f5 (normal-top-level-add-to-load-path): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 28698
diff changeset
451 ;;Don't go all the way to the nil terminator.
a4c4a68597f5 (normal-top-level-add-to-load-path): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 28698
diff changeset
452 (cdr tail)
19955
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
453 (not (equal thisdir (car tail)))
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
454 (not (and (memq system-type '(ms-dos windows-nt))
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
455 (equal (downcase thisdir) (downcase (car tail))))))
1593da1bdfec (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19941
diff changeset
456 (setq tail (cdr tail)))
28722
a4c4a68597f5 (normal-top-level-add-to-load-path): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 28698
diff changeset
457 ;;Splice the new section in.
a4c4a68597f5 (normal-top-level-add-to-load-path): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 28698
diff changeset
458 (when tail
a4c4a68597f5 (normal-top-level-add-to-load-path): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 28698
diff changeset
459 (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail))))))
9443
5eaca32b6af6 (normal-top-level-add-to-load-path): New function.
Richard M. Stallman <rms@gnu.org>
parents: 9348
diff changeset
460
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461 (defun normal-top-level ()
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 (if command-line-processed
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 (message "Back to top level.")
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 (setq command-line-processed t)
11294
f5079cb33831 (normal-top-level): Copy default-directory
Richard M. Stallman <rms@gnu.org>
parents: 11083
diff changeset
465 (let ((dir default-directory))
56731
ef128b3bd510 (normal-top-level-add-subdirs-to-load-path):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55801
diff changeset
466 (with-current-buffer "*Messages*"
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
467 ;; Make it easy to do like "tail -f".
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
468 (set (make-local-variable 'window-point-insertion-type) t)
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
469 ;; Give *Messages* the same default-directory as *scratch*,
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
470 ;; just to keep things predictable.
11294
f5079cb33831 (normal-top-level): Copy default-directory
Richard M. Stallman <rms@gnu.org>
parents: 11083
diff changeset
471 (setq default-directory dir)))
47733
d1dbe1fc93d6 (normal-top-level): Reset standard-value of `user-full-name' here.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47692
diff changeset
472 ;; `user-full-name' is now known; reset its standard-value here.
d1dbe1fc93d6 (normal-top-level): Reset standard-value of `user-full-name' here.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47692
diff changeset
473 (put 'user-full-name 'standard-value
d1dbe1fc93d6 (normal-top-level): Reset standard-value of `user-full-name' here.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47692
diff changeset
474 (list (default-value 'user-full-name)))
22512
6c1c72f0145b (normal-top-level):
Karl Heuer <kwzh@gnu.org>
parents: 22475
diff changeset
475 ;; For root, preserve owner and group when editing files.
6c1c72f0145b (normal-top-level):
Karl Heuer <kwzh@gnu.org>
parents: 22475
diff changeset
476 (if (equal (user-uid) 0)
6c1c72f0145b (normal-top-level):
Karl Heuer <kwzh@gnu.org>
parents: 22475
diff changeset
477 (setq backup-by-copying-when-mismatch t))
9443
5eaca32b6af6 (normal-top-level-add-to-load-path): New function.
Richard M. Stallman <rms@gnu.org>
parents: 9348
diff changeset
478 ;; Look in each dir in load-path for a subdirs.el file.
5eaca32b6af6 (normal-top-level-add-to-load-path): New function.
Richard M. Stallman <rms@gnu.org>
parents: 9348
diff changeset
479 ;; If we find one, load it, which will add the appropriate subdirs
5eaca32b6af6 (normal-top-level-add-to-load-path): New function.
Richard M. Stallman <rms@gnu.org>
parents: 9348
diff changeset
480 ;; of that dir into load-path,
30899
429c384fc024 (normal-top-level): Look in each dir in load-path for a leim-list.el
Kenichi Handa <handa@m17n.org>
parents: 30016
diff changeset
481 ;; Look for a leim-list.el file too. Loading it will register
429c384fc024 (normal-top-level): Look in each dir in load-path for a leim-list.el
Kenichi Handa <handa@m17n.org>
parents: 30016
diff changeset
482 ;; available input methods.
62696
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
483 (let ((tail load-path) dir)
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
484 (while tail
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
485 (setq dir (car tail))
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
486 (let ((default-directory dir))
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
487 (load (expand-file-name "subdirs.el") t t t))
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
488 (let ((default-directory dir))
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
489 (load (expand-file-name "leim-list.el") t t t))
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
490 ;; We don't use a dolist loop and we put this "setq-cdr" command at
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
491 ;; the end, because the subdirs.el files may add elements to the end
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
492 ;; of load-path and we want to take it into account.
84252cd99187 (normal-top-level): Allow modification of load-path while iterating over it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 62402
diff changeset
493 (setq tail (cdr tail))))
97142
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
494 ;; If the PWD environment variable isn't accurate, delete it.
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
495 (let ((pwd (getenv "PWD")))
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
496 (and (stringp pwd)
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
497 ;; Use FOO/., so that if FOO is a symlink, file-attributes
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
498 ;; describes the directory linked to, not FOO itself.
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
499 (or (equal (file-attributes
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
500 (concat (file-name-as-directory pwd) "."))
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
501 (file-attributes
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
502 (concat (file-name-as-directory default-directory)
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
503 ".")))
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
504 (setq process-environment
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
505 (delete (concat "PWD=" pwd)
c3512b2085a0 * bitmaps/README:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97043
diff changeset
506 process-environment)))))
707
e4253da532fb *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 688
diff changeset
507 (setq default-directory (abbreviate-file-name default-directory))
7371
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
508 (let ((menubar-bindings-done nil))
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
509 (unwind-protect
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
510 (command-line)
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
511 ;; Do this again, in case .emacs defined more abbreviations.
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
512 (setq default-directory (abbreviate-file-name default-directory))
13279
68cd0fc88a56 (normal-top-level): Set auto-save-list-file-name later,
Richard M. Stallman <rms@gnu.org>
parents: 13153
diff changeset
513 ;; Specify the file for recording all the auto save files of this session.
68cd0fc88a56 (normal-top-level): Set auto-save-list-file-name later,
Richard M. Stallman <rms@gnu.org>
parents: 13153
diff changeset
514 ;; This is used by recover-session.
13811
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
515 (or auto-save-list-file-name
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
516 (and auto-save-list-file-prefix
66fa6267358e (command-line-1): Use auto-save-list-file-prefix
Karl Heuer <kwzh@gnu.org>
parents: 13552
diff changeset
517 (setq auto-save-list-file-name
13912
07d5e992fdc4 (auto-save-list-file-prefix): Under MS-DOS, use `.s-'.
Richard M. Stallman <rms@gnu.org>
parents: 13889
diff changeset
518 ;; Under MS-DOS our PID is almost always reused between
07d5e992fdc4 (auto-save-list-file-prefix): Under MS-DOS, use `.s-'.
Richard M. Stallman <rms@gnu.org>
parents: 13889
diff changeset
519 ;; Emacs invocations. We need something more unique.
28777
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
520 (cond ((eq system-type 'ms-dos)
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
521 ;; We are going to access the auto-save
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
522 ;; directory, so make sure it exists.
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
523 (make-directory
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
524 (file-name-directory auto-save-list-file-prefix)
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
525 t)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
526 (concat
28777
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
527 (make-temp-name
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
528 (expand-file-name
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
529 auto-save-list-file-prefix))
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
530 "~"))
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
531 (t
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
532 (expand-file-name
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
533 (format "%s%d-%s~"
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
534 auto-save-list-file-prefix
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
535 (emacs-pid)
313dc33f94b9 (auto-save-list-file-prefix): For ms-dos, set the
Eli Zaretskii <eliz@gnu.org>
parents: 28761
diff changeset
536 (system-name))))))))
49934
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
537 (unless inhibit-startup-hooks
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
538 (run-hooks 'emacs-startup-hook)
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
539 (and term-setup-hook
2d6097436427 (inhibit-startup-hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 49897
diff changeset
540 (run-hooks 'term-setup-hook)))
38347
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
541
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
542 ;; Don't do this if we failed to create the initial frame,
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
543 ;; for instance due to a dense colormap.
40304
ccd5c473ddcf (normal-top-level): Check for frame-initial-frame
Gerd Moellmann <gerd@gnu.org>
parents: 39739
diff changeset
544 (when (or frame-initial-frame
ccd5c473ddcf (normal-top-level): Check for frame-initial-frame
Gerd Moellmann <gerd@gnu.org>
parents: 39739
diff changeset
545 ;; If frame-initial-frame has no meaning, do this anyway.
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 52553
diff changeset
546 (not (and initial-window-system
40304
ccd5c473ddcf (normal-top-level): Check for frame-initial-frame
Gerd Moellmann <gerd@gnu.org>
parents: 39739
diff changeset
547 (not noninteractive)
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 52553
diff changeset
548 (not (eq initial-window-system 'pc)))))
38347
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
549 ;; Modify the initial frame based on what .emacs puts into
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
550 ;; ...-frame-alist.
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
551 (if (fboundp 'frame-notice-user-settings)
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
552 (frame-notice-user-settings))
83074
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
553 ;; Set the faces for the initial background mode even if
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
554 ;; frame-notice-user-settings didn't (such as on a tty).
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
555 ;; frame-set-background-mode is idempotent, so it won't
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
556 ;; cause any harm if it's already been done.
38347
efc03a2c216e (normal-top-level): Don't operate on the initial
Gerd Moellmann <gerd@gnu.org>
parents: 37834
diff changeset
557 (if (fboundp 'frame-set-background-mode)
83074
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
558 (frame-set-background-mode (selected-frame))))
32651
bd6de7514382 (normal-top-level):
Miles Bader <miles@gnu.org>
parents: 32617
diff changeset
559
7371
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
560 ;; Now we know the user's default font, so add it to the menu.
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
561 (if (fboundp 'font-menu-add-default)
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
562 (font-menu-add-default))
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
563 (and window-setup-hook
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
564 (run-hooks 'window-setup-hook))
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
565 (or menubar-bindings-done
32436
eaa64e9ff400 (normal-top-level): Use display-popup-menus-p instead
Eli Zaretskii <eliz@gnu.org>
parents: 32424
diff changeset
566 (if (display-popup-menus-p)
83800
0505ccaa9eba (normal-top-level): Set $TERM to `dumb' so that unless
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
567 (precompute-menubar-bindings)))))
0505ccaa9eba (normal-top-level): Set $TERM to `dumb' so that unless
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
568 ;; Subprocesses of Emacs do not have direct access to the terminal, so
0505ccaa9eba (normal-top-level): Set $TERM to `dumb' so that unless
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
569 ;; unless told otherwise they should only assume a dumb terminal.
0505ccaa9eba (normal-top-level): Set $TERM to `dumb' so that unless
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
570 ;; We are careful to do it late (after term-setup-hook), although the
0505ccaa9eba (normal-top-level): Set $TERM to `dumb' so that unless
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
571 ;; new multi-tty code does not use $TERM any more there anyway.
84753
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
572 (setenv "TERM" "dumb")
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
573 ;; Remove DISPLAY from the process-environment as well. This allows
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
574 ;; `callproc.c' to give it a useful adaptive default which is either
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
575 ;; the value of the `display' frame-parameter or the DISPLAY value
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
576 ;; from initial-environment.
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
577 (let ((display (frame-parameter nil 'display)))
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
578 ;; Be careful which DISPLAY to remove from process-environment: follow
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
579 ;; the logic of `callproc.c'.
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
580 (if (stringp display) (setq display (concat "DISPLAY=" display))
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
581 (dolist (varval initial-environment)
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
582 (if (string-match "\\`DISPLAY=" varval)
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
583 (setq display varval))))
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
584 (when display
eceecc897cab (normal-top-level): Remove DISPLAY from process-environment to let it be
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84563
diff changeset
585 (delete display process-environment)))))
7371
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
586
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
587 ;; Precompute the keyboard equivalents in the menu bar items.
099233e3a3be (precompute-menubar-bindings): New function, formerly in loadup.el.
Karl Heuer <kwzh@gnu.org>
parents: 7022
diff changeset
588 (defun precompute-menubar-bindings ()
12300
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
589 (let ((submap (lookup-key global-map [menu-bar])))
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
590 (while submap
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
591 (and (consp (car submap))
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
592 (symbolp (car (car submap)))
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
593 (stringp (car-safe (cdr (car submap))))
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
594 (keymapp (cdr (cdr (car submap))))
12346
a7f7ae7ef458 (precompute-menubar-bindings): While dumping,
Richard M. Stallman <rms@gnu.org>
parents: 12300
diff changeset
595 (progn
a7f7ae7ef458 (precompute-menubar-bindings): While dumping,
Richard M. Stallman <rms@gnu.org>
parents: 12300
diff changeset
596 (x-popup-menu nil (cdr (cdr (car submap))))
a7f7ae7ef458 (precompute-menubar-bindings): While dumping,
Richard M. Stallman <rms@gnu.org>
parents: 12300
diff changeset
597 (if purify-flag
a7f7ae7ef458 (precompute-menubar-bindings): While dumping,
Richard M. Stallman <rms@gnu.org>
parents: 12300
diff changeset
598 (garbage-collect))))
12300
d2f3dd6083d2 (normal-top-level, command-line-1):
Richard M. Stallman <rms@gnu.org>
parents: 11947
diff changeset
599 (setq submap (cdr submap))))
32141
ad30e402b113 (fancy-splash-pending-command): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 32067
diff changeset
600 (setq define-key-rebound-commands t))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
601
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
602 ;; Command-line options supported by tty's:
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
603 (defconst tty-long-option-alist
42745
00370dd7111e (command-line): Register the default tty colors even
Eli Zaretskii <eliz@gnu.org>
parents: 42711
diff changeset
604 '(("--name" . "-name")
00370dd7111e (command-line): Register the default tty colors even
Eli Zaretskii <eliz@gnu.org>
parents: 42711
diff changeset
605 ("--title" . "-T")
00370dd7111e (command-line): Register the default tty colors even
Eli Zaretskii <eliz@gnu.org>
parents: 42711
diff changeset
606 ("--reverse-video" . "-reverse")
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
607 ("--foreground-color" . "-fg")
42745
00370dd7111e (command-line): Register the default tty colors even
Eli Zaretskii <eliz@gnu.org>
parents: 42711
diff changeset
608 ("--background-color" . "-bg")
00370dd7111e (command-line): Register the default tty colors even
Eli Zaretskii <eliz@gnu.org>
parents: 42711
diff changeset
609 ("--color" . "-color")))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
610
35510
04fd42105e13 (tool-bar-images-pixel-height): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35046
diff changeset
611 (defconst tool-bar-images-pixel-height 24
04fd42105e13 (tool-bar-images-pixel-height): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35046
diff changeset
612 "Height in pixels of images in the tool bar.")
04fd42105e13 (tool-bar-images-pixel-height): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35046
diff changeset
613
36321
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
614 (defvar tool-bar-originally-present nil
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
615 "Non-nil if tool-bars are present before user and site init files are read.")
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
616
83018
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
617 (defvar handle-args-function-alist '((nil . tty-handle-args))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
618 "Functions for processing window-system dependent command-line arguments.
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
619 Window system startup files should add their own function to this
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
620 alist, which should parse the command line arguments. Those
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
621 pertaining to the window system should be processed and removed
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
622 from the returned command line.")
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
623
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
624 (defvar window-system-initialization-alist '((nil . ignore))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
625 "Alist of window-system initialization functions.
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
626 Window-system startup files should add their own initialization
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
627 function to this list. The function should take no arguments,
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
628 and initialize the window system environment to prepare for
83316
102194c6d773 Update Lisp code for a terminal-local `function-key-map'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83311
diff changeset
629 opening the first frame (e.g. open a connection to an X server).")
83018
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
630
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
631 ;; Handle the X-like command-line arguments "-fg", "-bg", "-name", etc.
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
632 (defun tty-handle-args (args)
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
633 (let (rest)
77107
33e274e43d0b (tty-handle-args): Use %S to log ARGS.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77106
diff changeset
634 (message "%S" args)
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
635 (while (and args
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
636 (not (equal (car args) "--")))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
637 (let* ((argi (pop args))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
638 (orig-argi argi)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
639 argval completion)
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
640 ;; Check for long options with attached arguments
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
641 ;; and separate out the attached option argument into argval.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
642 (when (string-match "^\\(--[^=]*\\)=" argi)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
643 (setq argval (substring argi (match-end 0))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
644 argi (match-string 1 argi)))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
645 (when (string-match "^--" argi)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
646 (setq completion (try-completion argi tty-long-option-alist))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
647 (if (eq completion t)
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
648 ;; Exact match for long option.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
649 (setq argi (cdr (assoc argi tty-long-option-alist)))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
650 (if (stringp completion)
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
651 (let ((elt (assoc completion tty-long-option-alist)))
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
652 ;; Check for abbreviated long option.
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
653 (or elt
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
654 (error "Option `%s' is ambiguous" argi))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
655 (setq argi (cdr elt)))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
656 ;; Check for a short option.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
657 (setq argval nil
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
658 argi orig-argi))))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
659 (cond ((member argi '("-fg" "-foreground"))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
660 (push (cons 'foreground-color (or argval (pop args)))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
661 default-frame-alist))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
662 ((member argi '("-bg" "-background"))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
663 (push (cons 'background-color (or argval (pop args)))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
664 default-frame-alist))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
665 ((member argi '("-T" "-name"))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
666 (unless argval (setq argval (pop args)))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
667 (push (cons 'title
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
668 (if (stringp argval)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
669 argval
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
670 (let ((case-fold-search t)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
671 i)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
672 (setq argval (invocation-name))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
673
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
674 ;; Change any . or * characters in name to
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
675 ;; hyphens, so as to emulate behavior on X.
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
676 (while
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
677 (setq i (string-match "[.*]" argval))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
678 (aset argval i ?-))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
679 argval)))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
680 default-frame-alist))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
681 ((member argi '("-r" "-rv" "-reverse"))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
682 (push '(reverse . t)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
683 default-frame-alist))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
684 ((equal argi "-color")
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
685 (unless argval (setq argval 8)) ; default --color means 8 ANSI colors
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
686 (push (cons 'tty-color-mode
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
687 (cond
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
688 ((numberp argval) argval)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
689 ((string-match "-?[0-9]+" argval)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
690 (string-to-number argval))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
691 (t (intern argval))))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
692 default-frame-alist))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
693 (t
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
694 (push argi rest)))))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
695 (nreverse rest)))
33010
95f07ba644ef (tty-long-option-alist): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 32651
diff changeset
696
95841
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 95777
diff changeset
697 (declare-function x-get-resource "frame.c"
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 95777
diff changeset
698 (attribute class &optional component subclass))
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 95777
diff changeset
699 (declare-function tool-bar-mode "tool-bar" (&optional arg))
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 95777
diff changeset
700
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
701 (defun command-line ()
91883
984503c8d1a0 (emacs-startup-time): Rename to `before-init-time'.
Glenn Morris <rgm@gnu.org>
parents: 91809
diff changeset
702 (setq before-init-time (current-time)
91736
0e11ef90a122 (emacs-startup-time): New variable.
Glenn Morris <rgm@gnu.org>
parents: 91627
diff changeset
703 command-line-default-directory default-directory)
7022
5635564a3064 (command-line-default-directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6980
diff changeset
704
22429
38486c386abb (command-line): Set `temporary-file-directory' based
Richard M. Stallman <rms@gnu.org>
parents: 22334
diff changeset
705 ;; Choose a reasonable location for temporary files.
60415
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
706 (custom-reevaluate-setting 'temporary-file-directory)
64630
4e0e85061ae3 (command-line): Fix typo. (From Ari Roponen.)
Luc Teirlinck <teirllm@auburn.edu>
parents: 64599
diff changeset
707 (custom-reevaluate-setting 'small-temporary-file-directory)
60415
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
708 (custom-reevaluate-setting 'auto-save-file-name-transforms)
22429
38486c386abb (command-line): Set `temporary-file-directory' based
Richard M. Stallman <rms@gnu.org>
parents: 22334
diff changeset
709
823
746ebe6cc4c8 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 814
diff changeset
710 ;; See if we should import version-control from the environment variable.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
711 (let ((vc (getenv "VERSION_CONTROL")))
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
712 (cond ((eq vc nil)) ;don't do anything if not set
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
713 ((member vc '("t" "numbered"))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
714 (setq version-control t))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
715 ((member vc '("nil" "existing"))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
716 (setq version-control nil))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
717 ((member vc '("never" "simple"))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
718 (setq version-control 'never))))
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719
755
e43123226372 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 748
diff changeset
720 ;;! This has been commented out; I currently find the behavior when
e43123226372 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 748
diff changeset
721 ;;! split-window-keep-point is nil disturbing, but if I can get used
e43123226372 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 748
diff changeset
722 ;;! to it, then it would be better to eliminate the option.
e43123226372 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 748
diff changeset
723 ;;! ;; Choose a good default value for split-window-keep-point.
e43123226372 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 748
diff changeset
724 ;;! (setq split-window-keep-point (> baud-rate 2400))
384
9dab5ca1890f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 370
diff changeset
725
24203
06cb71bb7bc5 (command-line): Set default eol-mnemonic-* strings to
Eli Zaretskii <eliz@gnu.org>
parents: 24198
diff changeset
726 ;; Set the default strings to display in mode line for
06cb71bb7bc5 (command-line): Set default eol-mnemonic-* strings to
Eli Zaretskii <eliz@gnu.org>
parents: 24198
diff changeset
727 ;; end-of-line formats that aren't native to this platform.
06cb71bb7bc5 (command-line): Set default eol-mnemonic-* strings to
Eli Zaretskii <eliz@gnu.org>
parents: 24198
diff changeset
728 (cond
06cb71bb7bc5 (command-line): Set default eol-mnemonic-* strings to
Eli Zaretskii <eliz@gnu.org>
parents: 24198
diff changeset
729 ((memq system-type '(ms-dos windows-nt emx))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
730 (setq eol-mnemonic-unix "(Unix)"
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
731 eol-mnemonic-mac "(Mac)"))
42790
987fa2a733e0 (command-line): Set EOL mnemonics for the Mac.
Eli Zaretskii <eliz@gnu.org>
parents: 42745
diff changeset
732 ;; Both Mac and Unix EOLs are now "native" on Mac OS so keep the
987fa2a733e0 (command-line): Set EOL mnemonics for the Mac.
Eli Zaretskii <eliz@gnu.org>
parents: 42745
diff changeset
733 ;; abbreviated strings `/' and `:' set in coding.c for them.
987fa2a733e0 (command-line): Set EOL mnemonics for the Mac.
Eli Zaretskii <eliz@gnu.org>
parents: 42745
diff changeset
734 ((eq system-type 'macos)
987fa2a733e0 (command-line): Set EOL mnemonics for the Mac.
Eli Zaretskii <eliz@gnu.org>
parents: 42745
diff changeset
735 (setq eol-mnemonic-dos "(DOS)"))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
736 (t ; this is for Unix/GNU/Linux systems
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
737 (setq eol-mnemonic-dos "(DOS)"
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
738 eol-mnemonic-mac "(Mac)")))
24203
06cb71bb7bc5 (command-line): Set default eol-mnemonic-* strings to
Eli Zaretskii <eliz@gnu.org>
parents: 24198
diff changeset
739
83074
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
740 ;; Make sure window system's init file was loaded in loadup.el if using a window system.
8748
fca85f8be890 (command-line): If we can't load x-win.el, terminate.
Richard M. Stallman <rms@gnu.org>
parents: 8335
diff changeset
741 (condition-case error
83018
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
742 (unless noninteractive
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
743 (if (and initial-window-system
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
744 (not (featurep
83074
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83072
diff changeset
745 (intern (concat (symbol-name initial-window-system) "-win")))))
83018
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
746 (error "Unsupported window system `%s'" initial-window-system))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
747 ;; Process window-system specific command line parameters.
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
748 (setq command-line-args
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
749 (funcall (or (cdr (assq initial-window-system handle-args-function-alist))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
750 (error "Unsupported window system `%s'" initial-window-system))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
751 command-line-args))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
752 ;; Initialize the window system. (Open connection, etc.)
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
753 (funcall (or (cdr (assq initial-window-system window-system-initialization-alist))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
754 (error "Unsupported window system `%s'" initial-window-system))))
1465425fe2d3 Romain Francoise's and Ami Fischman's bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83014
diff changeset
755 ;; If there was an error, print the error message and exit.
8748
fca85f8be890 (command-line): If we can't load x-win.el, terminate.
Richard M. Stallman <rms@gnu.org>
parents: 8335
diff changeset
756 (error
8749
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
757 (princ
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
758 (if (eq (car error) 'error)
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
759 (apply 'concat (cdr error))
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
760 (if (memq 'file-error (get (car error) 'error-conditions))
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
761 (format "%s: %s"
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
762 (nth 1 error)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
763 (mapconcat (lambda (obj) (prin1-to-string obj t))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
764 (cdr (cdr error)) ", "))
8749
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
765 (format "%s: %s"
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
766 (get (car error) 'error-message)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
767 (mapconcat (lambda (obj) (prin1-to-string obj t))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
768 (cdr error) ", "))))
8749
db4473742de7 (commmand-line): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 8748
diff changeset
769 'external-debugging-output)
37320
43f6d0dc6354 (command-line): Output a newline after printing
Gerd Moellmann <gerd@gnu.org>
parents: 37191
diff changeset
770 (terpri 'external-debugging-output)
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 52553
diff changeset
771 (setq initial-window-system nil)
8748
fca85f8be890 (command-line): If we can't load x-win.el, terminate.
Richard M. Stallman <rms@gnu.org>
parents: 8335
diff changeset
772 (kill-emacs)))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
773
33880
29bb0c0782b1 Do not call set-locale-environment until after terminal is initialized.
Jason Rumney <jasonr@gnu.org>
parents: 33850
diff changeset
774 (set-locale-environment nil)
29bb0c0782b1 Do not call set-locale-environment until after terminal is initialized.
Jason Rumney <jasonr@gnu.org>
parents: 33850
diff changeset
775
76119
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
776 ;; Convert preloaded file names in load-history to absolute.
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
777 (let ((simple-file-name
76144
90b084c781df Add comment explaining why we look for simple.el on startup.
Eli Zaretskii <eliz@gnu.org>
parents: 76127
diff changeset
778 ;; Look for simple.el or simple.elc and use their directory
90b084c781df Add comment explaining why we look for simple.el on startup.
Eli Zaretskii <eliz@gnu.org>
parents: 76127
diff changeset
779 ;; as the place where all Lisp files live.
76119
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
780 (locate-file "simple" load-path (get-load-suffixes)))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
781 lisp-dir)
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
782 ;; Don't abort if simple.el cannot be found, but print a warning.
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
783 (if (null simple-file-name)
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
784 (progn
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
785 (princ "Warning: Could not find simple.el nor simple.elc"
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
786 'external-debugging-output)
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
787 (terpri 'external-debugging-output))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
788 (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
789 (setq load-history
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
790 (mapcar (lambda (elt)
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
791 (if (and (stringp (car elt))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
792 (not (file-name-absolute-p (car elt))))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
793 (cons (concat lisp-dir
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
794 (car elt))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
795 (cdr elt))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
796 elt))
99573326a46c (command-line): If simple.el cannot be found, proceed with a warning message.
Eli Zaretskii <eliz@gnu.org>
parents: 76095
diff changeset
797 load-history))))
66287
194343998a00 (command-line): Convert library names in `load-history' to absolute file names.
Richard M. Stallman <rms@gnu.org>
parents: 66054
diff changeset
798
42332
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
799 ;; Convert the arguments to Emacs internal representation.
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
800 (let ((args (cdr command-line-args)))
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
801 (while args
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
802 (setcar args
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
803 (decode-coding-string (car args) locale-coding-system t))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
804 (pop args)))
42332
22bb1392751f (command-line): Convert command line args
Richard M. Stallman <rms@gnu.org>
parents: 42080
diff changeset
805
326
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
806 (let ((done nil)
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
807 (args (cdr command-line-args)))
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
808
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809 ;; Figure out which user's init file to load,
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
810 ;; either from the environment or from the options.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
811 (setq init-file-user (if noninteractive nil (user-login-name)))
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
812 ;; If user has not done su, use current $HOME to find .emacs.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
813 (and init-file-user
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
814 (equal init-file-user (user-real-login-name))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 (setq init-file-user ""))
326
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
816
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
817 ;; Process the command-line args, and delete the arguments
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
818 ;; processed. This is consistent with the way main in emacs.c
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
819 ;; does things.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
820 (while (and (not done) args)
64347
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
821 (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--debug-init")
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
822 ("--user") ("--iconic") ("--icon-type") ("--quick")
e99898c983f2 (site-run-file, keyboard-type): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 64297
diff changeset
823 ("--no-blinking-cursor") ("--basic-display")))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
824 (argi (pop args))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
825 (orig-argi argi)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
826 argval)
13479
983cfcaf1fbd (command-line): Complain about unknown options.
Richard M. Stallman <rms@gnu.org>
parents: 13430
diff changeset
827 ;; Handle --OPTION=VALUE format.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
828 (when (string-match "^\\(--[^=]*\\)=" argi)
45530
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
829 (setq argval (substring argi (match-end 0))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
830 argi (match-string 1 argi)))
45530
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
831 (unless (equal argi "--")
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
832 (let ((completion (try-completion argi longopts)))
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
833 (if (eq completion t)
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
834 (setq argi (substring argi 1))
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
835 (if (stringp completion)
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
836 (let ((elt (assoc completion longopts)))
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
837 (or elt
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
838 (error "Option `%s' is ambiguous" argi))
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
839 (setq argi (substring (car elt) 1)))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
840 (setq argval nil
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
841 argi orig-argi)))))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
842 (cond
61452
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
843 ((member argi '("-Q" "-quick"))
54852
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
844 (setq init-file-user nil
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
845 site-run-file nil
61452
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
846 emacs-quick-startup t))
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
847 ((member argi '("-D" "-basic-display"))
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
848 (setq no-blinking-cursor t
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
849 emacs-basic-display t)
54852
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
850 (push '(vertical-scroll-bars . nil) initial-frame-alist))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
851 ((member argi '("-q" "-no-init-file"))
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
852 (setq init-file-user nil))
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
853 ((member argi '("-u" "-user"))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
854 (setq init-file-user (or argval (pop args))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
855 argval nil))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
856 ((equal argi "-no-site-file")
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
857 (setq site-run-file nil))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
858 ((equal argi "-debug-init")
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
859 (setq init-file-debug t))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
860 ((equal argi "-iconic")
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
861 (push '(visibility . icon) initial-frame-alist))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
862 ((member argi '("-icon-type" "-i" "-itype"))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
863 (push '(icon-type . t) default-frame-alist))
60397
b796f66dc4d1 (no-blinking-cursor): New defvar.
Juri Linkov <juri@jurta.org>
parents: 60022
diff changeset
864 ((member argi '("-nbc" "-no-blinking-cursor"))
b796f66dc4d1 (no-blinking-cursor): New defvar.
Juri Linkov <juri@jurta.org>
parents: 60022
diff changeset
865 (setq no-blinking-cursor t))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
866 ;; Push the popped arg back on the list of arguments.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
867 (t
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
868 (push argi args)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
869 (setq done t)))
9173
6ee3eeec722b (command-line): Recognize --longopt synonyms for all options handled here.
Karl Heuer <kwzh@gnu.org>
parents: 8989
diff changeset
870 ;; Was argval set but not used?
6ee3eeec722b (command-line): Recognize --longopt synonyms for all options handled here.
Karl Heuer <kwzh@gnu.org>
parents: 8989
diff changeset
871 (and argval
6ee3eeec722b (command-line): Recognize --longopt synonyms for all options handled here.
Karl Heuer <kwzh@gnu.org>
parents: 8989
diff changeset
872 (error "Option `%s' doesn't allow an argument" argi))))
6ee3eeec722b (command-line): Recognize --longopt synonyms for all options handled here.
Karl Heuer <kwzh@gnu.org>
parents: 8989
diff changeset
873
326
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
874 ;; Re-attach the program name to the front of the arg list.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
875 (and command-line-args
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
876 (setcdr command-line-args args)))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
877
66490
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
878 (run-hooks 'before-init-hook)
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
879
61505
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
880 ;; Under X Window, this creates the X frame and deletes the terminal frame.
35736
b0dd419f0534 (command-line): Remove manipulation of frame
Gerd Moellmann <gerd@gnu.org>
parents: 35601
diff changeset
881 (when (fboundp 'frame-initialize)
b0dd419f0534 (command-line): Remove manipulation of frame
Gerd Moellmann <gerd@gnu.org>
parents: 35601
diff changeset
882 (frame-initialize))
b0dd419f0534 (command-line): Remove manipulation of frame
Gerd Moellmann <gerd@gnu.org>
parents: 35601
diff changeset
883
61505
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
884 ;; Turn off blinking cursor if so specified in X resources. This is here
61545
be83d1c4960a Chaneg "is" to "are"
Jan Djärv <jan.h.d@swipnet.se>
parents: 61543
diff changeset
885 ;; only because all other settings of no-blinking-cursor are here.
61505
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
886 (unless (or noninteractive
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
887 emacs-basic-display
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96868
diff changeset
888 (and (memq window-system '(x w32 ns))
61505
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
889 (not (member (x-get-resource "cursorBlink" "CursorBlink")
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
890 '("off" "false")))))
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
891 (setq no-blinking-cursor t))
c8cf56d85000 Added new X reosurce, cursorBlink.
Jan Djärv <jan.h.d@swipnet.se>
parents: 61452
diff changeset
892
8759
19d9177069c4 (command-line): If initial X frame has a menu bar, mark menu-bar-mode as on.
Richard M. Stallman <rms@gnu.org>
parents: 8749
diff changeset
893 ;; If frame was created with a menu bar, set menu-bar-mode on.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
894 (unless (or noninteractive
61452
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
895 emacs-basic-display
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 52553
diff changeset
896 (and (memq initial-window-system '(x w32))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
897 (<= (frame-parameter nil 'menu-bar-lines) 0)))
49997
afcd12db0367 * startup.el (command-line): Call menu-bar-mode with 1 instead of t.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49988
diff changeset
898 (menu-bar-mode 1))
2761
26bad513fbb0 (command-line): Call frame-initialize explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 2105
diff changeset
899
31823
4532598de5a9 (command-line): If frame was created with a non-zero
Gerd Moellmann <gerd@gnu.org>
parents: 31800
diff changeset
900 ;; If frame was created with a tool bar, switch tool-bar-mode on.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
901 (unless (or noninteractive
61452
b9d559315c0a (fancy-splash-tail): Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 61359
diff changeset
902 emacs-basic-display
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
903 (not (display-graphic-p))
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
904 (<= (frame-parameter nil 'tool-bar-lines) 0))
35510
04fd42105e13 (tool-bar-images-pixel-height): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35046
diff changeset
905 (tool-bar-mode 1))
31823
4532598de5a9 (command-line): If frame was created with a non-zero
Gerd Moellmann <gerd@gnu.org>
parents: 31800
diff changeset
906
60022
67919735cf64 (command-line): Adapt blinking cursor init to changes in frame.el.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59334
diff changeset
907 ;; Can't do this init in defcustom because the relevant variables
60415
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
908 ;; are not set.
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
909 (custom-reevaluate-setting 'blink-cursor-mode)
64297
12d6287fd482 (command-line): Use `custom-reevaluate-setting' again for tooltip-mode.
Luc Teirlinck <teirllm@auburn.edu>
parents: 64259
diff changeset
910 (custom-reevaluate-setting 'tooltip-mode)
66723
a4c04d1213c4 (command-line): Use `custom-reevaluate-setting' for `global-font-lock-mode'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 66717
diff changeset
911 (custom-reevaluate-setting 'global-font-lock-mode)
66683
b34febff3030 (command-line): Use `custom-reevaluate-setting' for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 66545
diff changeset
912 (custom-reevaluate-setting 'mouse-wheel-down-event)
b34febff3030 (command-line): Use `custom-reevaluate-setting' for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 66545
diff changeset
913 (custom-reevaluate-setting 'mouse-wheel-up-event)
66907
904ed14c0a43 (command-line): Use `custom-reevaluate-setting' for `file-name-shadow-mode'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 66723
diff changeset
914 (custom-reevaluate-setting 'file-name-shadow-mode)
67878
fe8ec3e744b3 (command-line): Use `custom-reevaluate-setting' for `send-mail-function'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 67519
diff changeset
915 (custom-reevaluate-setting 'send-mail-function)
73071
2a9cd15ddc2a (command-line): Use `custom-reevaluate-setting' for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 72939
diff changeset
916 (custom-reevaluate-setting 'focus-follows-mouse)
90310
716899c45974 (command-line): Use custom-reevaluate-setting for
Kenichi Handa <handa@m17n.org>
parents: 90286
diff changeset
917 (custom-reevaluate-setting 'global-auto-composition-mode)
91911
07b62dd00afa * simple.el (transient-mark-mode): Add an :init-value.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 91893
diff changeset
918 (custom-reevaluate-setting 'transient-mark-mode)
94512
d10cd2d8d9ae * epa-file-hook.el: New file split from epa-file.el.
Daiki Ueno <ueno@unixuser.org>
parents: 92890
diff changeset
919 (custom-reevaluate-setting 'auto-encryption-mode)
33355
4161fec906e0 (command-line): Set the default tooltip-mode
Gerd Moellmann <gerd@gnu.org>
parents: 33236
diff changeset
920
83387
0181341f0aca Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents: 83385
diff changeset
921 (normal-erase-is-backspace-setup-frame)
33355
4161fec906e0 (command-line): Set the default tooltip-mode
Gerd Moellmann <gerd@gnu.org>
parents: 33236
diff changeset
922
32583
b41e3ebd087e (command-line): Move the code which registers the default colors to
Eli Zaretskii <eliz@gnu.org>
parents: 32575
diff changeset
923 ;; Register default TTY colors for the case the terminal hasn't a
83397
693e794b57bf Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Karoly Lorentey <lorentey@elte.hu>
parents: 83389 66723
diff changeset
924 ;; terminal init file. We do this regardles of whether the terminal
693e794b57bf Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Karoly Lorentey <lorentey@elte.hu>
parents: 83389 66723
diff changeset
925 ;; supports colors or not and regardless the current display type,
693e794b57bf Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Karoly Lorentey <lorentey@elte.hu>
parents: 83389 66723
diff changeset
926 ;; since users can connect to color-capable terminals and also
693e794b57bf Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Karoly Lorentey <lorentey@elte.hu>
parents: 83389 66723
diff changeset
927 ;; switch color support on or off in mid-session by setting the
693e794b57bf Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Karoly Lorentey <lorentey@elte.hu>
parents: 83389 66723
diff changeset
928 ;; tty-color-mode frame parameter.
83021
32bf8e7cc0c2 Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83018
diff changeset
929 (tty-register-default-colors)
32583
b41e3ebd087e (command-line): Move the code which registers the default colors to
Eli Zaretskii <eliz@gnu.org>
parents: 32575
diff changeset
930
36321
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
931 ;; Record whether the tool-bar is present before the user and site
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
932 ;; init files are processed. frame-notice-user-settings uses this
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
933 ;; to determine if the tool-bar has been disabled by the init files,
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
934 ;; and the frame needs to be resized.
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
935 (when (fboundp 'frame-notice-user-settings)
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
936 (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
937 (assq 'tool-bar-lines default-frame-alist))))
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
938 (setq tool-bar-originally-present
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
939 (and tool-bar-lines
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
940 (cdr tool-bar-lines)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
941 (not (eq 0 (cdr tool-bar-lines)))))))
36321
a1214381b9e0 (tool-bar-originally-present): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 36278
diff changeset
942
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
943 (let ((old-scalable-fonts-allowed scalable-fonts-allowed)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
944 (old-font-list-limit font-list-limit)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
945 (old-face-ignored-fonts face-ignored-fonts))
370
d56e16bd220a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 326
diff changeset
946
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
947 ;; Run the site-start library if it exists. The point of this file is
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
948 ;; that it is run before .emacs. There is no point in doing this after
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
949 ;; .emacs; that is useless.
79039
ed7decb02144 Comment.
Glenn Morris <rgm@gnu.org>
parents: 78392
diff changeset
950 ;; Note that user-init-file is nil at this point. Code that might
ed7decb02144 Comment.
Glenn Morris <rgm@gnu.org>
parents: 78392
diff changeset
951 ;; be loaded from site-run-file and wants to test if -q was given
ed7decb02144 Comment.
Glenn Morris <rgm@gnu.org>
parents: 78392
diff changeset
952 ;; should check init-file-user instead, since that is already set.
ed7decb02144 Comment.
Glenn Morris <rgm@gnu.org>
parents: 78392
diff changeset
953 ;; See cus-edit.el for an example.
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
954 (if site-run-file
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
955 (load site-run-file t t))
33850
4cc1de4931b9 (command-line): Fix computation of the source file
Gerd Moellmann <gerd@gnu.org>
parents: 33355
diff changeset
956
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
957 ;; Sites should not disable this. Only individuals should disable
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
958 ;; the startup screen.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
959 (setq inhibit-startup-screen nil)
33850
4cc1de4931b9 (command-line): Fix computation of the source file
Gerd Moellmann <gerd@gnu.org>
parents: 33355
diff changeset
960
63565
977d18df13bb (command-line): Warn if specified user name has no home directory.
Richard M. Stallman <rms@gnu.org>
parents: 62696
diff changeset
961 ;; Warn for invalid user name.
66490
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
962 (when init-file-user
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
963 (if (string-match "[~/:\n]" init-file-user)
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
964 (display-warning 'initialization
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
965 (format "Invalid user name %s"
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
966 init-file-user)
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
967 :error)
70390
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
968 (if (file-directory-p (expand-file-name
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
969 ;; We don't support ~USER on MS-Windows except
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
970 ;; for the current user, and always load .emacs
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
971 ;; from the current user's home directory (see
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
972 ;; below). So always check "~", even if invoked
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
973 ;; with "-u USER", or if $USER or $LOGNAME are
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
974 ;; set to something different.
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
975 (if (eq system-type 'windows-nt)
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
976 "~"
0712a8b0bd8a (command-line): On MS-Windows, probe "~", not "~USER", for warning about
Eli Zaretskii <eliz@gnu.org>
parents: 70345
diff changeset
977 (concat "~" init-file-user))))
66490
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
978 nil
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
979 (display-warning 'initialization
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
980 (format "User %s has no home directory"
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
981 init-file-user)
7179660b21c9 (command-line): Call before-init-hook earlier.
Richard M. Stallman <rms@gnu.org>
parents: 66287
diff changeset
982 :error))))
63565
977d18df13bb (command-line): Warn if specified user name has no home directory.
Richard M. Stallman <rms@gnu.org>
parents: 62696
diff changeset
983
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
984 ;; Load that user's init file, or the default one, or none.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
985 (let (debug-on-error-from-init-file
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
986 debug-on-error-should-be-set
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
987 (debug-on-error-initial
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
988 (if (eq init-file-debug t) 'startup init-file-debug))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
989 (orig-enable-multibyte default-enable-multibyte-characters))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
990 (let ((debug-on-error debug-on-error-initial)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
991 ;; This function actually reads the init files.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
992 (inner
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
993 (function
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
994 (lambda ()
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
995 (if init-file-user
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
996 (let ((user-init-file-1
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
997 (cond
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
998 ((eq system-type 'ms-dos)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
999 (concat "~" init-file-user "/_emacs"))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1000 ((eq system-type 'windows-nt)
57171
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1001 ;; Prefer .emacs on Windows.
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1002 (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1003 "~/.emacs"
57171
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1004 ;; Also support _emacs for compatibility.
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1005 (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1006 "~/_emacs"
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1007 ;; But default to .emacs if _emacs does not exist.
9bc06f7dfca8 (command-line) [windows-nt]: Try .emacs first, then
Jason Rumney <jasonr@gnu.org>
parents: 57002
diff changeset
1008 "~/.emacs")))
41171
b36db0352ec7 (normal-top-level-add-subdirs-to-load-path): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41155
diff changeset
1009 (t
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1010 (concat "~" init-file-user "/.emacs")))))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1011 ;; This tells `load' to store the file name found
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1012 ;; into user-init-file.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1013 (setq user-init-file t)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1014 (load user-init-file-1 t t)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1015
48015
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1016 (when (eq user-init-file t)
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1017 ;; If we did not find ~/.emacs, try
66545
751320d2d8b6 * startup.el (command-line): Use ~/.emacs.d/init.el instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 66490
diff changeset
1018 ;; ~/.emacs.d/init.el.
48015
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1019 (let ((otherfile
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1020 (expand-file-name
66545
751320d2d8b6 * startup.el (command-line): Use ~/.emacs.d/init.el instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 66490
diff changeset
1021 "init"
48015
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1022 (file-name-as-directory
66545
751320d2d8b6 * startup.el (command-line): Use ~/.emacs.d/init.el instead of
Chong Yidong <cyd@stupidchicken.com>
parents: 66490
diff changeset
1023 (concat "~" init-file-user "/.emacs.d")))))
48015
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1024 (load otherfile t t)
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1025
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1026 ;; If we did not find the user's init file,
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1027 ;; set user-init-file conclusively.
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1028 ;; Don't let it be set from default.el.
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1029 (when (eq user-init-file t)
68b29ca63a54 (command-line): Look for .emacs under ~/.emacs.d after looking in ~.
Richard M. Stallman <rms@gnu.org>
parents: 47733
diff changeset
1030 (setq user-init-file user-init-file-1))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1031
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1032 ;; If we loaded a compiled file, set
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1033 ;; `user-init-file' to the source version if that
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1034 ;; exists.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1035 (when (and user-init-file
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1036 (equal (file-name-extension user-init-file)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1037 "elc"))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1038 (let* ((source (file-name-sans-extension user-init-file))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1039 (alt (concat source ".el")))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1040 (setq source (cond ((file-exists-p alt) alt)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1041 ((file-exists-p source) source)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1042 (t nil)))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1043 (when source
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1044 (when (file-newer-than-file-p source user-init-file)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1045 (message "Warning: %s is newer than %s"
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1046 source user-init-file)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1047 (sit-for 1))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1048 (setq user-init-file source))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1049
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1050 (unless inhibit-default-init
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1051 (let ((inhibit-startup-screen nil))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1052 ;; Users are supposed to be told their rights.
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1053 ;; (Plus how to get help and how to undo.)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1054 ;; Don't you dare turn this off for anyone
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1055 ;; except yourself.
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1056 (load "default" t t)))))))))
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1057 (if init-file-debug
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1058 ;; Do this without a condition-case if the user wants to debug.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1059 (funcall inner)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1060 (condition-case error
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1061 (progn
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1062 (funcall inner)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1063 (setq init-file-had-error nil))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1064 (error
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1065 (let ((message-log-max nil))
95777
edc51d72cb17 * window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
1066 (with-current-buffer (get-buffer-create "*Messages*")
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1067 (insert "\n\n"
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1068 (format "An error has occurred while loading `%s':\n\n"
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1069 user-init-file)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1070 (format "%s%s%s"
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1071 (get (car error) 'error-message)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1072 (if (cdr error) ": " "")
49897
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1073 (mapconcat (lambda (s) (prin1-to-string s t)) (cdr error) ", "))
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1074 "\n\n"
49897
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1075 "To ensure normal operation, you should investigate and remove the\n"
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1076 "cause of the error in your initialization file. Start Emacs with\n"
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1077 "the `--debug-init' option to view a complete error backtrace.\n\n"))
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1078 (message "Error in init file: %s%s%s"
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1079 (get (car error) 'error-message)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1080 (if (cdr error) ": " "")
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1081 (mapconcat 'prin1-to-string (cdr error) ", "))
49897
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1082 (let ((pop-up-windows nil))
99cc7aecbbec (command-line): Clarify and tidy up the message
Kim F. Storm <storm@cua.dk>
parents: 49597
diff changeset
1083 (pop-to-buffer "*Messages*"))
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1084 (setq init-file-had-error t)))))
40906
fe298eabbb27 (command-line): Read standard abbrev
Richard M. Stallman <rms@gnu.org>
parents: 40681
diff changeset
1085
67519
f69aa26e69fd (inhibit-splash-screen): Make this the real name.
Richard M. Stallman <rms@gnu.org>
parents: 67076
diff changeset
1086 (if (and deactivate-mark transient-mark-mode)
f69aa26e69fd (inhibit-splash-screen): Make this the real name.
Richard M. Stallman <rms@gnu.org>
parents: 67076
diff changeset
1087 (with-current-buffer (window-buffer)
f69aa26e69fd (inhibit-splash-screen): Make this the real name.
Richard M. Stallman <rms@gnu.org>
parents: 67076
diff changeset
1088 (deactivate-mark)))
f69aa26e69fd (inhibit-splash-screen): Make this the real name.
Richard M. Stallman <rms@gnu.org>
parents: 67076
diff changeset
1089
85192
9f2eefd96d8e (command-line): Do not read abbrev file in batch mode.
Glenn Morris <rgm@gnu.org>
parents: 85179
diff changeset
1090 ;; If the user has a file of abbrevs, read it (unless -batch).
9f2eefd96d8e (command-line): Do not read abbrev file in batch mode.
Glenn Morris <rgm@gnu.org>
parents: 85179
diff changeset
1091 (when (and (not noninteractive)
9f2eefd96d8e (command-line): Do not read abbrev file in batch mode.
Glenn Morris <rgm@gnu.org>
parents: 85179
diff changeset
1092 (file-exists-p abbrev-file-name)
76127
a909bafa108e (command-line): Also check if the abbrev file is
Dan Nicolaescu <dann@ics.uci.edu>
parents: 76119
diff changeset
1093 (file-readable-p abbrev-file-name))
40906
fe298eabbb27 (command-line): Read standard abbrev
Richard M. Stallman <rms@gnu.org>
parents: 40681
diff changeset
1094 (quietly-read-abbrev-file abbrev-file-name))
fe298eabbb27 (command-line): Read standard abbrev
Richard M. Stallman <rms@gnu.org>
parents: 40681
diff changeset
1095
41231
8ea2b10d5a82 (command-line): Set abbrevs-changed to nil after
Richard M. Stallman <rms@gnu.org>
parents: 41171
diff changeset
1096 ;; If the abbrevs came entirely from the init file or the
8ea2b10d5a82 (command-line): Set abbrevs-changed to nil after
Richard M. Stallman <rms@gnu.org>
parents: 41171
diff changeset
1097 ;; abbrevs file, they do not need saving.
8ea2b10d5a82 (command-line): Set abbrevs-changed to nil after
Richard M. Stallman <rms@gnu.org>
parents: 41171
diff changeset
1098 (setq abbrevs-changed nil)
8ea2b10d5a82 (command-line): Set abbrevs-changed to nil after
Richard M. Stallman <rms@gnu.org>
parents: 41171
diff changeset
1099
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1100 ;; If we can tell that the init file altered debug-on-error,
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1101 ;; arrange to preserve the value that it set up.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1102 (or (eq debug-on-error debug-on-error-initial)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1103 (setq debug-on-error-should-be-set t
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1104 debug-on-error-from-init-file debug-on-error)))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1105 (if debug-on-error-should-be-set
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1106 (setq debug-on-error debug-on-error-from-init-file))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1107 (unless (or default-enable-multibyte-characters
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1108 (eq orig-enable-multibyte default-enable-multibyte-characters))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1109 ;; Init file changed to unibyte. Reset existing multibyte
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1110 ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*).
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1111 ;; Arguably this should only be done if they're free of
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1112 ;; multibyte characters.
84879
54aa4c1eb6d6 (command-line): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84790
diff changeset
1113 (mapc (lambda (buffer)
54aa4c1eb6d6 (command-line): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84790
diff changeset
1114 (with-current-buffer buffer
54aa4c1eb6d6 (command-line): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84790
diff changeset
1115 (if enable-multibyte-characters
54aa4c1eb6d6 (command-line): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84790
diff changeset
1116 (set-buffer-multibyte nil))))
54aa4c1eb6d6 (command-line): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84790
diff changeset
1117 (buffer-list))
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1118 ;; Also re-set the language environment in case it was
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1119 ;; originally done before unibyte was set and is sensitive to
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1120 ;; unibyte (display table, terminal coding system &c).
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1121 (set-language-environment current-language-environment)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1122
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1123 ;; Do this here in case the init file sets mail-host-address.
47692
ff9770dda600 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 47688
diff changeset
1124 (if (equal user-mail-address "")
72064
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
1125 (setq user-mail-address (or (getenv "EMAIL")
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
1126 (concat (user-login-name) "@"
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
1127 (or mail-host-address
05f42d7646b5 (user-mail-address): Initialize from the `EMAIL' environment variable first.
Eli Zaretskii <eliz@gnu.org>
parents: 70879
diff changeset
1128 (system-name))))))
370
d56e16bd220a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 326
diff changeset
1129
66717
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1130 ;; Originally face attributes were specified via
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1131 ;; `font-lock-face-attributes'. Users then changed the default
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1132 ;; face attributes by setting that variable. However, we try and
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1133 ;; be back-compatible and respect its value if set except for
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1134 ;; faces where M-x customize has been used to save changes for the
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1135 ;; face.
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1136 (when (boundp 'font-lock-face-attributes)
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1137 (let ((face-attributes font-lock-face-attributes))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1138 (while face-attributes
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1139 (let* ((face-attribute (pop face-attributes))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1140 (face (car face-attribute)))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1141 ;; Rustle up a `defface' SPEC from a
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1142 ;; `font-lock-face-attributes' entry.
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1143 (unless (get face 'saved-face)
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1144 (let ((foreground (nth 1 face-attribute))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1145 (background (nth 2 face-attribute))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1146 (bold-p (nth 3 face-attribute))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1147 (italic-p (nth 4 face-attribute))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1148 (underline-p (nth 5 face-attribute))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1149 face-spec)
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1150 (when foreground
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1151 (setq face-spec (cons ':foreground (cons foreground face-spec))))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1152 (when background
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1153 (setq face-spec (cons ':background (cons background face-spec))))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1154 (when bold-p
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1155 (setq face-spec (append '(:weight bold) face-spec)))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1156 (when italic-p
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1157 (setq face-spec (append '(:slant italic) face-spec)))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1158 (when underline-p
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1159 (setq face-spec (append '(:underline t) face-spec)))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1160 (face-spec-set face (list (list t face-spec)) nil)))))))
5271a20d9255 * font-lock.el: Don't deal with font-lock-face-attributes here,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 66685
diff changeset
1161
37688
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1162 ;; If parameter have been changed in the init file which influence
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1163 ;; face realization, clear the face cache so that new faces will
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1164 ;; be realized.
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1165 (unless (and (eq scalable-fonts-allowed old-scalable-fonts-allowed)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1166 (eq font-list-limit old-font-list-limit)
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1167 (eq face-ignored-fonts old-face-ignored-fonts))
187a17e0e802 (command-line): If parameters have been changed in
Gerd Moellmann <gerd@gnu.org>
parents: 37320
diff changeset
1168 (clear-face-cache)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1169
91893
1aaa6ac14ee4 (after-init-time): New variable.
Juri Linkov <juri@jurta.org>
parents: 91883
diff changeset
1170 (setq after-init-time (current-time))
688
23cbc2c463eb *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 658
diff changeset
1171 (run-hooks 'after-init-hook)
23cbc2c463eb *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 658
diff changeset
1172
58635
ab26a3de6d9c (command-line): Fix comment for the previous change.
Kenichi Handa <handa@m17n.org>
parents: 58619
diff changeset
1173 ;; Decode all default-directory.
58619
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1174 (if (and default-enable-multibyte-characters locale-coding-system)
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1175 (save-excursion
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1176 (dolist (elt (buffer-list))
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1177 (set-buffer elt)
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1178 (if default-directory
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1179 (setq default-directory
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1180 (decode-coding-string default-directory
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1181 locale-coding-system t))))
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1182 (setq command-line-default-directory
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1183 (decode-coding-string command-line-default-directory
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1184 locale-coding-system t))))
99adc3e470bb (command-line): Decode all buffer names by locale-coding-system.
Kenichi Handa <handa@m17n.org>
parents: 57545
diff changeset
1185
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1186 ;; If *scratch* exists and init file didn't change its mode, initialize it.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1187 (if (get-buffer "*scratch*")
46889
13ce201c9620 (command-line): Load custom-file if not done yet.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46803
diff changeset
1188 (with-current-buffer "*scratch*"
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 (if (eq major-mode 'fundamental-mode)
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1190 (funcall initial-major-mode))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48015
diff changeset
1191
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1192 ;; Load library for our terminal type.
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1193 ;; User init file can set term-file-prefix to nil to prevent this.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1194 (unless (or noninteractive
83359
8f0c7632f259 Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents: 83358
diff changeset
1195 initial-window-system)
8f0c7632f259 Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents: 83358
diff changeset
1196 (tty-run-terminal-initialization (selected-frame)))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197
46330
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1198 ;; Update the out-of-memory error message based on user's key bindings
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1199 ;; for save-some-buffers.
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1200 (setq memory-signal-data
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1201 (list 'error
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1202 (substitute-command-keys "Memory exhausted--use \\[save-some-buffers] then exit and restart Emacs")))
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1203
326
ecc1a00366a3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 322
diff changeset
1204 ;; Process the remaining args.
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1205 (command-line-1 (cdr command-line-args))
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 ;; If -batch, terminate after processing the command options.
43821
f57c0d6e61c6 (command-line): Add call to emacs-session-restore
Jan Djärv <jan.h.d@swipnet.se>
parents: 43123
diff changeset
1208 (if noninteractive (kill-emacs t))
f57c0d6e61c6 (command-line): Add call to emacs-session-restore
Jan Djärv <jan.h.d@swipnet.se>
parents: 43123
diff changeset
1209
f57c0d6e61c6 (command-line): Add call to emacs-session-restore
Jan Djärv <jan.h.d@swipnet.se>
parents: 43123
diff changeset
1210 ;; Run emacs-session-restore (session management) if started by
f57c0d6e61c6 (command-line): Add call to emacs-session-restore
Jan Djärv <jan.h.d@swipnet.se>
parents: 43123
diff changeset
1211 ;; the session manager and we have a session manager connection.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1212 (if (and (boundp 'x-session-previous-id)
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
1213 (stringp x-session-previous-id))
61765
d9587a02572b (command-line): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 61610
diff changeset
1214 (with-no-warnings
d9587a02572b (command-line): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 61610
diff changeset
1215 (emacs-session-restore x-session-previous-id))))
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216
27365
56c304580b79 (command-line): Check for compiled user-init-file and
Dave Love <fx@gnu.org>
parents: 27020
diff changeset
1217 (defcustom initial-scratch-message (purecopy "\
26405
1b44b874f555 (initial-scratch-message): Add ";;" to the front of
Gerd Moellmann <gerd@gnu.org>
parents: 26195
diff changeset
1218 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.
1b44b874f555 (initial-scratch-message): Add ";;" to the front of
Gerd Moellmann <gerd@gnu.org>
parents: 26195
diff changeset
1219 ;; If you want to create a file, visit that file with C-x C-f,
1b44b874f555 (initial-scratch-message): Add ";;" to the front of
Gerd Moellmann <gerd@gnu.org>
parents: 26195
diff changeset
1220 ;; then enter the text in that file's own buffer.
19927
962303f5f565 (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19813
diff changeset
1221
27365
56c304580b79 (command-line): Check for compiled user-init-file and
Dave Love <fx@gnu.org>
parents: 27020
diff changeset
1222 ")
19927
962303f5f565 (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19813
diff changeset
1223 "Initial message displayed in *scratch* buffer at startup.
92786
f85ca7d27ab2 (inhibit-startup-screen): Revert incomplete
Juri Linkov <juri@jurta.org>
parents: 92692
diff changeset
1224 If this is nil, no message will be displayed."
42664
d8ac9a604877 (initial-scratch-message): Fix custom type, add group.
Richard M. Stallman <rms@gnu.org>
parents: 42637
diff changeset
1225 :type '(choice (text :tag "Message")
d8ac9a604877 (initial-scratch-message): Fix custom type, add group.
Richard M. Stallman <rms@gnu.org>
parents: 42637
diff changeset
1226 (const :tag "none" nil))
d8ac9a604877 (initial-scratch-message): Fix custom type, add group.
Richard M. Stallman <rms@gnu.org>
parents: 42637
diff changeset
1227 :group 'initialization)
19927
962303f5f565 (normal-top-level-add-to-load-path):
Richard M. Stallman <rms@gnu.org>
parents: 19813
diff changeset
1228
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1229
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1230 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1231 ;;; Fancy splash screen
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1232 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1233
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1234 (defvar fancy-startup-text
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1235 '((:face (variable-pitch (:foreground "red"))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1236 "Welcome to "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1237 :link ("GNU Emacs"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1238 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1239 "Browse http://www.gnu.org/software/emacs/")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1240 ", one component of the "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1241 :link
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1242 (lambda ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1243 (if (eq system-type 'gnu/linux)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1244 '("GNU/Linux"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1245 (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1246 "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
80290
918dceaeacfc (describe-gnu-project): Rename from describe-project. Change users.
Kim F. Storm <storm@cua.dk>
parents: 80263
diff changeset
1247 '("GNU" (lambda (button) (describe-gnu-project))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1248 "Display info on the GNU project")))
96820
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1249 " operating system.\n\n"
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1250 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1251 "\tLearn basic keystroke commands"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1252 (lambda ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1253 (let* ((en "TUTORIAL")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1254 (tut (or (get-language-info current-language-environment
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1255 'tutorial)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1256 en))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1257 (title (with-temp-buffer
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1258 (insert-file-contents
83901
81f157bfa93c (fancy-startup-text): Renamed from fancy-splash-text.
Richard M. Stallman <rms@gnu.org>
parents: 83887
diff changeset
1259 (expand-file-name tut tutorial-directory)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1260 nil 0 256)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1261 (search-forward ".")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1262 (buffer-substring (point-min) (1- (point))))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1263 ;; If there is a specific tutorial for the current language
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1264 ;; environment and it is not English, append its title.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1265 (if (string= en tut)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1266 ""
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1267 (concat " (" title ")"))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1268 "\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1269 :face variable-pitch
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1270 :link ("Emacs Guided Tour"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1271 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1272 "Browse http://www.gnu.org/software/emacs/tour/")
96820
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1273 "\tOverview of Emacs features at gnu.org\n"
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1274 :link ("View Emacs Manual" (lambda (button) (info-emacs-manual)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1275 "\tView the Emacs manual using Info\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1276 :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1277 "\tGNU Emacs comes with "
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1278 :face (variable-pitch (:slant oblique))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1279 "ABSOLUTELY NO WARRANTY\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1280 :face variable-pitch
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1281 :link ("Copying Conditions" (lambda (button) (describe-copying)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1282 "\tConditions for redistributing and changing Emacs\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1283 :link ("Ordering Manuals" (lambda (button) (view-order-manuals)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1284 "\tPurchasing printed copies of manuals\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1285 "\n"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1286 "A list of texts to show in the middle part of splash screens.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1287 Each element in the list should be a list of strings or pairs
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1288 `:face FACE', like `fancy-splash-insert' accepts them.")
77670
a7056aafb66a (fancy-splash-text): Add URL of guided tour.
Richard M. Stallman <rms@gnu.org>
parents: 77107
diff changeset
1289
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1290 (defvar fancy-about-text
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1291 '((:face (variable-pitch (:foreground "red"))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1292 "This is "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1293 :link ("GNU Emacs"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1294 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1295 "Browse http://www.gnu.org/software/emacs/")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1296 ", one component of the "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1297 :link
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1298 (lambda ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1299 (if (eq system-type 'gnu/linux)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1300 '("GNU/Linux"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1301 (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1302 "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
80290
918dceaeacfc (describe-gnu-project): Rename from describe-project. Change users.
Kim F. Storm <storm@cua.dk>
parents: 80263
diff changeset
1303 '("GNU" (lambda (button) (describe-gnu-project))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1304 "Display info on the GNU project.")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1305 " operating system.\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1306 :face (lambda ()
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1307 (list 'variable-pitch
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1308 (list :foreground
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1309 (if (eq (frame-parameter nil 'background-mode) 'dark)
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1310 "cyan" "darkblue"))))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1311 "\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1312 (lambda () (emacs-version))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1313 "\n"
96174
58ac3c5e4746 (fancy-about-text, fancy-startup-tail): Increase text size for
Chong Yidong <cyd@stupidchicken.com>
parents: 95841
diff changeset
1314 :face (variable-pitch (:height 0.8))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1315 (lambda () emacs-copyright)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1316 "\n\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1317 :face variable-pitch
84417
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1318 :link ("Authors"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1319 (lambda (button)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1320 (view-file (expand-file-name "AUTHORS" data-directory))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1321 (goto-char (point-min))))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1322 "\tMany people have contributed code included in GNU Emacs\n"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1323 :link ("Contributing"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1324 (lambda (button)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1325 (view-file (expand-file-name "CONTRIBUTE" data-directory))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1326 (goto-char (point-min))))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1327 "\tHow to contribute improvements to Emacs\n"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1328 "\n"
80290
918dceaeacfc (describe-gnu-project): Rename from describe-project. Change users.
Kim F. Storm <storm@cua.dk>
parents: 80263
diff changeset
1329 :link ("GNU and Freedom" (lambda (button) (describe-gnu-project)))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1330 "\tWhy we developed GNU Emacs, and the GNU operating system\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1331 :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1332 "\tGNU Emacs comes with "
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1333 :face (variable-pitch (:slant oblique))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1334 "ABSOLUTELY NO WARRANTY\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1335 :face variable-pitch
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1336 :link ("Copying Conditions" (lambda (button) (describe-copying)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1337 "\tConditions for redistributing and changing Emacs\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1338 :link ("Getting New Versions" (lambda (button) (describe-distribution)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1339 "\tHow to obtain the latest version of Emacs\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1340 :link ("Ordering Manuals" (lambda (button) (view-order-manuals)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1341 "\tBuying printed manuals from the FSF\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1342 "\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1343 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1344 "\tLearn basic Emacs keystroke commands"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1345 (lambda ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1346 (let* ((en "TUTORIAL")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1347 (tut (or (get-language-info current-language-environment
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1348 'tutorial)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1349 en))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1350 (title (with-temp-buffer
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1351 (insert-file-contents
83901
81f157bfa93c (fancy-startup-text): Renamed from fancy-splash-text.
Richard M. Stallman <rms@gnu.org>
parents: 83887
diff changeset
1352 (expand-file-name tut tutorial-directory)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1353 nil 0 256)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1354 (search-forward ".")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1355 (buffer-substring (point-min) (1- (point))))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1356 ;; If there is a specific tutorial for the current language
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1357 ;; environment and it is not English, append its title.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1358 (if (string= en tut)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1359 ""
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1360 (concat " (" title ")"))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1361 "\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1362 :link ("Emacs Guided Tour"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1363 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1364 "Browse http://www.gnu.org/software/emacs/tour/")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1365 "\tSee an overview of the many facilities of GNU Emacs"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1366 ))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1367 "A list of texts to show in the middle part of the About screen.
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1368 Each element in the list should be a list of strings or pairs
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1369 `:face FACE', like `fancy-splash-insert' accepts them.")
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1370
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1371
31736
64e334e97502 (fancy-splash-screen) <defgroup>: Fix syntax. Add
Dave Love <fx@gnu.org>
parents: 31722
diff changeset
1372 (defgroup fancy-splash-screen ()
31722
7c35dd8b31dc (fancy-splash-delay, fancy-splash-image): Add
Gerd Moellmann <gerd@gnu.org>
parents: 31714
diff changeset
1373 "Fancy splash screen when Emacs starts."
31736
64e334e97502 (fancy-splash-screen) <defgroup>: Fix syntax. Add
Dave Love <fx@gnu.org>
parents: 31722
diff changeset
1374 :version "21.1"
31722
7c35dd8b31dc (fancy-splash-delay, fancy-splash-image): Add
Gerd Moellmann <gerd@gnu.org>
parents: 31714
diff changeset
1375 :group 'initialization)
7c35dd8b31dc (fancy-splash-delay, fancy-splash-image): Add
Gerd Moellmann <gerd@gnu.org>
parents: 31714
diff changeset
1376
31769
33409fc6f40f (fancy-splash-image): Change :type.
Gerd Moellmann <gerd@gnu.org>
parents: 31765
diff changeset
1377 (defcustom fancy-splash-image nil
33409fc6f40f (fancy-splash-image): Change :type.
Gerd Moellmann <gerd@gnu.org>
parents: 31765
diff changeset
1378 "*The image to show in the splash screens, or nil for defaults."
31722
7c35dd8b31dc (fancy-splash-delay, fancy-splash-image): Add
Gerd Moellmann <gerd@gnu.org>
parents: 31714
diff changeset
1379 :group 'fancy-splash-screen
31769
33409fc6f40f (fancy-splash-image): Change :type.
Gerd Moellmann <gerd@gnu.org>
parents: 31765
diff changeset
1380 :type '(choice (const :tag "Default" nil)
33409fc6f40f (fancy-splash-image): Change :type.
Gerd Moellmann <gerd@gnu.org>
parents: 31765
diff changeset
1381 (file :tag "File")))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1382
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1383
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1384 (defvar splash-screen-keymap
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1385 (let ((map (make-sparse-keymap)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1386 (suppress-keymap map)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1387 (set-keymap-parent map button-buffer-map)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1388 (define-key map "\C-?" 'scroll-down)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1389 (define-key map " " 'scroll-up)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1390 (define-key map "q" 'exit-splash-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1391 map)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1392 "Keymap for splash screen buffer.")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1393
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1394 ;; These are temporary storage areas for the splash screen display.
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1395
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1396 (defun fancy-splash-insert (&rest args)
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1397 "Insert text into the current buffer, with faces.
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1398 Arguments from ARGS should be either strings; functions called
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1399 with no args that return a string; pairs `:face FACE', where FACE
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1400 is a face specification usable with `put-text-property'; or pairs
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1401 `:link LINK' where LINK is a list of arguments to pass to
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1402 `insert-button', of the form (LABEL ACTION [HELP-ECHO]), which
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1403 specifies the button's label, `action' property and help-echo string.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1404 FACE and LINK can also be functions, which are evaluated to obtain
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1405 a face or button specification."
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1406 (let ((current-face nil))
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1407 (while args
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1408 (cond ((eq (car args) :face)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1409 (setq args (cdr args) current-face (car args))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1410 (if (functionp current-face)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1411 (setq current-face (funcall current-face))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1412 ((eq (car args) :link)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1413 (setq args (cdr args))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1414 (let ((spec (car args)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1415 (if (functionp spec)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1416 (setq spec (funcall spec)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1417 (insert-button (car spec)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1418 'face (list 'link current-face)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1419 'action (cadr spec)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1420 'help-echo (concat "mouse-2, RET: "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1421 (or (nth 2 spec)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1422 "Follow this link"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1423 'follow-link t)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1424 (t (insert (propertize (let ((it (car args)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1425 (if (functionp it)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1426 (funcall it)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1427 it))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1428 'face current-face
79571
d08060a6f18a (fancy-splash-help-echo): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 79376
diff changeset
1429 'help-echo (startup-echo-area-message)))))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1430 (setq args (cdr args)))))
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1431
95841
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 95777
diff changeset
1432 (declare-function image-size "image.c" (spec &optional pixels frame))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1433
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1434 (defun fancy-splash-head ()
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1435 "Insert the head part of the splash screen into the current buffer."
37166
aa543a0e2c40 (fancy-splash-head): Use splash8.xpm for color
Gerd Moellmann <gerd@gnu.org>
parents: 37110
diff changeset
1436 (let* ((image-file (cond ((stringp fancy-splash-image)
aa543a0e2c40 (fancy-splash-head): Use splash8.xpm for color
Gerd Moellmann <gerd@gnu.org>
parents: 37110
diff changeset
1437 fancy-splash-image)
96479
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1438 ((display-color-p)
96785
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1439 (cond ((<= (display-planes) 8)
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1440 (if (image-type-available-p 'xpm)
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1441 "splash.xpm"
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1442 "splash.pbm"))
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1443 ((image-type-available-p 'svg)
96479
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1444 "splash.svg")
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1445 ((image-type-available-p 'png)
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1446 "splash.png")
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1447 ((image-type-available-p 'xpm)
96785
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1448 "splash.xpm")
0681352e405c * lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.
Juanma Barranquero <lekktu@gmail.com>
parents: 96752
diff changeset
1449 (t "splash.pbm")))
96479
2cfacee4e258 Add new SVG and PNG splash images.
Juanma Barranquero <lekktu@gmail.com>
parents: 96174
diff changeset
1450 (t "splash.pbm")))
37166
aa543a0e2c40 (fancy-splash-head): Use splash8.xpm for color
Gerd Moellmann <gerd@gnu.org>
parents: 37110
diff changeset
1451 (img (create-image image-file))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1452 (image-width (and img (car (image-size img))))
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1453 (window-width (window-width (selected-window))))
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1454 (when img
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1455 (when (> window-width image-width)
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1456 ;; Center the image in the window.
54852
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
1457 (insert (propertize " " 'display
dd005a791c40 (emacs-quick-startup): New defvar (set by -Q).
Kim F. Storm <storm@cua.dk>
parents: 54260
diff changeset
1458 `(space :align-to (+ center (-0.5 . ,img)))))
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1459
40681
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1460 ;; Change the color of the XPM version of the splash image
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1461 ;; so that it is visible with a dark frame background.
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1462 (when (and (memq 'xpm img)
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1463 (eq (frame-parameter nil 'background-mode) 'dark))
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1464 (setq img (append img '(:color-symbols (("#000000" . "gray30"))))))
74d51420aa46 (fancy-splash-head): Reapply Gerd's hack to make the shadow of the
Miles Bader <miles@gnu.org>
parents: 40675
diff changeset
1465
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1466 ;; Insert the image with a help-echo and a link.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1467 (make-button (prog1 (point) (insert-image img)) (point)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1468 'face 'default
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1469 'help-echo "mouse-2, RET: Browse http://www.gnu.org/"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1470 'action (lambda (button) (browse-url "http://www.gnu.org/"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1471 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1472 (insert "\n\n")))))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1473
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1474 (defun fancy-startup-tail (&optional concise)
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1475 "Insert the tail part of the splash screen into the current buffer."
31800
afc3af0cc724 (fancy-splash-tail): Use a different foreground
Gerd Moellmann <gerd@gnu.org>
parents: 31769
diff changeset
1476 (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
afc3af0cc724 (fancy-splash-tail): Use a different foreground
Gerd Moellmann <gerd@gnu.org>
parents: 31769
diff changeset
1477 "cyan" "darkblue")))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1478 (unless concise
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1479 (fancy-splash-insert
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1480 :face 'variable-pitch
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1481 "\nTo start... "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1482 :link '("Open a File"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1483 (lambda (button) (call-interactively 'find-file))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1484 "Specify a new file's name, to edit the file")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1485 " "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1486 :link '("Open Home Directory"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1487 (lambda (button) (dired "~"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1488 "Open your home directory, to operate on its files")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1489 " "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1490 :link '("Customize Startup"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1491 (lambda (button) (customize-group 'initialization))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1492 "Change initialization settings including this screen")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1493 "\n"))
96820
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1494 (fancy-splash-insert
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1495 :face 'variable-pitch "To quit a partially entered command, type "
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1496 :face 'default "Control-g"
dab516876348 (fancy-startup-text): Move the line "To quit a partially entered command,
Juri Linkov <juri@jurta.org>
parents: 96785
diff changeset
1497 :face 'variable-pitch ".\n")
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1498 (fancy-splash-insert :face `(variable-pitch (:foreground ,fg))
31800
afc3af0cc724 (fancy-splash-tail): Use a different foreground
Gerd Moellmann <gerd@gnu.org>
parents: 31769
diff changeset
1499 "\nThis is "
afc3af0cc724 (fancy-splash-tail): Use a different foreground
Gerd Moellmann <gerd@gnu.org>
parents: 31769
diff changeset
1500 (emacs-version)
afc3af0cc724 (fancy-splash-tail): Use a different foreground
Gerd Moellmann <gerd@gnu.org>
parents: 31769
diff changeset
1501 "\n"
96174
58ac3c5e4746 (fancy-about-text, fancy-startup-tail): Increase text size for
Chong Yidong <cyd@stupidchicken.com>
parents: 95841
diff changeset
1502 :face '(variable-pitch (:height 0.8))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1503 emacs-copyright
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1504 "\n")
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1505 (and auto-save-list-file-prefix
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1506 ;; Don't signal an error if the
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1507 ;; directory for auto-save-list files
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1508 ;; does not yet exist.
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1509 (file-directory-p (file-name-directory
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1510 auto-save-list-file-prefix))
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1511 (directory-files
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1512 (file-name-directory auto-save-list-file-prefix)
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1513 nil
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1514 (concat "\\`"
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1515 (regexp-quote (file-name-nondirectory
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1516 auto-save-list-file-prefix)))
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
1517 t)
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1518 (fancy-splash-insert :face '(variable-pitch (:foreground "red"))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1519 "\nIf an Emacs session crashed recently, "
73703
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
1520 "type "
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
1521 :face '(fixed-pitch :foreground "red")
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
1522 "Meta-x recover-session RET"
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1523 :face '(variable-pitch (:foreground "red"))
73703
b99c559d6365 (init-file-had-error): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 73126
diff changeset
1524 "\nto recover"
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1525 " the files you were editing."))
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1526
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1527 (when concise
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1528 (fancy-splash-insert
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1529 :face 'variable-pitch "\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1530 :link '("Dismiss this startup screen"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1531 (lambda (button)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1532 (when startup-screen-inhibit-startup-screen
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1533 (customize-set-variable 'inhibit-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1534 (customize-mark-to-save 'inhibit-startup-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1535 (custom-save-all))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1536 (let ((w (get-buffer-window "*GNU Emacs*")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1537 (and w (not (one-window-p)) (delete-window w)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1538 (kill-buffer "*GNU Emacs*")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1539 " ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1540 (when (or user-init-file custom-file)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1541 (let ((checked (create-image "\300\300\141\143\067\076\034\030"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1542 'xbm t :width 8 :height 8 :background "grey75"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1543 :foreground "black" :relief -2 :ascent 'center))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1544 (unchecked (create-image (make-string 8 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1545 'xbm t :width 8 :height 8 :background "grey75"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1546 :foreground "black" :relief -2 :ascent 'center)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1547 (insert-button
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1548 " " :on-glyph checked :off-glyph unchecked 'checked nil
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1549 'display unchecked 'follow-link t
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1550 'action (lambda (button)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1551 (if (overlay-get button 'checked)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1552 (progn (overlay-put button 'checked nil)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1553 (overlay-put button 'display (overlay-get button :off-glyph))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1554 (setq startup-screen-inhibit-startup-screen nil))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1555 (overlay-put button 'checked t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1556 (overlay-put button 'display (overlay-get button :on-glyph))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1557 (setq startup-screen-inhibit-startup-screen t)))))
79649
6805f3089622 (fancy-startup-tail, fancy-about-text)
Richard M. Stallman <rms@gnu.org>
parents: 79571
diff changeset
1558 (fancy-splash-insert :face '(variable-pitch (:height 0.9))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1559 " Never show it again.")))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1560
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1561 (defun exit-splash-screen ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1562 "Stop displaying the splash screen buffer."
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1563 (interactive)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1564 (quit-window t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1565
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1566 (defun fancy-startup-screen (&optional concise)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1567 "Display fancy startup screen.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1568 If CONCISE is non-nil, display a concise version of the
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1569 splash screen in another window."
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1570 (let ((splash-buffer (get-buffer-create "*GNU Emacs*")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1571 (with-current-buffer splash-buffer
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1572 (let ((inhibit-read-only t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1573 (erase-buffer)
80113
5b4e8ae6e892 (fancy-startup-screen, normal-splash-screen):
Juri Linkov <juri@jurta.org>
parents: 79721
diff changeset
1574 (setq default-directory command-line-default-directory)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1575 (make-local-variable 'startup-screen-inhibit-startup-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1576 (if pure-space-overflow
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1577 (insert pure-space-overflow-message))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1578 (unless concise
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1579 (fancy-splash-head))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1580 (dolist (text fancy-startup-text)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1581 (apply #'fancy-splash-insert text)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1582 (insert "\n"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1583 (skip-chars-backward "\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1584 (delete-region (point) (point-max))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1585 (insert "\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1586 (fancy-startup-tail concise))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1587 (use-local-map splash-screen-keymap)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1588 (setq tab-width 22
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1589 buffer-read-only t)
72497
6cc945ca398a * startup.el (fancy-splash-head): Give instructions for dismissing
Chong Yidong <cyd@stupidchicken.com>
parents: 72064
diff changeset
1590 (set-buffer-modified-p nil)
72574
1b6faf513fc3 (normal-splash-screen, fancy-splash-screens): Make buffer read-only and
Romain Francoise <romain@orebokech.com>
parents: 72497
diff changeset
1591 (if (and view-read-only (not view-mode))
1b6faf513fc3 (normal-splash-screen, fancy-splash-screens): Make buffer read-only and
Romain Francoise <romain@orebokech.com>
parents: 72497
diff changeset
1592 (view-mode-enter nil 'kill-buffer))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1593 (goto-char (point-min))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1594 (forward-line (if concise 2 4)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1595 (if concise
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1596 (progn
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1597 (display-buffer splash-buffer)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1598 ;; If the splash screen is in a split window, fit it.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1599 (let ((window (get-buffer-window splash-buffer t)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1600 (or (null window)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1601 (eq window (selected-window))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1602 (eq window (next-window window))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1603 (fit-window-to-buffer window))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1604 (switch-to-buffer splash-buffer))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1605
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1606 (defun fancy-about-screen ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1607 "Display fancy About screen."
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1608 (let ((frame (fancy-splash-frame)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1609 (save-selected-window
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1610 (select-frame frame)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1611 (switch-to-buffer "*About GNU Emacs*")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1612 (setq buffer-undo-list t
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1613 mode-line-format (propertize "---- %b %-"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1614 'face 'mode-line-buffer-id))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1615 (let ((inhibit-read-only t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1616 (erase-buffer)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1617 (if pure-space-overflow
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1618 (insert pure-space-overflow-message))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1619 (fancy-splash-head)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1620 (dolist (text fancy-about-text)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1621 (apply #'fancy-splash-insert text)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1622 (insert "\n"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1623 (set-buffer-modified-p nil)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1624 (goto-char (point-min))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1625 (force-mode-line-update))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1626 (use-local-map splash-screen-keymap)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1627 (setq tab-width 22)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1628 (message "%s" (startup-echo-area-message))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1629 (setq buffer-read-only t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1630 (goto-char (point-min))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1631 (forward-line 3))))
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1632
46135
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1633 (defun fancy-splash-frame ()
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1634 "Return the frame to use for the fancy splash screen.
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1635 Returning non-nil does not mean we should necessarily
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1636 use the fancy splash screen, but if we do use it,
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1637 we put it on this frame."
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1638 (let (chosen-frame)
46803
cf9cd5b7096e (fancy-splash-frame): Check selected frame last.
Glenn Morris <rgm@gnu.org>
parents: 46364
diff changeset
1639 (dolist (frame (append (frame-list) (list (selected-frame))))
46135
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1640 (if (and (frame-visible-p frame)
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1641 (not (window-minibuffer-p (frame-selected-window frame))))
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1642 (setq chosen-frame frame)))
742f54d0aedb (fancy-splash-screens): Switch to a chosen frame.
Richard M. Stallman <rms@gnu.org>
parents: 45532
diff changeset
1643 chosen-frame))
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1644
34129
9aede9b4161c (use-fancy-splash-screens-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33880
diff changeset
1645 (defun use-fancy-splash-screens-p ()
9aede9b4161c (use-fancy-splash-screens-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33880
diff changeset
1646 "Return t if fancy splash screens should be used."
52553
c9d6b407c93b (use-fancy-splash-screens-p, display-splash-screen): Move
Glenn Morris <rgm@gnu.org>
parents: 52550
diff changeset
1647 (when (and (display-graphic-p)
c9d6b407c93b (use-fancy-splash-screens-p, display-splash-screen): Move
Glenn Morris <rgm@gnu.org>
parents: 52550
diff changeset
1648 (or (and (display-color-p)
34129
9aede9b4161c (use-fancy-splash-screens-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33880
diff changeset
1649 (image-type-available-p 'xpm))
52553
c9d6b407c93b (use-fancy-splash-screens-p, display-splash-screen): Move
Glenn Morris <rgm@gnu.org>
parents: 52550
diff changeset
1650 (image-type-available-p 'pbm)))
47230
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1651 (let ((frame (fancy-splash-frame)))
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1652 (when frame
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1653 (let* ((img (create-image (or fancy-splash-image
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1654 (if (and (display-color-p)
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1655 (image-type-available-p 'xpm))
2f4274cc65ea *** empty log message ***
John Paul Wallington <jpw@pobox.com>
parents: 47024
diff changeset
1656 "splash.xpm" "splash.pbm"))))
74614
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1657 (image-height (and img (cdr (image-size img nil frame))))
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1658 ;; We test frame-height so that, if the frame is split
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1659 ;; by displaying a warning, that doesn't cause the normal
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1660 ;; splash screen to be used.
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1661 (frame-height (1- (frame-height frame))))
fca3bf689dc4 (use-fancy-splash-screens-p): Use frame-height
Richard M. Stallman <rms@gnu.org>
parents: 74302
diff changeset
1662 (> frame-height (+ image-height 19)))))))
34129
9aede9b4161c (use-fancy-splash-screens-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33880
diff changeset
1663
9aede9b4161c (use-fancy-splash-screens-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33880
diff changeset
1664
80242
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1665 (defun normal-splash-screen (&optional startup concise)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1666 "Display non-graphic splash screen.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1667 If optional argument STARTUP is non-nil, display the startup screen
80242
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1668 after Emacs starts. If STARTUP is nil, display the About screen.
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1669 If CONCISE is non-nil, display a concise version of the
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1670 splash screen in another window."
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1671 (let ((splash-buffer (get-buffer-create "*About GNU Emacs*")))
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1672 (with-current-buffer splash-buffer
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1673 (setq buffer-read-only nil)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1674 (erase-buffer)
80113
5b4e8ae6e892 (fancy-startup-screen, normal-splash-screen):
Juri Linkov <juri@jurta.org>
parents: 79721
diff changeset
1675 (setq default-directory command-line-default-directory)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1676 (set (make-local-variable 'tab-width) 8)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1677 (if (not startup)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1678 (set (make-local-variable 'mode-line-format)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1679 (propertize "---- %b %-" 'face 'mode-line-buffer-id)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1680
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1681 (if pure-space-overflow
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1682 (insert pure-space-overflow-message))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1683
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1684 ;; The convention for this piece of code is that
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1685 ;; each piece of output starts with one or two newlines
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1686 ;; and does not end with any newlines.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1687 (insert (if startup "Welcome to GNU Emacs" "This is GNU Emacs"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1688 (insert
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1689 (if (eq system-type 'gnu/linux)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1690 ", one component of the GNU/Linux operating system.\n"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1691 ", a part of the GNU operating system.\n"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1692
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1693 (if startup
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1694 (if (display-mouse-p)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1695 ;; The user can use the mouse to activate menus
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1696 ;; so give help in terms of menu items.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1697 (normal-mouse-startup-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1698
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1699 ;; No mouse menus, so give help using kbd commands.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1700 (normal-no-mouse-startup-screen))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1701
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1702 (normal-about-screen))
51698
92ed57f99b98 (pure-space-overflow): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 51287
diff changeset
1703
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1704 ;; The rest of the startup screen is the same on all
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1705 ;; kinds of terminals.
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1706
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1707 ;; Give information on recovering, if there was a crash.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1708 (and startup
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1709 auto-save-list-file-prefix
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1710 ;; Don't signal an error if the
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1711 ;; directory for auto-save-list files
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1712 ;; does not yet exist.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1713 (file-directory-p (file-name-directory
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1714 auto-save-list-file-prefix))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1715 (directory-files
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1716 (file-name-directory auto-save-list-file-prefix)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1717 nil
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1718 (concat "\\`"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1719 (regexp-quote (file-name-nondirectory
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1720 auto-save-list-file-prefix)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1721 t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1722 (insert "\n\nIf an Emacs session crashed recently, "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1723 "type Meta-x recover-session RET\nto recover"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1724 " the files you were editing.\n"))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1725
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1726 (use-local-map splash-screen-keymap)
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1727
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1728 ;; Display the input that we set up in the buffer.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1729 (set-buffer-modified-p nil)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1730 (setq buffer-read-only t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1731 (if (and view-read-only (not view-mode))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1732 (view-mode-enter nil 'kill-buffer))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1733 (if startup (rename-buffer "*GNU Emacs*" t))
80242
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1734 (goto-char (point-min)))
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1735 (if concise
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1736 (display-buffer splash-buffer)
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
1737 (switch-to-buffer splash-buffer))))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1738
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1739 (defun normal-mouse-startup-screen ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1740 ;; The user can use the mouse to activate menus
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1741 ;; so give help in terms of menu items.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1742 (insert "\
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1743 To follow a link, click Mouse-1 on it, or move to it and type RET.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1744 To quit a partially entered command, type Control-g.\n")
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1745
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1746 (insert "\nImportant Help menu items:\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1747 (insert-button "Emacs Tutorial"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1748 'action (lambda (button) (help-with-tutorial))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1749 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1750 (insert "\t\tLearn basic Emacs keystroke commands\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1751 (insert-button "Read the Emacs Manual"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1752 'action (lambda (button) (info-emacs-manual))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1753 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1754 (insert "\tView the Emacs manual using Info\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1755 (insert-button "\(Non)Warranty"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1756 'action (lambda (button) (describe-no-warranty))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1757 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1758 (insert "\t\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1759 (insert-button "Copying Conditions"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1760 'action (lambda (button) (describe-copying))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1761 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1762 (insert "\tConditions for redistributing and changing Emacs\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1763 (insert-button "More Manuals / Ordering Manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1764 'action (lambda (button) (view-order-manuals))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1765 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1766 (insert " How to order printed manuals from the FSF\n")
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1767
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1768 (insert "\nUseful tasks:\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1769 (insert-button "Visit New File"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1770 'action (lambda (button) (call-interactively 'find-file))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1771 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1772 (insert "\t\tSpecify a new file's name, to edit the file\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1773 (insert-button "Open Home Directory"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1774 'action (lambda (button) (dired "~"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1775 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1776 (insert "\tOpen your home directory, to operate on its files\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1777 (insert-button "Customize Startup"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1778 'action (lambda (button) (customize-group 'initialization))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1779 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1780 (insert "\tChange initialization settings including this screen\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1781
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1782 (insert "\n" (emacs-version)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1783 "\n" emacs-copyright))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1784
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1785 ;; No mouse menus, so give help using kbd commands.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1786 (defun normal-no-mouse-startup-screen ()
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1787
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1788 ;; If keys have their default meanings,
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1789 ;; use precomputed string to save lots of time.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1790 (if (and (eq (key-binding "\C-h") 'help-command)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1791 (eq (key-binding "\C-xu") 'advertised-undo)
83901
81f157bfa93c (fancy-startup-text): Renamed from fancy-splash-text.
Richard M. Stallman <rms@gnu.org>
parents: 83887
diff changeset
1792 (eq (key-binding "\C-x\C-c") 'save-buffers-kill-terminal)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1793 (eq (key-binding "\C-ht") 'help-with-tutorial)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1794 (eq (key-binding "\C-hi") 'info)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1795 (eq (key-binding "\C-hr") 'info-emacs-manual)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1796 (eq (key-binding "\C-h\C-n") 'view-emacs-news))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1797 (progn
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1798 (insert "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1799 Get help\t C-h (Hold down CTRL and press h)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1800 ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1801 (insert-button "Emacs manual"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1802 'action (lambda (button) (info-emacs-manual))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1803 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1804 (insert " C-h r\t")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1805 (insert-button "Browse manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1806 'action (lambda (button) (Info-directory))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1807 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1808 (insert "\t C-h i
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1809 ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1810 (insert-button "Emacs tutorial"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1811 'action (lambda (button) (help-with-tutorial))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1812 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1813 (insert " C-h t\tUndo changes\t C-x u
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1814 ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1815 (insert-button "Buy manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1816 'action (lambda (button) (view-order-manuals))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1817 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1818 (insert "\t C-h C-m\tExit Emacs\t C-x C-c"))
46330
04fc40356d65 (command-line): Set memory-signal-data.
Richard M. Stallman <rms@gnu.org>
parents: 46135
diff changeset
1819
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1820 (insert (format "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1821 Get help\t %s
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1822 "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1823 (let ((where (where-is-internal
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1824 'help-command nil t)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1825 (if where
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1826 (key-description where)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1827 "M-x help"))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1828 (insert-button "Emacs manual"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1829 'action (lambda (button) (info-emacs-manual))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1830 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1831 (insert (substitute-command-keys"\t \\[info-emacs-manual]\t"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1832 (insert-button "Browse manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1833 'action (lambda (button) (Info-directory))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1834 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1835 (insert (substitute-command-keys "\t \\[info]
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1836 "))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1837 (insert-button "Emacs tutorial"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1838 'action (lambda (button) (help-with-tutorial))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1839 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1840 (insert (substitute-command-keys
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1841 "\t \\[help-with-tutorial]\tUndo changes\t \\[advertised-undo]
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1842 "))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1843 (insert-button "Buy manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1844 'action (lambda (button) (view-order-manuals))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1845 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1846 (insert (substitute-command-keys
83901
81f157bfa93c (fancy-startup-text): Renamed from fancy-splash-text.
Richard M. Stallman <rms@gnu.org>
parents: 83887
diff changeset
1847 "\t \\[view-order-manuals]\tExit Emacs\t \\[save-buffers-kill-terminal]")))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1848
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1849 ;; Say how to use the menu bar with the keyboard.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1850 (insert "\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1851 (insert-button "Activate menubar"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1852 'action (lambda (button) (tmm-menubar))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1853 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1854 (if (and (eq (key-binding "\M-`") 'tmm-menubar)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1855 (eq (key-binding [f10]) 'tmm-menubar))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1856 (insert " F10 or ESC ` or M-`")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1857 (insert (substitute-command-keys " \\[tmm-menubar]")))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1858
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1859 ;; Many users seem to have problems with these.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1860 (insert "
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1861 \(`C-' means use the CTRL key. `M-' means use the Meta (or Alt) key.
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1862 If you have no Meta key, you may instead type ESC followed by the character.)")
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1863
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1864 ;; Insert links to useful tasks
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1865 (insert "\nUseful tasks:\n")
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1866
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1867 (insert-button "Visit New File"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1868 'action (lambda (button) (call-interactively 'find-file))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1869 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1870 (insert "\t\t\t")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1871 (insert-button "Open Home Directory"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1872 'action (lambda (button) (dired "~"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1873 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1874 (insert "\n")
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1875
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1876 (insert-button "Customize Startup"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1877 'action (lambda (button) (customize-group 'initialization))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1878 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1879 (insert "\t\t")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1880 (insert-button "Open *scratch* buffer"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1881 'action (lambda (button) (switch-to-buffer
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1882 (get-buffer-create "*scratch*")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1883 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1884 (insert "\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1885 (insert "\n" (emacs-version) "\n" emacs-copyright "\n")
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1886
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1887 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1888 (eq (key-binding "\C-h\C-d") 'describe-distribution)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1889 (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1890 (progn
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1891 (insert
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1892 "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1893 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1894 (insert-button "full details"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1895 'action (lambda (button) (describe-no-warranty))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1896 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1897 (insert ".
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1898 Emacs is Free Software--Free as in Freedom--so you can redistribute copies
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1899 of Emacs and modify it; type C-h C-c to see ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1900 (insert-button "the conditions"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1901 'action (lambda (button) (describe-copying))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1902 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1903 (insert ".
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1904 Type C-h C-d for information on ")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1905 (insert-button "getting the latest version"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1906 'action (lambda (button) (describe-distribution))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1907 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1908 (insert "."))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1909 (insert (substitute-command-keys
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1910 "
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1911 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for "))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1912 (insert-button "full details"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1913 'action (lambda (button) (describe-no-warranty))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1914 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1915 (insert (substitute-command-keys ".
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1916 Emacs is Free Software--Free as in Freedom--so you can redistribute copies
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1917 of Emacs and modify it; type \\[describe-copying] to see "))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1918 (insert-button "the conditions"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1919 'action (lambda (button) (describe-copying))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1920 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1921 (insert (substitute-command-keys".
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1922 Type \\[describe-distribution] for information on "))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1923 (insert-button "getting the latest version"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1924 'action (lambda (button) (describe-distribution))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1925 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1926 (insert ".")))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1927
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1928 (defun normal-about-screen ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1929 (insert "\n" (emacs-version) "\n" emacs-copyright "\n\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1930
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1931 (insert "To follow a link, click Mouse-1 on it, or move to it and type RET.\n\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1932
84417
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1933 (insert-button "Authors"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1934 'action
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1935 (lambda (button)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1936 (view-file (expand-file-name "AUTHORS" data-directory))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1937 (goto-char (point-min)))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1938 'follow-link t)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1939 (insert "\t\tMany people have contributed code included in GNU Emacs\n")
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1940
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1941 (insert-button "Contributing"
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1942 'action
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1943 (lambda (button)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1944 (view-file (expand-file-name "CONTRIBUTE" data-directory))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1945 (goto-char (point-min)))
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1946 'follow-link t)
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1947 (insert "\tHow to contribute improvements to Emacs\n\n")
034769070421 (initial-buffer-choice): Rename choice "Splash screen"
Juri Linkov <juri@jurta.org>
parents: 83901
diff changeset
1948
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1949 (insert-button "GNU and Freedom"
80290
918dceaeacfc (describe-gnu-project): Rename from describe-project. Change users.
Kim F. Storm <storm@cua.dk>
parents: 80263
diff changeset
1950 'action (lambda (button) (describe-gnu-project))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1951 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1952 (insert "\t\tWhy we developed GNU Emacs and the GNU system\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1953
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1954 (insert-button "Absence of Warranty"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1955 'action (lambda (button) (describe-no-warranty))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1956 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1957 (insert "\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n")
47024
15430c8d0eaa * startup.el (normal-splash-screen): Ensure splash buffer is
John Paul Wallington <jpw@pobox.com>
parents: 46889
diff changeset
1958
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1959 (insert-button "Copying Conditions"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1960 'action (lambda (button) (describe-copying))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1961 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1962 (insert "\tConditions for redistributing and changing Emacs\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1963
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1964 (insert-button "Getting New Versions"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1965 'action (lambda (button) (describe-distribution))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1966 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1967 (insert "\tHow to get the latest version of GNU Emacs\n")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1968
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1969 (insert-button "More Manuals / Ordering Manuals"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1970 'action (lambda (button) (view-order-manuals))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1971 'follow-link t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1972 (insert "\tBuying printed manuals from the FSF\n"))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
1973
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1974 (defun startup-echo-area-message ()
80240
943eeadd2a75 (startup-echo-area-message): Check for about-emacs.
Juri Linkov <juri@jurta.org>
parents: 80238
diff changeset
1975 (if (eq (key-binding "\C-h\C-a") 'about-emacs)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1976 "For information about GNU Emacs and the GNU system, type C-h C-a."
32015
5519caf281ee (startup-echo-area-message): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31887
diff changeset
1977 (substitute-command-keys
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1978 "For information about GNU Emacs and the GNU system, type \
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1979 \\[about-emacs].")))
31714
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1980
c68a5c9b926a (fancy-splash-text): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30996
diff changeset
1981
31759
85e162a05e58 (fancy-splash-head): If frame's background mode
Gerd Moellmann <gerd@gnu.org>
parents: 31736
diff changeset
1982 (defun display-startup-echo-area-message ()
35601
7402e353c6e4 (display-startup-echo-area-message): Make sure
Gerd Moellmann <gerd@gnu.org>
parents: 35510
diff changeset
1983 (let ((resize-mini-windows t))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1984 (or noninteractive ;(input-pending-p) init-file-had-error
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1985 ;; t if the init file says to inhibit the echo area startup message.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1986 (and inhibit-startup-echo-area-message
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1987 user-init-file
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1988 (or (and (get 'inhibit-startup-echo-area-message 'saved-value)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1989 (equal inhibit-startup-echo-area-message
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1990 (if (equal init-file-user "")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1991 (user-login-name)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1992 init-file-user)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1993 ;; Wasn't set with custom; see if .emacs has a setq.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1994 (let ((buffer (get-buffer-create " *temp*")))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1995 (prog1
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1996 (condition-case nil
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1997 (save-excursion
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1998 (set-buffer buffer)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
1999 (insert-file-contents user-init-file)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2000 (re-search-forward
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2001 (concat
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2002 "([ \t\n]*setq[ \t\n]+"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2003 "inhibit-startup-echo-area-message[ \t\n]+"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2004 (regexp-quote
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2005 (prin1-to-string
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2006 (if (equal init-file-user "")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2007 (user-login-name)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2008 init-file-user)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2009 "[ \t\n]*)")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2010 nil t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2011 (error nil))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2012 (kill-buffer buffer)))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2013 (message "%s" (startup-echo-area-message)))))
31759
85e162a05e58 (fancy-splash-head): If frame's background mode
Gerd Moellmann <gerd@gnu.org>
parents: 31736
diff changeset
2014
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2015 (defun display-startup-screen (&optional concise)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2016 "Display startup screen according to display.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2017 A fancy display is used on graphic displays, normal otherwise.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2018
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2019 If CONCISE is non-nil, display a concise version of the startup
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2020 screen."
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2021 ;; Prevent recursive calls from server-process-filter.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2022 (if (not (get-buffer "*GNU Emacs*"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2023 (if (use-fancy-splash-screens-p)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2024 (fancy-startup-screen concise)
80242
ed1da887c510 (normal-splash-screen): Add argument `concise'.
Juri Linkov <juri@jurta.org>
parents: 80240
diff changeset
2025 (normal-splash-screen t concise))))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2026
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2027 (defun display-about-screen ()
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2028 "Display the *About GNU Emacs* buffer.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2029 A fancy display is used on graphic displays, normal otherwise."
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2030 (interactive)
52553
c9d6b407c93b (use-fancy-splash-screens-p, display-splash-screen): Move
Glenn Morris <rgm@gnu.org>
parents: 52550
diff changeset
2031 (if (use-fancy-splash-screens-p)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2032 (fancy-about-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2033 (normal-splash-screen nil)))
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
2034
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2035 (defalias 'about-emacs 'display-about-screen)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2036 (defalias 'display-splash-screen 'display-startup-screen)
43017
a73bc2f013fc (normal-splash-screen, display-splash-screen): New functions (separated
Pavel Janík <Pavel@Janik.cz>
parents: 42963
diff changeset
2037
322
820dc6c9612a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2038 (defun command-line-1 (command-line-args-left)
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2039 (display-startup-echo-area-message)
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2040
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2041 ;; Delay 2 seconds after an init file error message
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2042 ;; was displayed, so user can read it.
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
2043 (when init-file-had-error
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
2044 (sit-for 2))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2045
70252
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2046 (when (and pure-space-overflow
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2047 (not noninteractive))
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2048 (display-warning
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2049 'initialization
70406
16cb01ffb3dd (command-line-1): Refer to "Pure Storage" on
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70402
diff changeset
2050 "Building Emacs overflowed pure space. (See the node Pure Storage in the Lisp manual for details.)"
70252
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2051 :warning))
8b0a765eb64a (command-line-1): Display warning when
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69933
diff changeset
2052
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2053 (let ((file-count 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2054 first-file-buffer)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2055 (when command-line-args-left
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2056 ;; We have command args; process them.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2057 (let ((dir command-line-default-directory)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2058 tem
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2059 ;; This approach loses for "-batch -L DIR --eval "(require foo)",
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2060 ;; if foo is intended to be found in DIR.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2061 ;;
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2062 ;; ;; The directories listed in --directory/-L options will *appear*
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2063 ;; ;; at the front of `load-path' in the order they appear on the
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2064 ;; ;; command-line. We cannot do this by *placing* them at the front
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2065 ;; ;; in the order they appear, so we need this variable to hold them,
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2066 ;; ;; temporarily.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2067 ;; extra-load-path
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2068 ;;
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2069 ;; To DTRT we keep track of the splice point and modify `load-path'
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2070 ;; straight away upon any --directory/-L option.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2071 splice
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2072 just-files ;; t if this follows the magic -- option.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2073 ;; This includes our standard options' long versions
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2074 ;; and long versions of what's on command-switch-alist.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2075 (longopts
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2076 (append '(("--funcall") ("--load") ("--insert") ("--kill")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2077 ("--directory") ("--eval") ("--execute") ("--no-splash")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2078 ("--find-file") ("--visit") ("--file") ("--no-desktop"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2079 (mapcar (lambda (elt)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2080 (list (concat "-" (car elt))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2081 command-switch-alist)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2082 (line 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2083 (column 0))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2084
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2085 ;; Add the long X options to longopts.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2086 (dolist (tem command-line-x-option-alist)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2087 (if (string-match "^--" (car tem))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2088 (push (list (car tem)) longopts)))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2089
96752
9697a5f0281d various small cleanups detailed in changelogs
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96675
diff changeset
2090 ;; Add the long NS options to longopts.
9697a5f0281d various small cleanups detailed in changelogs
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96675
diff changeset
2091 (dolist (tem command-line-ns-option-alist)
9697a5f0281d various small cleanups detailed in changelogs
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96675
diff changeset
2092 (if (string-match "^--" (car tem))
9697a5f0281d various small cleanups detailed in changelogs
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96675
diff changeset
2093 (push (list (car tem)) longopts)))
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
2094
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2095 ;; Loop, processing options.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2096 (while command-line-args-left
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2097 (let* ((argi (car command-line-args-left))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2098 (orig-argi argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2099 argval completion)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2100 (setq command-line-args-left (cdr command-line-args-left))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2101
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2102 ;; Do preliminary decoding of the option.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2103 (if just-files
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2104 ;; After --, don't look for options; treat all args as files.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2105 (setq argi "")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2106 ;; Convert long options to ordinary options
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2107 ;; and separate out an attached option argument into argval.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2108 (when (string-match "^\\(--[^=]*\\)=" argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2109 (setq argval (substring argi (match-end 0))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2110 argi (match-string 1 argi)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2111 (if (equal argi "--")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2112 (setq completion nil)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2113 (setq completion (try-completion argi longopts)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2114 (if (eq completion t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2115 (setq argi (substring argi 1))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2116 (if (stringp completion)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2117 (let ((elt (assoc completion longopts)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2118 (or elt
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2119 (error "Option `%s' is ambiguous" argi))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2120 (setq argi (substring (car elt) 1)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2121 (setq argval nil
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2122 argi orig-argi))))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2123
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2124 ;; Execute the option.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2125 (cond ((setq tem (assoc argi command-switch-alist))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2126 (if argval
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2127 (let ((command-line-args-left
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2128 (cons argval command-line-args-left)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2129 (funcall (cdr tem) argi))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2130 (funcall (cdr tem) argi)))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2131
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2132 ((equal argi "-no-splash")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2133 (setq inhibit-startup-screen t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2134
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2135 ((member argi '("-f" ; what the manual claims
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2136 "-funcall"
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2137 "-e")) ; what the source used to say
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2138 (setq inhibit-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2139 (setq tem (intern (or argval (pop command-line-args-left))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2140 (if (commandp tem)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2141 (command-execute tem)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2142 (funcall tem)))
45530
19a685f604ee (command-line): Use `when', `unless'.
Colin Walters <walters@gnu.org>
parents: 44716
diff changeset
2143
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2144 ((member argi '("-eval" "-execute"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2145 (setq inhibit-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2146 (eval (read (or argval (pop command-line-args-left)))))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2147
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2148 ((member argi '("-L" "-directory"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2149 (setq tem (expand-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2150 (command-line-normalize-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2151 (or argval (pop command-line-args-left)))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2152 (cond (splice (setcdr splice (cons tem (cdr splice)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2153 (setq splice (cdr splice)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2154 (t (setq load-path (cons tem load-path)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2155 splice load-path))))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2156
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2157 ((member argi '("-l" "-load"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2158 (let* ((file (command-line-normalize-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2159 (or argval (pop command-line-args-left))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2160 ;; Take file from default dir if it exists there;
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2161 ;; otherwise let `load' search for it.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2162 (file-ex (expand-file-name file)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2163 (when (file-exists-p file-ex)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2164 (setq file file-ex))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2165 (load file nil t)))
2869
d370b253473b * startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents: 2761
diff changeset
2166
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2167 ;; This is used to handle -script. It's not clear
92794
4c9722bf77fa (command-line-1): Rename -scriptload to -internal-script.
Glenn Morris <rgm@gnu.org>
parents: 92786
diff changeset
2168 ;; we need to document it (it is totally internal).
92890
dc744cb72de0 (command-line-1): Rename -internal-script back to -scriptload (reverts
Glenn Morris <rgm@gnu.org>
parents: 92794
diff changeset
2169 ((member argi '("-scriptload"))
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2170 (let* ((file (command-line-normalize-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2171 (or argval (pop command-line-args-left))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2172 ;; Take file from default dir.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2173 (file-ex (expand-file-name file)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2174 (load file-ex nil t t)))
64824
5c5fa9b830c2 (command-line-1): Implement -scriptload.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
2175
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2176 ((equal argi "-insert")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2177 (setq inhibit-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2178 (setq tem (or argval (pop command-line-args-left)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2179 (or (stringp tem)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2180 (error "File name omitted from `-insert' option"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2181 (insert-file-contents (command-line-normalize-file-name tem)))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2182
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2183 ((equal argi "-kill")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2184 (kill-emacs t))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2185
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2186 ;; This is for when they use --no-desktop with -q, or
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2187 ;; don't load Desktop in their .emacs. If desktop.el
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2188 ;; _is_ loaded, it will handle this switch, and we
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2189 ;; won't see it by the time we get here.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2190 ((equal argi "-no-desktop")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2191 (message "\"--no-desktop\" ignored because the Desktop package is not loaded"))
68308
667bc6386741 (command-line-1): Handle --no-desktop if desktop.el is not loaded.
Eli Zaretskii <eliz@gnu.org>
parents: 68140
diff changeset
2192
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2193 ((string-match "^\\+[0-9]+\\'" argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2194 (setq line (string-to-number argi)))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2195
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2196 ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2197 (setq line (string-to-number (match-string 1 argi))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2198 column (string-to-number (match-string 2 argi))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2199
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2200 ((setq tem (assoc argi command-line-x-option-alist))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2201 ;; Ignore X-windows options and their args if not using X.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2202 (setq command-line-args-left
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2203 (nthcdr (nth 1 tem) command-line-args-left)))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2204
96868
0b20e535e319 (command-line-1): Fix indentation.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96820
diff changeset
2205 ((setq tem (assoc argi command-line-ns-option-alist))
0b20e535e319 (command-line-1): Fix indentation.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96820
diff changeset
2206 ;; Ignore NS-windows options and their args if not using NS.
0b20e535e319 (command-line-1): Fix indentation.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96820
diff changeset
2207 (setq command-line-args-left
0b20e535e319 (command-line-1): Fix indentation.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96820
diff changeset
2208 (nthcdr (nth 1 tem) command-line-args-left)))
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96479
diff changeset
2209
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2210 ((member argi '("-find-file" "-file" "-visit"))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2211 (setq inhibit-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2212 ;; An explicit option to specify visiting a file.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2213 (setq tem (or argval (pop command-line-args-left)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2214 (unless (stringp tem)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2215 (error "File name omitted from `%s' option" argi))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2216 (setq file-count (1+ file-count))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2217 (let ((file (expand-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2218 (command-line-normalize-file-name tem) dir)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2219 (if (= file-count 1)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2220 (setq first-file-buffer (find-file file))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2221 (find-file-other-window file)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2222 (or (zerop line)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2223 (goto-line line))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2224 (setq line 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2225 (unless (< column 1)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2226 (move-to-column (1- column)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2227 (setq column 0))
2869
d370b253473b * startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents: 2761
diff changeset
2228
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2229 ((equal argi "--")
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2230 (setq just-files t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2231 (t
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2232 ;; We have almost exhausted our options. See if the
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2233 ;; user has made any other command-line options available
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2234 (let ((hooks command-line-functions)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2235 (did-hook nil))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2236 (while (and hooks
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2237 (not (setq did-hook (funcall (car hooks)))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2238 (setq hooks (cdr hooks)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2239 (if (not did-hook)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2240 ;; Presume that the argument is a file name.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2241 (progn
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2242 (if (string-match "\\`-" argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2243 (error "Unknown option `%s'" argi))
84781
f1d4dbead0be (command-line): Rename `inhibit-startup-message' to
Juri Linkov <juri@jurta.org>
parents: 84754
diff changeset
2244 (unless initial-window-system
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2245 (setq inhibit-startup-screen t))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2246 (setq file-count (1+ file-count))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2247 (let ((file
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2248 (expand-file-name
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2249 (command-line-normalize-file-name orig-argi)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2250 dir)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2251 (cond ((= file-count 1)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2252 (setq first-file-buffer (find-file file)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2253 (inhibit-startup-screen
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2254 (find-file-other-window file))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2255 (t (find-file file))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2256 (or (zerop line)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2257 (goto-line line))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2258 (setq line 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2259 (unless (< column 1)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2260 (move-to-column (1- column)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2261 (setq column 0))))))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2262 ;; In unusual circumstances, the execution of Lisp code due
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2263 ;; to command-line options can cause the last visible frame
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2264 ;; to be deleted. In this case, kill emacs to avoid an
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2265 ;; abort later.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2266 (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))
49988
2076fa933620 * startup.el: Streamline code in several functions and use a more
Matthew Swift <swift@alum.mit.edu>
parents: 49934
diff changeset
2267
84463
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2268 (when initial-buffer-choice
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2269 (cond ((eq initial-buffer-choice t)
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2270 (switch-to-buffer (get-buffer-create "*scratch*")))
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2271 ((stringp initial-buffer-choice)
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2272 (find-file initial-buffer-choice))))
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2273
92314
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2274 ;; If *scratch* exists and is empty, insert initial-scratch-message.
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2275 (and initial-scratch-message
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2276 (get-buffer "*scratch*")
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2277 (with-current-buffer "*scratch*"
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2278 (when (zerop (buffer-size))
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2279 (insert initial-scratch-message)
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2280 (set-buffer-modified-p nil))))
4cc33029958f Always add initial message to *scratch* buffer if
Juri Linkov <juri@jurta.org>
parents: 91911
diff changeset
2281
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2282 (if (or inhibit-startup-screen
84463
999e91a73e9d (startup-screen-inhibit-startup-screen)
Chong Yidong <cyd@stupidchicken.com>
parents: 84417
diff changeset
2283 initial-buffer-choice
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2284 noninteractive
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2285 emacs-quick-startup)
42080
4dd93ea3bc4f (command-line-1): Display startup screen even if there are command line args.
Richard M. Stallman <rms@gnu.org>
parents: 41590
diff changeset
2286
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2287 ;; Not displaying a startup screen. If 3 or more files
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2288 ;; visited, and not all visible, show user what they all are.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2289 (and (> file-count 2)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2290 (not noninteractive)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2291 (not inhibit-startup-buffer-menu)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2292 (or (get-buffer-window first-file-buffer)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2293 (list-buffers)))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2294
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2295 ;; Display a startup screen, after some preparations.
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2296
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2297 ;; If there are no switches to process, we might as well
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2298 ;; run this hook now, and there may be some need to do it
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2299 ;; before doing any output.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2300 (run-hooks 'emacs-startup-hook)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2301 (and term-setup-hook
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2302 (run-hooks 'term-setup-hook))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2303 (setq inhibit-startup-hooks t)
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2304
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2305 ;; It's important to notice the user settings before we
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2306 ;; display the startup message; otherwise, the settings
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2307 ;; won't take effect until the user gives the first
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2308 ;; keystroke, and that's distracting.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2309 (when (fboundp 'frame-notice-user-settings)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2310 (frame-notice-user-settings))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2311
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2312 ;; If there are no switches to process, we might as well
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2313 ;; run this hook now, and there may be some need to do it
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2314 ;; before doing any output.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2315 (when window-setup-hook
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2316 (run-hooks 'window-setup-hook)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2317 ;; Don't let the hook be run twice.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2318 (setq window-setup-hook nil))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2319
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2320 ;; ;; Do this now to avoid an annoying delay if the user
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2321 ;; ;; clicks the menu bar during the sit-for.
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2322 ;; (when (display-popup-menus-p)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2323 ;; (precompute-menubar-bindings))
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2324 ;; (with-no-warnings
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2325 ;; (setq menubar-bindings-done t))
40675
b6dfe21c4299 (fancy-splash-tail): Explain how to recover
Richard M. Stallman <rms@gnu.org>
parents: 40612
diff changeset
2326
79366
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2327 (if (> file-count 0)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2328 (display-startup-screen t)
9c6165181df8 Backport startup screen related changes from the trunk.
Juri Linkov <juri@jurta.org>
parents: 79039
diff changeset
2329 (display-startup-screen nil)))))
31759
85e162a05e58 (fancy-splash-head): If frame's background mode
Gerd Moellmann <gerd@gnu.org>
parents: 31736
diff changeset
2330
14386
4e5b28d28a5f (command-line-normalize-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14283
diff changeset
2331 (defun command-line-normalize-file-name (file)
4e5b28d28a5f (command-line-normalize-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14283
diff changeset
2332 "Collapse multiple slashes to one, to handle non-Emacs file names."
14729
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2333 (save-match-data
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2334 ;; Use arg 1 so that we don't collapse // at the start of the file name.
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2335 ;; That is significant on some systems.
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2336 ;; However, /// at the beginning is supposed to mean just /, not //.
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2337 (if (string-match "^///+" file)
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2338 (setq file (replace-match "/" t t file)))
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2339 (while (string-match "//+" file 1)
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2340 (setq file (replace-match "/" t t file)))
b072589a6e57 (command-line-normalize-file-name): Do save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 14716
diff changeset
2341 file))
14386
4e5b28d28a5f (command-line-normalize-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14283
diff changeset
2342
60415
fe3c6e97ccc6 (command-line): Use it for temporary-file-directory,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60397
diff changeset
2343 ;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 650
diff changeset
2344 ;;; startup.el ends here