Mercurial > hg > xemacs-beta
annotate lib-src/rcs-checkin @ 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 | 3ecd8885ac67 |
| children |
| rev | line source |
|---|---|
| 428 | 1 #! /bin/sh |
| 2 | |
| 3 # This script accepts any number of file arguments and checks them into RCS. | |
| 4 # | |
| 5 # Arguments which are detectably either RCS masters (with names ending in ,v) | |
| 6 # or Emacs version files (with names of the form foo.~<number>~) are ignored. | |
| 7 # For each file foo, the script looks for Emacs version files related to it. | |
| 8 # These files are checked in as deltas, oldest first, so that the contents of | |
| 9 # the file itself becomes the latest revision in the master. | |
| 10 # | |
| 11 # The first line of each file is used as its description text. The file itself | |
| 12 # is not deleted, as under VC with vc-keep-workfiles at its default of t, but | |
| 13 # all the version files are. | |
| 14 # | |
| 15 # If an argument file is already version-controlled under RCS, any version | |
| 16 # files are added to the list of deltas and deleted, and then the workfile | |
| 17 # is checked in again as the latest version. This is probably not quite | |
| 18 # what was wanted, and is the main reason VC doesn't simply call this to | |
| 19 # do checkins. | |
| 20 # | |
| 21 # This script is intended to be used to convert files with an old-Emacs-style | |
| 22 # version history for use with VC (the Emacs 19 version-control interface), | |
| 23 # which likes to use RCS as its back end. It was written by Paul Eggert | |
| 24 # and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993. | |
| 25 | |
| 26 case $# in | |
| 27 0) | |
| 28 echo "rcs-checkin: usage: rcs-checkin file ..." | |
| 29 echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file" | |
| 30 echo "rcs-checkin: function: uses the file's first line for the description" | |
| 31 esac | |
| 32 | |
| 33 # expr pattern to extract owner from ls -l output | |
| 34 ls_owner_pattern='[^ ][^ ]* *[^ ][^ ]* *\([^ ][^ ]*\)' | |
| 35 | |
| 36 for file | |
| 37 do | |
| 38 # Make it easier to say `rcs-checkin *' | |
| 39 # by ignoring file names that already contain `~', or end in `,v'. | |
| 40 case $file in | |
| 41 *~* | *,v) continue | |
| 42 esac | |
| 43 # Ignore non-files too. | |
| 44 test -f "$file" || continue | |
| 45 | |
| 46 # Check that file is readable. | |
| 47 test -r "$file" || exit | |
| 48 | |
| 49 # If the RCS file does not already exist, | |
| 50 # initialize it with a description from $file's first line. | |
| 51 rlog -R "$file" >/dev/null 2>&1 || | |
| 52 rcs -i -q -t-"`sed 1q $file`" "$file" || exit | |
| 53 | |
| 54 # Get list of old files. | |
| 55 oldfiles=` | |
| 56 ls $file.~[0-9]*~ 2>/dev/null | | |
| 57 sort -t~ -n +1 | |
| 58 ` | |
| 59 | |
| 60 # Check that they are properly sorted by date. | |
| 61 case $oldfiles in | |
| 62 ?*) | |
| 63 oldfiles_by_date=`ls -rt $file $oldfiles` | |
| 64 test " $oldfiles | |
| 65 $file" = " $oldfiles_by_date" || { | |
| 66 echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order. | |
| 67 | |
| 68 Sorted by mod time: | |
| 69 $oldfiles_by_date | |
| 70 | |
| 71 Sorted by name: | |
| 72 $oldfiles | |
| 73 $file" | |
| 74 continue | |
| 75 } | |
| 76 esac | |
| 77 | |
| 78 echo >&2 rcs-checkin: checking in: $oldfiles $file | |
| 79 | |
| 80 # Save $file as $file.~-~ temporarily. | |
| 81 mv "$file" "$file.~-~" || exit | |
| 82 | |
| 83 # Rename each old file to $file, and check it in. | |
| 84 for oldfile in $oldfiles | |
| 85 do | |
| 86 mv "$oldfile" "$file" || exit | |
| 87 ls_l=`ls -l "$file"` || exit | |
| 88 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= | |
| 89 echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit | |
| 90 done | |
| 91 | |
| 92 # Bring $file back from $file.~-~, and check it in. | |
| 93 mv "$file.~-~" "$file" || exit | |
| 94 ls_l=`ls -l "$file"` || exit | |
| 95 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= | |
| 96 ci -d -q -u $owner -m"entered into RCS" "$file" || exit | |
| 97 done | |
| 98 |