Mercurial > hg > xemacs-beta
view lisp/cus-start.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 | 141c2920ea48 |
children | 308d34e9f07d |
line wrap: on
line source
;;; cus-start.el --- define customization properties of builtins. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not synched with FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; The following code is used to define the customization properties ;; for builtin variables, and variables in the packages that are ;; preloaded /very/ early, before custom.el itself (replace.el is such ;; an example). The way it handles custom stuff is dirty, and should ;; be regarded as a last resort. DO NOT add variables here, unless ;; you know what you are doing. ;; Must be run before the user has changed the value of any options! ;;; Code: (require 'custom) (let ((all '(;; boolean (abbrev-all-caps abbrev boolean) (allow-deletion-of-last-visible-frame frames boolean) (allow-incremental-gc alloc boolean) (debug-on-quit debug boolean) (delete-auto-save-files auto-save boolean) (delete-exited-processes processes-basics boolean) (garbage-collection-messages alloc boolean) (indent-tabs-mode editing-basics boolean) (load-ignore-elc-files maint boolean) (load-ignore-out-of-date-elc-files maint boolean) (load-show-full-path-in-messages maint boolean) (load-always-display-messages maint boolean) (load-warn-when-source-newer maint boolean) (load-warn-when-source-only maint boolean) (modifier-keys-are-sticky keyboard boolean) (no-redraw-on-reenter display boolean) (scroll-on-clipped-lines display boolean) (truncate-partial-width-windows display boolean) (visible-bell sound boolean) (x-allow-sendevents x boolean) (zmacs-regions editing-basics boolean) (load-home-init-file installation boolean) ;; integer (auto-save-interval auto-save integer) (bell-volume sound integer) (bell-inhibit-time sound integer) (echo-keystrokes keyboard integer) (gc-cons-threshold alloc integer) (gc-cons-incremental-threshold alloc integer) (gc-incremental-traversal-threshold alloc integer) (next-screen-context-lines display integer) (scroll-conservatively display integer) (scroll-step windows integer) (window-min-height windows integer) (window-min-width windows integer) ;; object (auto-save-file-format auto-save (choice (const :tag "Normal" t) (repeat (symbol :tag "Format")))) (completion-ignored-extensions minibuffer (repeat (string :format "%v"))) (debug-ignored-errors debug (repeat (choice :format "%v" (symbol :tag "Class") regexp))) (debug-on-error debug (choice (const :tag "off" nil) (const :tag "Always" t) (repeat :menu-tag "When" :value (nil) (symbol :tag "Condition")))) (debug-on-signal debug (choice (const :tag "off" nil) (const :tag "Always" t) (repeat :menu-tag "When" :value (nil) (symbol :tag "Condition")))) (exec-path processes-basics (repeat (choice :tag "Directory" (const :tag "Default" nil) (directory :format "%v")))) (file-name-handler-alist data (repeat (cons regexp (function :tag "Handler")))) (shell-file-name execute file) (stack-trace-on-error debug (choice (const :tag "off" nil) (const :tag "Always" t) (repeat :menu-tag "When" :value (nil) (symbol :tag "Condition")))) (stack-trace-on-signal debug (choice (const :tag "off" nil) (const :tag "Always" t) (repeat :menu-tag "When" :value (nil) (symbol :tag "Condition")))) (modifier-keys-sticky-time keyboard (choice (integer :tag "Milliseconds") (const :tag "Unbounded" 'unbounded))) ;; buffer-local (case-fold-search matching boolean) (ctl-arrow display (choice (integer 160) (sexp :tag "160 (default)" :format "%t\n"))) (fill-column fill integer) (left-margin fill integer) (tab-width editing-basics integer) (truncate-lines display boolean) (overwrite-mode editing-basics ;; for the options menu - dverna (choice (const :tag "disabled" nil) (const :tag "textual" 'overwrite-mode-textual) (const :tag "binary" 'overwrite-mode-binary))) ;; not documented as user-options, but should still be ;; customizable: (bar-cursor display (choice (const :tag "Block Cursor" nil) (const :tag "Bar Cursor (1 pixel)" t) (sexp :tag "Bar Cursor (2 pixels)" :format "%t\n" 'other))) (default-frame-plist frames plist) (default-tty-frame-plist frames plist) (default-x-frame-plist frames plist) (disable-auto-save-when-buffer-shrinks auto-save boolean) (find-file-use-truenames find-file boolean) (find-file-compare-truenames find-file boolean) (focus-follows-mouse x boolean) (help-char keyboard (choice character (sexp :tag "Single key specifier"))) (max-lisp-eval-depth limits integer) (max-specpdl-size limits integer) (meta-prefix-char keyboard character) (parse-sexp-ignore-comments editing-basics boolean) (selective-display display (choice (const :tag "off" nil) (integer :tag "space" :format "%v" 1) (const :tag "on" t))) (selective-display-ellipses display boolean) (signal-error-on-buffer-boundary internal boolean) (temp-buffer-show-function windows (radio (function-item :tag "Temp Buffers Always in Same Frame" :format "%t\n" show-temp-buffer-in-current-frame) (const :tag "Temp Buffers Like Other Buffers" nil) (function :tag "Other"))) (undo-threshold undo integer) (undo-high-threshold undo integer) (words-include-escapes editing-basics boolean) ;; These are from replace.el, which is loaded too early ;; to be customizable. (case-replace matching boolean) (query-replace-highlight matching boolean) (list-matching-lines-default-context-lines matching integer))) this symbol group type) (while all (setq this (car all) all (cdr all) symbol (nth 0 this) group (nth 1 this) type (nth 2 this)) (if (not (boundp symbol)) ;; This is loaded so early, there is no message (if (fboundp 'message) ;; If variables are removed from C code, give an error here! (message "Intrinsic `%S' not bound" symbol)) ;; This is called before any user can have changed the value. (put symbol 'standard-value (list (quote-maybe (default-value symbol)))) ;; Add it to the right group. (custom-add-to-group group symbol 'custom-variable) ;; Set the type. (put symbol 'custom-type type)))) ;; This is to prevent it from being reloaded by `cus-load.el'. (provide 'cus-start) ;;; cus-start.el ends here.