comparison lisp/startup.el @ 83014:f5cadabb36dd

Support for opening X frames from a tty session. lisp/cus-face.el (custom-declare-face): Handle multiple concurrent display methods correctly. lisp/faces.el (x-create-frame-with-faces): Set the window-system frame parameter instead of frame-creation-function. (tty-create-frame-with-faces): Ditto. lisp/frame.el (frame-creation-function): Removed. (frame-creation-function-alist): New variable. (frame-initialize): Use initial-window-system instead of window-system. Add window-system parameter to initial-frame-alist. Removed tty initialization, it was moved to frame-creation-function-alist. (frame-notice-user-settings): Use initial-window-system instead of window-system. (make-frame-on-display): Make sure term/x-win is loaded. Added window-system parameter for make-frame. (make-frame-on-tty): Removed unnecessary autoload declaration. Added window-system parameter for make-frame. (make-frame): Use frame-creation-function-alist to determine the function to use depending on the specified window system. (select-frame-by-name): Use the window-system function instead of the variable. lisp/startup.el (window-system): New variable (previously built-in, now frame-local). (normal-top-level, command-line): Use initial-window-system instead of window-system. lisp/loadup.el: Load startup.el before faces.el, for the window-system variable. lisp/term/x-win.el: Check for the x-create-frame function instead of window-system to see if X is available. Don't exit Emacs if the display can not be opened when X is not the initial display method. Set up frame-creation-function-alist instead of frame-creation-function. Provide the x-win feature. src/dispnew.c (Vwindow_system): Renamed to Vinitial_window_system. (init_display, syms_of_display): Updated to use Vinitial_window_system instead of Vwindow_system. src/emacs.c (shut_down_emacs): Updated to use Vinitial_window_system instead of Vwindow_system. src/keyboard.c (Fset_input_mode): Call reset_all_sys_modes, not reset_sys_modes. Ditto for init_all_sys_modes. Process the quit parameter correctly. src/sysdep.c (init_sys_modes, reset_sys_modes): Unconditionally set up the terminal. We don't get called if there is nothing to do anymore. (sys_select): Use Vinitial_window_system, not Vwindow_system. src/window.h (Vwindow_system): Renamed to Vinitial_window_system. src/xfns.c (Fx_create_frame): Don't check_x. We initialize it anyway. (x_display_info_for_name, Fx_open_connection): Don't look at Vinitial_window_system. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-54

83013:e77d1a63471b

