Mercurial > emacs
annotate lisp/startup.el @ 4211:b2e422a86641
(Ftext_property_not_all): Fix typo in decl.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 21 Jul 1993 22:25:42 +0000 |
parents | d7cb993a93b1 |
children | 99e31e531877 |
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 |
840
113281b361ec
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
823
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. |
113281b361ec
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
823
diff
changeset
|
4 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
5 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
789
diff
changeset
|
6 ;; Keywords: internal |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
7 |
322 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
621 | 12 ;; the Free Software Foundation; either version 2, or (at your option) |
322 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
23 | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
24 ;;; Commentary: |
322 | 25 |
26 ; These are processed only at the beginning of the argument list. | |
27 ; -batch execute noninteractively (messages go to stdout, | |
28 ; variable noninteractive set to t) | |
29 ; This option must be the first in the arglist. | |
30 ; Processed by `main' in emacs.c -- never seen by lisp | |
31 ; -t file Specify to use file rather than stdin/stdout | |
32 ; as the terminal. | |
33 ; This option must be the first in the arglist. | |
34 ; Processed by `main' in emacs.c -- never seen by lisp | |
35 ; -nw Inhibit the use of any window-system-specific display | |
36 ; code; use the current virtual terminal. | |
37 ; This option must be the first in the arglist. | |
38 ; Processed by `main' in emacs.c -- never seen by lisp | |
39 ; -q load no init file | |
40 ; -no-init-file same | |
41 ; -u user load user's init file | |
42 ; -user user same | |
43 ; -debug-init Don't catch errors in init file; let debugger run. | |
44 | |
45 ; These are processed in the order encountered. | |
46 ; -f function execute function | |
47 ; -funcall function same | |
48 ; -l file load file | |
49 ; -load file same | |
50 ; -insert file same | |
51 ; file visit file | |
52 ; -kill kill (exit) emacs | |
53 | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
54 ;;; Code: |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
779
diff
changeset
|
55 |
322 | 56 (setq top-level '(normal-top-level)) |
57 | |
58 (defvar command-line-processed nil "t once command line has been processed") | |
59 | |
60 (defconst inhibit-startup-message nil | |
61 "*Non-nil inhibits the initial startup messages. | |
62 This is for use in your personal init file, once you are familiar | |
63 with the contents of the startup message.") | |
64 | |
65 (defconst inhibit-default-init nil | |
66 "*Non-nil inhibits loading the `default' library.") | |
67 | |
68 (defconst command-switch-alist nil | |
69 "Alist of command-line switches. | |
70 Elements look like (SWITCH-STRING . HANDLER-FUNCTION). | |
71 HANDLER-FUNCTION receives switch name as sole arg; | |
72 remaining command-line args are in the variable `command-line-args-left'.") | |
73 | |
74 (defvar command-line-functions nil ;; lrs 7/31/89 | |
75 "List of functions to process unrecognized command-line arguments. | |
76 Each function should access the dynamically bound variables | |
77 argi (the current argument) and command-line-args-left (the remaining | |
78 arguments). The function should return non-nil only if it recognizes and | |
79 processes argi. If it does so, it may consume successive arguments by | |
80 altering command-line-args-left to remove them.") | |
81 | |
688 | 82 (defvar before-init-hook nil |
370 | 83 "Functions to call after handling urgent options but before loading init file. |
779 | 84 The frame system uses this to open frames to display messages while |
370 | 85 Emacs loads the user's initialization file.") |
86 | |
688 | 87 (defvar after-init-hook nil |
1550 | 88 "Functions to call after loading the init file (`~/.emacs'). |
688 | 89 The call is not protected by a condition-case, so you can set `debug-on-error' |
1550 | 90 in `.emacs', and put all the actual code on `after-init-hook'.") |
688 | 91 |
322 | 92 (defvar term-setup-hook nil |
688 | 93 "Functions to be called after loading terminal-specific lisp code. |
94 See `run-hooks'. This variable exists for users to set, | |
322 | 95 so as to override the definitions made by the terminal-specific file. |
96 Emacs never sets this variable itself.") | |
97 | |
98 (defvar keyboard-type nil | |
99 "The brand of keyboard you are using. This variable is used to define | |
100 the proper function and keypad keys for use under X. It is used in a | |
101 fashion analogous to the environment value TERM.") | |
102 | |
103 (defvar window-setup-hook nil | |
370 | 104 "Function called to initialize window system display. |
105 Emacs calls this after processing the command line arguments and loading | |
106 the user's init file. | |
107 | |
322 | 108 Users should not set this variable; use term-setup-hook instead.") |
109 | |
110 (defconst initial-major-mode 'lisp-interaction-mode | |
111 "Major mode command symbol to use for the initial *scratch* buffer.") | |
112 | |
113 (defvar init-file-user nil | |
114 "Identity of user whose `.emacs' file is or was read. | |
115 The value may be the null string or a string containing a user's name. | |
116 If the value is a null string, it means that the init file was taken from | |
117 the user that originally logged in. | |
118 | |
119 In all cases, `(concat \"~\" init-file-user \"/\")' evaluates to the | |
120 directory name of the directory where the `.emacs' file was looked for.") | |
121 | |
122 (defvar init-file-debug nil) | |
123 | |
124 (defun normal-top-level () | |
125 (if command-line-processed | |
126 (message "Back to top level.") | |
127 (setq command-line-processed t) | |
648 | 128 (if (not (eq system-type 'vax-vms)) |
1558
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
129 (progn |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
130 ;; If the PWD environment variable isn't accurate, delete it. |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
131 (let ((pwd (getenv "PWD"))) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
132 (and (stringp pwd) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
133 ;; Use FOO/., so that if FOO is a symlink, file-attributes |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
134 ;; describes the directory linked to, not FOO itself. |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
135 (or (equal (file-attributes |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
136 (concat (file-name-as-directory pwd) ".")) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
137 (file-attributes |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
138 (concat (file-name-as-directory default-directory) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
139 "."))) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
140 (setq process-environment |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
141 (delete (concat "PWD=" pwd) |
a7e915481db1
* startup.el (normal-top-level): Don't worry about setting
Jim Blandy <jimb@redhat.com>
parents:
1550
diff
changeset
|
142 process-environment))))))) |
707 | 143 (setq default-directory (abbreviate-file-name default-directory)) |
322 | 144 (unwind-protect |
145 (command-line) | |
4181
d7cb993a93b1
(normal-top-level): Call abbreviate-file-name again after calling command-line.
Richard M. Stallman <rms@gnu.org>
parents:
3281
diff
changeset
|
146 ;; Do this again, in case .emacs defined more abbreviations. |
d7cb993a93b1
(normal-top-level): Call abbreviate-file-name again after calling command-line.
Richard M. Stallman <rms@gnu.org>
parents:
3281
diff
changeset
|
147 (setq default-directory (abbreviate-file-name default-directory)) |
322 | 148 (run-hooks 'emacs-startup-hook) |
149 (and term-setup-hook | |
150 (run-hooks 'term-setup-hook)) | |
2869
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
151 (if (fboundp 'frame-notice-user-settings) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
152 (frame-notice-user-settings)) |
322 | 153 (and window-setup-hook |
154 (run-hooks 'window-setup-hook))))) | |
155 | |
156 (defun command-line () | |
823 | 157 ;; See if we should import version-control from the environment variable. |
322 | 158 (let ((vc (getenv "VERSION_CONTROL"))) |
159 (cond ((eq vc nil)) ;don't do anything if not set | |
160 ((or (string= vc "t") | |
161 (string= vc "numbered")) | |
162 (setq version-control t)) | |
163 ((or (string= vc "nil") | |
164 (string= vc "existing")) | |
165 (setq version-control nil)) | |
166 ((or (string= vc "never") | |
167 (string= vc "simple")) | |
168 (setq version-control 'never)))) | |
169 | |
755 | 170 ;;! This has been commented out; I currently find the behavior when |
171 ;;! split-window-keep-point is nil disturbing, but if I can get used | |
172 ;;! to it, then it would be better to eliminate the option. | |
173 ;;! ;; Choose a good default value for split-window-keep-point. | |
174 ;;! (setq split-window-keep-point (> baud-rate 2400)) | |
384 | 175 |
322 | 176 ;; Read window system's init file if using a window system. |
177 (if (and window-system (not noninteractive)) | |
437 | 178 (load (concat term-file-prefix |
179 (symbol-name window-system) | |
180 "-win") | |
181 ;; Every window system should have a startup file; | |
182 ;; barf if we can't find it. | |
183 nil t)) | |
322 | 184 |
326 | 185 (let ((done nil) |
186 (args (cdr command-line-args))) | |
187 | |
322 | 188 ;; Figure out which user's init file to load, |
189 ;; either from the environment or from the options. | |
190 (setq init-file-user (if noninteractive nil (user-login-name))) | |
191 ;; If user has not done su, use current $HOME to find .emacs. | |
192 (and init-file-user (string= init-file-user (user-real-login-name)) | |
193 (setq init-file-user "")) | |
326 | 194 |
195 ;; Process the command-line args, and delete the arguments | |
196 ;; processed. This is consistent with the way main in emacs.c | |
197 ;; does things. | |
322 | 198 (while (and (not done) args) |
199 (let ((argi (car args))) | |
200 (cond | |
201 ((or (string-equal argi "-q") | |
202 (string-equal argi "-no-init-file")) | |
203 (setq init-file-user nil | |
204 args (cdr args))) | |
205 ((or (string-equal argi "-u") | |
206 (string-equal argi "-user")) | |
207 (setq args (cdr args) | |
208 init-file-user (car args) | |
209 args (cdr args))) | |
210 ((string-equal argi "-debug-init") | |
211 (setq init-file-debug t | |
212 args (cdr args))) | |
326 | 213 (t (setq done t))))) |
214 | |
215 ;; Re-attach the program name to the front of the arg list. | |
216 (setcdr command-line-args args)) | |
322 | 217 |
2761
26bad513fbb0
(command-line): Call frame-initialize explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
2105
diff
changeset
|
218 ;; Under X Windows, this creates the X frame and deletes the terminal frame. |
2869
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
219 (if (fboundp 'frame-initialize) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
220 (frame-initialize)) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
221 (if (fboundp 'face-initialize) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
222 (face-initialize)) |
2761
26bad513fbb0
(command-line): Call frame-initialize explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
2105
diff
changeset
|
223 |
688 | 224 (run-hooks 'before-init-hook) |
370 | 225 |
883 | 226 ;; Run the site-start library if it exists. The point of this file is |
227 ;; that it is run before .emacs. There is no point in doing this after | |
228 ;; .emacs; that is useless. | |
229 (load "site-start" t t) | |
230 | |
322 | 231 ;; Load that user's init file, or the default one, or none. |
232 (let ((debug-on-error init-file-debug) | |
233 ;; This function actually reads the init files. | |
234 (inner | |
235 (function | |
236 (lambda () | |
237 (if init-file-user | |
238 (progn (load (if (eq system-type 'vax-vms) | |
239 "sys$login:.emacs" | |
240 (concat "~" init-file-user "/.emacs")) | |
241 t t t) | |
242 (or inhibit-default-init | |
243 (let ((inhibit-startup-message nil)) | |
244 ;; Users are supposed to be told their rights. | |
245 ;; (Plus how to get help and how to undo.) | |
246 ;; Don't you dare turn this off for anyone | |
247 ;; except yourself. | |
248 (load "default" t t))))))))) | |
249 (if init-file-debug | |
250 ;; Do this without a condition-case if the user wants to debug. | |
251 (funcall inner) | |
252 (condition-case error | |
253 (funcall inner) | |
254 (error (message "Error in init file: %s%s%s" | |
255 (get (car error) 'error-message) | |
256 (if (cdr error) ": ") | |
257 (mapconcat 'prin1-to-string (cdr error) ", ")))))) | |
370 | 258 |
688 | 259 (run-hooks 'after-init-hook) |
260 | |
322 | 261 ;; If *scratch* exists and init file didn't change its mode, initialize it. |
262 (if (get-buffer "*scratch*") | |
263 (save-excursion | |
264 (set-buffer "*scratch*") | |
265 (if (eq major-mode 'fundamental-mode) | |
266 (funcall initial-major-mode)))) | |
267 ;; Load library for our terminal type. | |
268 ;; User init file can set term-file-prefix to nil to prevent this. | |
269 (and term-file-prefix (not noninteractive) (not window-system) | |
270 (let ((term (getenv "TERM")) | |
271 hyphend) | |
272 (while (and term | |
273 (not (load (concat term-file-prefix term) t t))) | |
274 ;; Strip off last hyphen and what follows, then try again | |
275 (if (setq hyphend (string-match "[-_][^-_]+$" term)) | |
276 (setq term (substring term 0 hyphend)) | |
277 (setq term nil))))) | |
278 | |
326 | 279 ;; Process the remaining args. |
322 | 280 (command-line-1 (cdr command-line-args)) |
281 | |
282 ;; If -batch, terminate after processing the command options. | |
283 (if noninteractive (kill-emacs t))) | |
284 | |
285 (defun command-line-1 (command-line-args-left) | |
286 (if (null command-line-args-left) | |
287 (cond ((and (not inhibit-startup-message) (not noninteractive) | |
288 ;; Don't clobber a non-scratch buffer if init file | |
289 ;; has selected it. | |
290 (string= (buffer-name) "*scratch*") | |
291 (not (input-pending-p))) | |
292 ;; If there are no switches to process, we might as well | |
293 ;; run this hook now, and there may be some need to do it | |
294 ;; before doing any output. | |
295 (and term-setup-hook | |
296 (run-hooks 'term-setup-hook)) | |
297 ;; Don't let the hook be run twice. | |
298 (setq term-setup-hook nil) | |
2869
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
299 |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
300 ;; It's important to notice the user settings before we |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
301 ;; display the startup message; otherwise, the settings |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
302 ;; won't take effect until the user gives the first |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
303 ;; keystroke, and that's distracting. |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
304 (if (fboundp 'frame-notice-user-settings) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
305 (frame-notice-user-settings)) |
d370b253473b
* startup.el (normal-top-level, command-line, command-line-1):
Jim Blandy <jimb@redhat.com>
parents:
2761
diff
changeset
|
306 |
322 | 307 (and window-setup-hook |
308 (run-hooks 'window-setup-hook)) | |
309 (setq window-setup-hook nil) | |
310 (unwind-protect | |
311 (progn | |
312 (insert (emacs-version) | |
313 " | |
2105
844e027dc6db
(command-line-1): Fix copyright year.
Richard M. Stallman <rms@gnu.org>
parents:
1558
diff
changeset
|
314 Copyright (C) 1993 Free Software Foundation, Inc.\n\n") |
322 | 315 ;; If keys have their default meanings, |
316 ;; use precomputed string to save lots of time. | |
317 (if (and (eq (key-binding "\C-h") 'help-command) | |
318 (eq (key-binding "\C-xu") 'advertised-undo) | |
319 (eq (key-binding "\C-x\C-c") 'save-buffers-kill-emacs) | |
320 (eq (key-binding "\C-h\C-c") 'describe-copying) | |
321 (eq (key-binding "\C-h\C-d") 'describe-distribution) | |
322 (eq (key-binding "\C-h\C-w") 'describe-no-warranty) | |
323 (eq (key-binding "\C-ht") 'help-with-tutorial)) | |
324 (insert | |
325 "Type C-h for help; C-x u to undo changes. (`C-' means use CTRL key.) | |
326 To kill the Emacs job, type C-x C-c. | |
327 Type C-h t for a tutorial on using Emacs. | |
903 | 328 Type C-h i to enter Info, which you can use to read GNU documentation. |
322 | 329 |
330 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details. | |
331 You may give out copies of Emacs; type C-h C-c to see the conditions. | |
332 Type C-h C-d for information on getting the latest version.") | |
333 (insert (substitute-command-keys | |
334 "Type \\[help-command] for help; \\[advertised-undo] to undo changes. (`C-' means use CTRL key.) | |
335 To kill the Emacs job, type \\[save-buffers-kill-emacs]. | |
336 Type \\[help-with-tutorial] for a tutorial on using Emacs. | |
903 | 337 Type \\[info] to enter Info, which you can use to read GNU documentation. |
322 | 338 |
339 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for full details. | |
340 You may give out copies of Emacs; type \\[describe-copying] to see the conditions. | |
341 Type \\[describe-distribution] for information on getting the latest version."))) | |
342 (set-buffer-modified-p nil) | |
343 (sit-for 120)) | |
344 (save-excursion | |
345 ;; In case the Emacs server has already selected | |
346 ;; another buffer, erase the one our message is in. | |
347 (set-buffer (get-buffer "*scratch*")) | |
348 (erase-buffer) | |
349 (set-buffer-modified-p nil))))) | |
350 (let ((dir default-directory) | |
351 (file-count 0) | |
352 first-file-buffer | |
353 (line 0)) | |
354 (while command-line-args-left | |
355 (let ((argi (car command-line-args-left)) | |
356 tem) | |
357 (setq command-line-args-left (cdr command-line-args-left)) | |
358 (cond ((setq tem (assoc argi command-switch-alist)) | |
359 (funcall (cdr tem) argi)) | |
360 ((or (string-equal argi "-f") ;what the manual claims | |
361 (string-equal argi "-funcall") | |
362 (string-equal argi "-e")) ; what the source used to say | |
363 (setq tem (intern (car command-line-args-left))) | |
364 (setq command-line-args-left (cdr command-line-args-left)) | |
365 (funcall tem)) | |
366 ((or (string-equal argi "-l") | |
367 (string-equal argi "-load")) | |
368 (let ((file (car command-line-args-left))) | |
369 ;; Take file from default dir if it exists there; | |
370 ;; otherwise let `load' search for it. | |
371 (if (file-exists-p (expand-file-name file)) | |
372 (setq file (expand-file-name file))) | |
373 (load file nil t)) | |
374 (setq command-line-args-left (cdr command-line-args-left))) | |
3072
a655e32e6270
* startup.el (command-line-1): Don't handle `-i'. We're
Jim Blandy <jimb@redhat.com>
parents:
2869
diff
changeset
|
375 ((string-equal argi "-insert") |
748 | 376 (or (stringp (car command-line-args-left)) |
3072
a655e32e6270
* startup.el (command-line-1): Don't handle `-i'. We're
Jim Blandy <jimb@redhat.com>
parents:
2869
diff
changeset
|
377 (error "filename omitted from `-insert' option")) |
322 | 378 (insert-file-contents (car command-line-args-left)) |
379 (setq command-line-args-left (cdr command-line-args-left))) | |
380 ((string-equal argi "-kill") | |
381 (kill-emacs t)) | |
382 ((string-match "^\\+[0-9]+\\'" argi) | |
383 (setq line (string-to-int argi))) | |
384 (t | |
385 ;; We have almost exhausted our options. See if the | |
386 ;; user has made any other command-line options available | |
387 (let ((hooks command-line-functions);; lrs 7/31/89 | |
388 (did-hook nil)) | |
389 (while (and hooks | |
390 (not (setq did-hook (funcall (car hooks))))) | |
391 (setq hooks (cdr hooks))) | |
392 (if (not did-hook) | |
393 ;; Ok, presume that the argument is a file name | |
394 (progn | |
395 (setq file-count (1+ file-count)) | |
396 (cond ((= file-count 1) | |
397 (setq first-file-buffer | |
398 (find-file (expand-file-name argi dir)))) | |
399 (t | |
400 (find-file-other-window (expand-file-name argi dir)))) | |
401 (or (zerop line) | |
402 (goto-line line)) | |
403 (setq line 0)))))))) | |
404 ;; If 3 or more files visited, and not all visible, | |
405 ;; show user what they all are. | |
406 (if (> file-count 2) | |
407 (or (get-buffer-window first-file-buffer) | |
3281
49c371d2b020
(command-line-1): Pass arg to other-window.
Richard M. Stallman <rms@gnu.org>
parents:
3072
diff
changeset
|
408 (progn (other-window 1) |
322 | 409 (buffer-menu))))))) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
650
diff
changeset
|
410 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
650
diff
changeset
|
411 ;;; startup.el ends here |