comparison lisp/startup.el @ 13912:07d5e992fdc4

(auto-save-list-file-prefix): Under MS-DOS, use `.s-'. (normal-top-level): Under MS-DOS, use `make-temp-name' to produce a unique `auto-save-list-file-name' (PID is not unique enough). (command-line-1): Delete explicit test for msdos and windowsnt; test just `window-system'. (command-line-x-option-alist): Use x-handle-geometry for geometry options.
author Richard M. Stallman <rms@gnu.org>
date Mon, 01 Jan 1996 23:50:19 +0000
parents 1c65a1e5f099
children 18d26aa4c25a
comparison
equal deleted inserted replaced
13911:3e9e8b468bc1 13912:07d5e992fdc4
170 ("-reverse" 0 x-handle-switch reverse t) 170 ("-reverse" 0 x-handle-switch reverse t)
171 ("-reverse-video" 0 x-handle-switch reverse t) 171 ("-reverse-video" 0 x-handle-switch reverse t)
172 ("-fn" 1 x-handle-switch font) 172 ("-fn" 1 x-handle-switch font)
173 ("-font" 1 x-handle-switch font) 173 ("-font" 1 x-handle-switch font)
174 ("-ib" 1 x-handle-numeric-switch internal-border-width) 174 ("-ib" 1 x-handle-numeric-switch internal-border-width)
175 ("-g" 1 x-handle-switch geometry) 175 ("-g" 1 x-handle-geometry)
176 ("-geometry" 1 x-handle-switch geometry) 176 ("-geometry" 1 x-handle-geometry)
177 ("-fg" 1 x-handle-switch foreground-color) 177 ("-fg" 1 x-handle-switch foreground-color)
178 ("-foreground" 1 x-handle-switch foreground-color) 178 ("-foreground" 1 x-handle-switch foreground-color)
179 ("-bg" 1 x-handle-switch background-color) 179 ("-bg" 1 x-handle-switch background-color)
180 ("-background" 1 x-handle-switch background-color) 180 ("-background" 1 x-handle-switch background-color)
181 ("-ms" 1 x-handle-switch mouse-color) 181 ("-ms" 1 x-handle-switch mouse-color)
192 ("--name" 1 x-handle-name-rn-switch) 192 ("--name" 1 x-handle-name-rn-switch)
193 ("--title" 1 x-handle-name-rn-switch) 193 ("--title" 1 x-handle-name-rn-switch)
194 ("--reverse-video" 0 x-handle-switch reverse t) 194 ("--reverse-video" 0 x-handle-switch reverse t)
195 ("--font" 1 x-handle-switch font) 195 ("--font" 1 x-handle-switch font)
196 ("--internal-border" 1 x-handle-numeric-switch internal-border-width) 196 ("--internal-border" 1 x-handle-numeric-switch internal-border-width)
197 ("--geometry" 1 x-handle-switch geometry) 197 ("--geometry" 1 x-handle-geometry)
198 ("--foreground-color" 1 x-handle-switch foreground-color) 198 ("--foreground-color" 1 x-handle-switch foreground-color)
199 ("--background-color" 1 x-handle-switch background-color) 199 ("--background-color" 1 x-handle-switch background-color)
200 ("--mouse-color" 1 x-handle-switch mouse-color) 200 ("--mouse-color" 1 x-handle-switch mouse-color)
201 ("--icon-type" 0 x-handle-switch icon-type t) 201 ("--icon-type" 0 x-handle-switch icon-type t)
202 ("--iconic" 0 x-handle-iconic) 202 ("--iconic" 0 x-handle-iconic)
282 (defvar user-mail-address nil 282 (defvar user-mail-address nil
283 "*Full mailing address of this user. 283 "*Full mailing address of this user.
284 This is initialized based on `mail-host-address', 284 This is initialized based on `mail-host-address',
285 after your init file is read, in case it sets `mail-host-address'.") 285 after your init file is read, in case it sets `mail-host-address'.")
286 286
287 (defvar auto-save-list-file-prefix "~/.saves-" 287 (defvar auto-save-list-file-prefix
288 (if (eq system-type 'ms-dos)
289 "~/_s" ; MS-DOS cannot have initial dot, and allows only 8.3 names
290 "~/.saves-")
288 "Prefix for generating `auto-save-list-file-name'. 291 "Prefix for generating `auto-save-list-file-name'.
289 This is used after reading your `.emacs' file to initialize 292 This is used after reading your `.emacs' file to initialize
290 `auto-save-list-file-name', by appending Emacs's pid and the system name, 293 `auto-save-list-file-name', by appending Emacs's pid and the system name,
291 if you have not already set `auto-save-list-file-name' yourself. 294 if you have not already set `auto-save-list-file-name' yourself.
292 Set this to nil if you want to prevent `auto-save-list-file-name' 295 Set this to nil if you want to prevent `auto-save-list-file-name'
345 ;; Specify the file for recording all the auto save files of this session. 348 ;; Specify the file for recording all the auto save files of this session.
346 ;; This is used by recover-session. 349 ;; This is used by recover-session.
347 (or auto-save-list-file-name 350 (or auto-save-list-file-name
348 (and auto-save-list-file-prefix 351 (and auto-save-list-file-prefix
349 (setq auto-save-list-file-name 352 (setq auto-save-list-file-name
350 (expand-file-name 353 ;; Under MS-DOS our PID is almost always reused between
351 (format "%s%d-%s" 354 ;; Emacs invocations. We need something more unique.
352 auto-save-list-file-prefix 355 (if (eq system-type 'ms-dos)
353 (emacs-pid) 356 (make-temp-name
354 (system-name)))))) 357 (expand-file-name auto-save-list-file-prefix))
358 (expand-file-name (format "%s%d-%s"
359 auto-save-list-file-prefix
360 (emacs-pid)
361 (system-name)))))))
355 (run-hooks 'emacs-startup-hook) 362 (run-hooks 'emacs-startup-hook)
356 (and term-setup-hook 363 (and term-setup-hook
357 (run-hooks 'term-setup-hook)) 364 (run-hooks 'term-setup-hook))
358 ;; Modify the initial frame based on what .emacs puts into 365 ;; Modify the initial frame based on what .emacs puts into
359 ;; ...-frame-alist. 366 ;; ...-frame-alist.
714 (insert (substitute-command-keys 721 (insert (substitute-command-keys
715 "\n\nType \\[tmm-menubar] to use the menu bar.")))) 722 "\n\nType \\[tmm-menubar] to use the menu bar."))))
716 723
717 ;; Windows and MSDOS (currently) do not count as 724 ;; Windows and MSDOS (currently) do not count as
718 ;; window systems, but do have mouse support. 725 ;; window systems, but do have mouse support.
719 (if (or (memq system-type '(msdos windowsnt)) 726 (if window-system
720 window-system)
721 (insert "\n 727 (insert "\n
722 C-mouse-3 (third mouse button, with Control) gets a mode-specific menu.")) 728 C-mouse-3 (third mouse button, with Control) gets a mode-specific menu."))
723 (if (directory-files (file-name-directory auto-save-list-file-prefix) 729 (if (directory-files (file-name-directory auto-save-list-file-prefix)
724 nil 730 nil
725 (concat "\\`" 731 (concat "\\`"