(setq top-level '(normal-top-level))

(defvar command-line-processed nil
  "Non-nil once command line has been processed.")

(defgroup initialization nil
  "Emacs start-up procedure"
  :group 'internal)

(defcustom inhibit-startup-message nil

	;; Don't do this if we failed to create the initial frame,
	;; for instance due to a dense colormap.
	(when (or frame-initial-frame
		  ;; If frame-initial-frame has no meaning, do this anyway.
		  (not (and window-system
			    (not noninteractive)
			    (not (eq window-system 'pc)))))
	  ;; Modify the initial frame based on what .emacs puts into
	  ;; ...-frame-alist.
	  (if (fboundp 'frame-notice-user-settings)
	      (frame-notice-user-settings))
	  (if (fboundp 'frame-set-background-mode)

	      ;; frame-set-background-mode is idempotent, so it won't
	      ;; cause any harm if it's already been done.
	      (let ((frame-background-mode frame-background-mode)
		    (frame (selected-frame))
		    term)
		(when (and (null window-system)
			   ;; Don't override a possibly customized value.
			   (null frame-background-mode)
			   ;; Don't override user specifications.
			   (null (frame-parameter frame 'reverse))
			   (let ((bg (frame-parameter frame 'background-color)))

    (setq eol-mnemonic-dos  "(DOS)"
          eol-mnemonic-mac  "(Mac)")))

  ;; Read window system's init file if using a window system.
  (condition-case error
      (if (and window-system (not noninteractive))
	  (load (concat term-file-prefix
			(symbol-name window-system)
			"-win")
		;; Every window system should have a startup file;
		;; barf if we can't find it.
		nil t))
    ;; If we can't read it, print the error message and exit.

                  (get (car error) 'error-message)
                  (mapconcat (lambda (obj) (prin1-to-string obj t))
                             (cdr error) ", "))))
      'external-debugging-output)
     (terpri 'external-debugging-output)
     (setq window-system nil)
     (kill-emacs)))

  ;; Windowed displays do this inside their *-win.el.
  (unless (or (display-graphic-p) noninteractive)
    (setq command-line-args (tty-handle-args command-line-args)))

  (when (fboundp 'frame-initialize)
    (frame-initialize))

  ;; If frame was created with a menu bar, set menu-bar-mode on.
  (unless (or noninteractive
              (and (memq window-system '(x w32))
                   (<= (frame-parameter nil 'menu-bar-lines) 0)))
    (menu-bar-mode 1))

  ;; If frame was created with a tool bar, switch tool-bar-mode on.
  (unless (or noninteractive
              (not (display-graphic-p))
              (<= (frame-parameter nil 'tool-bar-lines) 0))
    (tool-bar-mode 1))

  ;; Can't do this init in defcustom because window-system isn't set.
  (unless (or noninteractive
              (eq system-type 'ms-dos)
              (not (memq window-system '(x w32))))
    (setq-default blink-cursor t)
    (blink-cursor-mode 1))

  (unless noninteractive
    ;; DOS/Windows systems have a PC-type keyboard which has both
    ;; <delete> and <backspace> keys.
    (when (or (memq system-type '(ms-dos windows-nt))
	      (and (memq window-system '(x))
		   (fboundp 'x-backspace-delete-keys-p)
		   (x-backspace-delete-keys-p))
	      ;; If the terminal Emacs is running on has erase char
	      ;; set to ^H, use the Backspace key for deleting
	      ;; backward and, and the Delete key for deleting forward.
	      (and (null window-system)
		   (eq tty-erase-char 8)))
      (setq-default normal-erase-is-backspace t)
      (normal-erase-is-backspace-mode 1)))

  (unless (or noninteractive

    (setq-default tooltip-mode t)
    (tooltip-mode 1))

  ;; Register default TTY colors for the case the terminal hasn't a
  ;; terminal init file.
  (unless (memq window-system '(x w32))
    ;; We do this regardles of whether the terminal supports colors
    ;; or not, since they can switch that support on or off in
    ;; mid-session by setting the tty-color-mode frame parameter.
    (tty-register-default-colors))

	    (funcall initial-major-mode))))

  ;; Load library for our terminal type.
  ;; User init file can set term-file-prefix to nil to prevent this.
  (unless (or noninteractive
              window-system
              (null term-file-prefix))
    (let ((term (getenv "TERM"))
          hyphend)
      (while (and term
                  (not (load (concat term-file-prefix term) t t)))

83014:f5cadabb36dd

(setq top-level '(normal-top-level))

(defvar command-line-processed nil
  "Non-nil once command line has been processed.")

(defvar window-system initial-window-system
  "Name of window system the selected frame is displaying through.
The value is a symbol--for instance, `x' for X windows.
The value is nil if the selected frame is on a text-only-terminal.")

(make-variable-frame-local 'window-system)

(defgroup initialization nil
  "Emacs start-up procedure"
  :group 'internal)

(defcustom inhibit-startup-message nil

	;; Don't do this if we failed to create the initial frame,
	;; for instance due to a dense colormap.
	(when (or frame-initial-frame
		  ;; If frame-initial-frame has no meaning, do this anyway.
		  (not (and initial-window-system
			    (not noninteractive)
			    (not (eq initial-window-system 'pc)))))
	  ;; Modify the initial frame based on what .emacs puts into
	  ;; ...-frame-alist.
	  (if (fboundp 'frame-notice-user-settings)
	      (frame-notice-user-settings))
	  (if (fboundp 'frame-set-background-mode)

	      ;; frame-set-background-mode is idempotent, so it won't
	      ;; cause any harm if it's already been done.
	      (let ((frame-background-mode frame-background-mode)
		    (frame (selected-frame))
		    term)
		(when (and (null initial-window-system)
			   ;; Don't override a possibly customized value.
			   (null frame-background-mode)
			   ;; Don't override user specifications.
			   (null (frame-parameter frame 'reverse))
			   (let ((bg (frame-parameter frame 'background-color)))

    (setq eol-mnemonic-dos  "(DOS)"
          eol-mnemonic-mac  "(Mac)")))

  ;; Read window system's init file if using a window system.
  (condition-case error
      (if (and initial-window-system (not noninteractive))
	  (load (concat term-file-prefix
			(symbol-name initial-window-system)
			"-win")
		;; Every window system should have a startup file;
		;; barf if we can't find it.
		nil t))
    ;; If we can't read it, print the error message and exit.

                  (get (car error) 'error-message)
                  (mapconcat (lambda (obj) (prin1-to-string obj t))
                             (cdr error) ", "))))
      'external-debugging-output)
     (terpri 'external-debugging-output)
     (setq initial-window-system nil)
     (kill-emacs)))

  ;; Windowed displays do this inside their *-win.el.
  (unless (or (display-graphic-p) noninteractive)
    (setq command-line-args (tty-handle-args command-line-args)))

  (when (fboundp 'frame-initialize)
    (frame-initialize))

  ;; If frame was created with a menu bar, set menu-bar-mode on.
  (unless (or noninteractive
              (and (memq initial-window-system '(x w32))
                   (<= (frame-parameter nil 'menu-bar-lines) 0)))
    (menu-bar-mode 1))

  ;; If frame was created with a tool bar, switch tool-bar-mode on.
  (unless (or noninteractive
              (not (display-graphic-p))
              (<= (frame-parameter nil 'tool-bar-lines) 0))
    (tool-bar-mode 1))

  ;; Can't do this init in defcustom because initial-window-system isn't set.
  (unless (or noninteractive
              (eq system-type 'ms-dos)
              (not (memq initial-window-system '(x w32))))
    (setq-default blink-cursor t)
    (blink-cursor-mode 1))

  (unless noninteractive
    ;; DOS/Windows systems have a PC-type keyboard which has both
    ;; <delete> and <backspace> keys.
    (when (or (memq system-type '(ms-dos windows-nt))
	      (and (memq initial-window-system '(x))
		   (fboundp 'x-backspace-delete-keys-p)
		   (x-backspace-delete-keys-p))
	      ;; If the terminal Emacs is running on has erase char
	      ;; set to ^H, use the Backspace key for deleting
	      ;; backward and, and the Delete key for deleting forward.
	      (and (null initial-window-system)
		   (eq tty-erase-char 8)))
      (setq-default normal-erase-is-backspace t)
      (normal-erase-is-backspace-mode 1)))

  (unless (or noninteractive

    (setq-default tooltip-mode t)
    (tooltip-mode 1))

  ;; Register default TTY colors for the case the terminal hasn't a
  ;; terminal init file.
  (unless (memq initial-window-system '(x w32))
    ;; We do this regardles of whether the terminal supports colors
    ;; or not, since they can switch that support on or off in
    ;; mid-session by setting the tty-color-mode frame parameter.
    (tty-register-default-colors))

	    (funcall initial-major-mode))))

  ;; Load library for our terminal type.
  ;; User init file can set term-file-prefix to nil to prevent this.
  (unless (or noninteractive
              initial-window-system
              (null term-file-prefix))
    (let ((term (getenv "TERM"))
          hyphend)
      (while (and term
                  (not (load (concat term-file-prefix term) t t)))