Mercurial > hg > xemacs-beta
view lisp/dumped-lisp.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | ebb35ddea76a |
children | bd28481bb0e1 |
line wrap: on
line source
(defvar packages-hardcoded-lisp '( ;; Nothing at this time ) "Lisp packages that are always dumped with XEmacs. This includes every package that is loaded directly by a package listed in dumped-lisp.el and is not itself listed.") ;; WARNING WARNING WARNING: None of the files below, until where it says ;; "All files after this can have extended characters in them", can have ;; extended (non-ASCII characters) of any sort in them! Unfortunately, you ;; will not get any error at load-time; however, you may get a later very ;; cryptic error "Invalid opcode"! This is caused by the byte-code data ;; being encoded as escape-quoted, when we can't handle that yet. ;; ;; #### We should resurrect the check for the coding-system magic cookie in ;; fileio.c and put in an abort if we are not able to handle it yet. (setq preloaded-file-list (list ;; do not defcustom any variables in these files "backquote" ; needed for defsubst etc. "bytecomp-runtime" ; define defsubst "find-paths" "packages" ; Bootstrap run-time lisp environment "setup-paths" ;; use custom-declare-variable-early, not defcustom, in these files "subr" ; load the most basic Lisp functions "post-gc" "replace" ; match-string used in version.el. "version" "cl" "cl-extra" "cl-seq" "widget" "custom" ; Before the world so everything can be ; customized "cus-start" ; for customization of builtin variables ;; OK, you can use defcustom from here on "cmdloop" "keymap" "syntax" "device" "console" "obsolete" "specifier" "frame" ; needed by faces ;; #### this should be (featurep 'xft) (when (featurep 'xft-fonts) "fontconfig") ; needed by x-faces (when (featurep 'x) "x-faces") ; needed by faces (when (featurep 'gtk) "gtk-faces") (when (valid-console-type-p 'mswindows) "msw-faces") "faces" ; must be loaded before any make-face call ;;(pureload "facemenu") #### not yet ported "glyphs" "objects" "extents" "events" "hash-table" "text-props" "process" ;; This is bad. network-streams may not be defined. (when (featurep 'multicast) "multicast") ; #+network-streams implicitly true "map-ynp" "undo-stack" "window" ; simple needs `save-window-excursion' "window-xemacs" "resize-minibuffer" ; simple needs `resize-minibuffer-mode' "simple" "newcomment" "keydefs" ; Before loaddefs so that keymap vars exist. "abbrev" "derived" "minibuf" "list-mode" "modeline" ; needs simple.el to be loaded first ;; If SparcWorks support is included some additional packages are ;; dumped which would normally have autoloads. To avoid ;; duplicate doc string warnings, SparcWorks uses a separate ;; autoloads file with the dumped packages removed. ;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!! ;; So just make loaddefs-eos go away... ;;(pureload (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs")) "cus-file" "startup" ; For initialization of ; `emacs-user-extension-dir' "misc" ;; (pureload "profile") "loadhist" ; Must be dumped before loaddefs is loaded ; Used by help. "help" ;; (pureload "hyper-apropos") Soon... "files" "lib-complete" "format" "indent" "isearch-mode" "buffer" "buff-menu" "paths" "lisp" "page" "register" "iso8859-1" ; This must be before any modes ; (sets standard syntax table.) "easy-mmode" ; Added for 21.5. "easymenu" ; Added for 20.3. "lisp-mode" "text-mode" "fill" "auto-save" ; Added for 20.4 "movemail" ; Added for 21.2 (when (eq system-type 'windows-nt) "win32-native") (when (featurep 'lisp-float-type) "float-sup") "itimer" ; for vars auto-save-timeout and ; auto-gc-threshold "itimer-autosave" "printer" "behavior" "behavior-defs" "diagnose" ;;;;;;;;;;;;;;;;;; GUI support (when (featurep 'window-system) '("gui" "mouse" "mode-motion" )) (when (featurep 'toolbar) "toolbar") (when (featurep 'scrollbar) "scrollbar") (when (featurep 'menubar) "menubar") (when (featurep 'dialog) "dialog") (when (featurep 'gutter) "gutter") (when (featurep 'dragdrop-api) "dragdrop") "select" ;;;;;;;;;;;;;;;;;; Content for GUI's ;; There used to be window-system inserted in the when-feature, ;; but IMHO your configure script should turn off the menubar, ;; toolbar, etc. features when there is no window system. We ;; should just be able to assume that, if (featurep 'menubar), ;; the menubar should work and if items are added, they can be ;; seen clearly and usefully. (when (featurep '(and (not infodock) menubar)) "menubar-items") (when (featurep '(and gutter)) "gutter-items") (when (featurep '(and (not infodock) toolbar)) "toolbar-items") (when (featurep '(and (not infodock) dialog)) "dialog-items") ;;;;;;;;;;;;;;;;;; Coding-system support "coding" "code-files" ;; Handle process with encoding/decoding coding-system. "code-process" ;; Provide basic commands to set coding systems to user "code-cmds" "unicode" ;;;;;;;;;;;;;;;;;; MULE support (when (featurep 'mule) '("mule/mule-charset" "mule/mule-cmds" ; to sync with Emacs 20.1 "mule/mule-coding" "mule/mule-composite-stub" "mule/mule-composite" )) ;; may initialize coding systems (when (featurep '(and mule x)) "mule/mule-x-init") (when (featurep '(and mule tty)) "mule/mule-tty-init") (when (and (featurep 'mule) (memq system-type '(windows-nt cygwin32))) "mule/mule-win32-init") "code-init" ; set up defaults ;; All files after this can have extended characters in them. (when (featurep 'mule) '("mule/mule-category" "mule/kinsoku" )) ;; after this goes the specific lisp routines for a particular input system ;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site ;; or user switching of input systems??? ;(if (featurep 'wnn) ; (progn ; (pureload "egg") ; (pureload "egg-wnn") ; (setq egg-default-startup-file "eggrc-wnn"))) ;; (if (and (boundp 'CANNA) CANNA) ;; (pureload "canna") ;; ) ;; Now load files to set up all the different languages/environments that ;; Mule knows about. Formerly we had to worry about files shadowed by ;; those of the same name in leim/quail.el, but no longer, since we now ;; compile with -no-packages. (when (featurep 'mule) '("mule/arabic" "mule/chinese" "mule/cyrillic" "mule/english" "mule/ethiopic" "mule/greek" "mule/hebrew" "mule/indian" "mule/devanagari" ; must be loaded after indian.el "mule/japanese" "mule/korean" "mule/lao" ; sucks. "mule/latin" "mule/misc-lang" ;; "thai" #### merge thai and thai-xtis!!! ;; #### Even better; take out thai-xtis! It's not even a ;; standard, and no-one uses it. "mule/thai-xtis" "mule/tibetan" "mule/vietnamese" )) ;; Specialized language support (when (featurep 'mule) "mule/canna-leim") ;; needs access to the charsets created by the above ;; language-specific files. (when (and (featurep 'mule) (valid-console-type-p 'mswindows)) "mule/mule-msw-init-late") (when (featurep 'mule) "mule/general-late") ;;; mule-load.el ends here ;; preload InfoDock stuff. should almost certainly not be here if ;; id-menus is not here. infodock needs to figure out a clever way to ;; advise this stuff or we need to export a clean way for infodock or ;; others to control this programmatically. (when (featurep '(and infodock (or x mswindows gtk) menubar)) "id-menus") ;; preload the X code. (when (featurep '(and x scrollbar)) "x-scrollbar") (when (featurep 'x) '("x-mouse" "x-select" "x-misc" "x-init" "x-win-xfree86" "x-win-sun")) ;; preload the GTK code (when (featurep 'gtk) '("gtk-ffi" "gtk-widgets" "gdk" "gtk-init" "gtk-select" "gtk-mouse" "gtk-glyphs" "widgets-gtk")) (when (featurep '(and gtk dialog)) "dialog-gtk") (when (featurep 'glade) "glade") ;; preload the mswindows code. (when (valid-console-type-p 'mswindows) '("msw-glyphs" "msw-mouse" "msw-init" "msw-select")) ;; preload the TTY init code. (when (featurep 'tty) "tty-init") ;;; Formerly in tooltalk/tooltalk-load.el ;; Moved to tooltalk package ;; (when (featurep 'tooltalk) ;; '("tooltalk-macros" "tooltalk-util" "tooltalk-init")) ;; "vc-hooks" ; Packaged. Available in two versions. ;; "ediff-hook" ; Packaged. "fontl-hooks" "auto-show" "paragraphs" ; needs easy-mmode, coding (when (featurep 'ldap) "ldap") ;; (when (featurep 'energize) "energize/energize-load.el") ;;; formerly in sunpro/sunpro-load.el ;; (when (featurep '(and mule sparcworks)) "mime-setup") ;; Moved to Sun package ;; (when (featurep 'sparcworks) ;; '("cc-mode" ; Requires cc-mode package ;; "sunpro-init" ;; "ring" ;; "comint" ; Requires comint package ;; "annotations")) ;;; formerly in eos/sun-eos-load.el ;; (when (featurep 'sparcworks) ;; '("sun-eos-init" ;; "sun-eos-common" ;; "sun-eos-editor" ;; "sun-eos-browser" ;; "sun-eos-debugger" ;; "sun-eos-debugger-extra" ;; "sun-eos-menubar")) "loaddefs" ; <=== autoloads get loaded here )) (setq preloaded-file-list (apply #'nconc (mapcar #'(lambda (x) (if (listp x) x (list x))) preloaded-file-list)))