;; of these are also found in term/pc-win.el
;; -------------------------
;; FILE Visit FILE.
+;; -visit FILE
+;; --visit FILE
+;; -file FILE
+;; --file FILE
;;
;; -L DIRNAME Add DIRNAME to load-path
;; -directory DIRNAME
;;
;; -eval FORM Execute Emacs lisp form FORM.
;; --eval FORM
+;; -execute EXPR
+;; --execute EXPR
;;
;; -insert FILE Insert the contents of FILE into buffer.
;; --insert FILE
:type '(choice (const :tag "none" nil) string)
:group 'initialization)
-(defconst iso-8859-n-locale-regexp "8859[-_]?\\([1-49]\\)\\>"
- "Regexp that specifies when to enable an ISO 8859-N character set.
-We do that if this regexp matches the locale name specified by
-one of the environment variables LC_ALL, LC_CTYPE, or LANG.
-The paren group in the regexp should match the specific character
-set number, N. Currently only Latin-[12345] are supported.
-\(Note that Latin-5 is ISO 8859-9, because 8859-[678] are non-Latin
-alphabets; hence, supported values of N are [12349].\)")
-
(defcustom mail-host-address nil
"*Name of this machine, for purposes of naming users."
:type '(choice (const nil) string)
string)
:group 'auto-save)
-(defvar locale-translation-file-name
- (let ((files '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
- "/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
- "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
- ;;
- ;; The following name appears after the X-related names above,
- ;; since the X-related names are what X actually uses.
- "/usr/share/locale/locale.alias" ; GNU/Linux sans X
- )))
- (while (and files (not (file-exists-p (car files))))
- (setq files (cdr files)))
- (car files))
- "*File name for the system's file of locale-name aliases, or nil if none.")
-
(defvar init-file-debug nil)
(defvar init-file-had-error nil)
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
(t
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp")))))
+ (setq small-temporary-file-directory
+ (if (eq system-type 'ms-dos)
+ (getenv "TMPDIR")))
;; See if we should import version-control from the environment variable.
(let ((vc (getenv "VERSION_CONTROL")))
(string= vc "simple"))
(setq version-control 'never))))
- (let ((ctype
- ;; Use the first of these three envvars that has a nonempty value.
- (or (let ((string (getenv "LC_ALL")))
- (and (not (equal string "")) string))
- (let ((string (getenv "LC_CTYPE")))
- (and (not (equal string "")) string))
- (let ((string (getenv "LANG")))
- (and (not (equal string "")) string)))))
- ;; Translate "swedish" into "sv_SE.ISO-8859-1", and so on,
- ;; using the translation file that GNU/Linux systems have.
- (and ctype
- locale-translation-file-name
- (not (string-match iso-8859-n-locale-regexp ctype))
- (with-temp-buffer
- (insert-file-contents locale-translation-file-name)
- (if (re-search-forward
- (concat "^" (regexp-quote ctype) ":?[ \t]+") nil t)
- (setq ctype (buffer-substring (point)
- (progn (end-of-line) (point)))))))
- ;; Now see if the locale specifies an ISO 8859 character set.
- (when (and ctype
- (string-match iso-8859-n-locale-regexp ctype))
- (let (charset (which (match-string 1 ctype)))
- (if (equal "9" which)
- (setq which "5"))
- (setq charset (concat "latin-" which))
- (when (string-match "latin-[12345]" charset)
- ;; Set up for this character set.
- ;; This is now the right way to do it
- ;; for both unibyte and multibyte modes.
- (set-language-environment charset)
- (unless (or noninteractive (eq window-system 'x))
- ;; Send those codes literally to a non-X terminal.
- (when default-enable-multibyte-characters
- ;; If this is nil, we are using single-byte characters,
- ;; so the terminal coding system is irrelevant.
- (set-terminal-coding-system
- (intern (downcase charset)))))
- (standard-display-european-internal)))))
+ (set-locale-environment nil)
;;! This has been commented out; I currently find the behavior when
;;! split-window-keep-point is nil disturbing, but if I can get used
;; into user-init-file.
(setq user-init-file t)
(load user-init-file-1 t t)
+ ;; If we did not find the user's init file,
+ ;; set user-init-file conclusively to nil;
+ ;; don't let it be set from default.el.
+ (if (eq user-init-file t)
+ (setq user-init-file nil))
(or inhibit-default-init
(let ((inhibit-startup-message nil))
;; Users are supposed to be told their rights.
;; terminal init file. The colors are good for xterm-color and the
;; FreeBSD console (cons.*). They should be sufficient for Linux
;; too, I guess.
- (let ((colors '("black" "red" "green" "yellow" "blue" "magenta"
- "cyan" "white"))
- (i 0))
- (while colors
- (face-register-tty-color (car colors) i)
- (setq colors (cdr colors) i (1+ i))))
+ (or (eq window-system 'pc) ; pc-win.el did this already
+ (let ((colors '("black" "red" "green" "yellow" "blue" "magenta"
+ "cyan" "white"))
+ (i 0))
+ (while colors
+ (face-register-tty-color (car colors) i)
+ (setq colors (cdr colors) i (1+ i)))))
;; Load library for our terminal type.
;; User init file can set term-file-prefix to nil to prevent this.
(if noninteractive (kill-emacs t)))
(defcustom initial-scratch-message "\
-This buffer is for notes you don't want to save, and for Lisp evaluation.
-If you want to create a file, visit that file with C-x C-f,
-then enter the text in that file's own buffer.
+;; This buffer is for notes you don't want to save, and for Lisp evaluation.
+;; If you want to create a file, visit that file with C-x C-f,
+;; then enter the text in that file's own buffer.
"
"Initial message displayed in *scratch* buffer at startup.
;; and long versions of what's on command-switch-alist.
(longopts
(append '(("--funcall") ("--load") ("--insert") ("--kill")
- ("--directory") ("--eval") ("--find-file") ("--visit"))
+ ("--directory") ("--eval") ("--execute")
+ ("--find-file") ("--visit") ("--file"))
(mapcar '(lambda (elt)
(list (concat "-" (car elt))))
command-switch-alist)))
(cons argval command-line-args-left)))
(funcall (cdr tem) argi))
(funcall (cdr tem) argi)))
+
((or (string-equal argi "-f") ;what the manual claims
(string-equal argi "-funcall")
(string-equal argi "-e")) ; what the source used to say
(if (arrayp (symbol-function tem))
(command-execute tem)
(funcall tem)))
- ((string-equal argi "-eval")
+
+ ((or (string-equal argi "-eval")
+ (string-equal argi "-execute"))
(if argval
(setq tem argval)
(setq tem (car command-line-args-left))
(setq command-line-args-left (cdr command-line-args-left)))
(eval (read tem)))
;; Set the default directory as specified in -L.
+
((or (string-equal argi "-L")
(string-equal argi "-directory"))
(if argval
(cons (expand-file-name tem) extra-load-path))
(setq load-path (append (nreverse extra-load-path)
initial-load-path)))
+
((or (string-equal argi "-l")
(string-equal argi "-load"))
(if argval
(if (file-exists-p (expand-file-name file))
(setq file (expand-file-name file)))
(load file nil t)))
+
((string-equal argi "-insert")
(if argval
(setq tem argval)
(or (stringp tem)
(error "File name omitted from `-insert' option"))
(insert-file-contents (command-line-normalize-file-name tem)))
+
((string-equal argi "-kill")
(kill-emacs t))
+
((string-match "^\\+[0-9]+\\'" argi)
(setq line (string-to-int argi)))
+
((setq tem (assoc argi command-line-x-option-alist))
;; Ignore X-windows options and their args if not using X.
(setq command-line-args-left
(nthcdr (nth 1 tem) command-line-args-left)))
+
((or (string-equal argi "-find-file")
+ (string-equal argi "-file")
(string-equal argi "-visit"))
;; An explicit option to specify visiting a file.
+ (if argval
+ (setq tem argval)
+ (setq tem (car command-line-args-left)
+ command-line-args-left (cdr command-line-args-left)))
+ (unless (stringp tem)
+ (error "File name omitted from `%s' option" argi))
(setq file-count (1+ file-count))
- (let ((file
- (expand-file-name
- (command-line-normalize-file-name orig-argi)
- dir)))
+ (let ((file (expand-file-name
+ (command-line-normalize-file-name tem) dir)))
(if (= file-count 1)
(setq first-file-buffer (find-file file))
(find-file-other-window file)))
(or (zerop line)
(goto-line line))
(setq line 0))
+
((equal argi "--")
(setq just-files t))
(t