Mercurial > emacs
annotate lib-src/rcs-checkin @ 51195:3cbf29813eea
(struct frame): Rename members height to text_lines,
width to text_cols, window_height to total_lines, window_width to
total_cols, new_height to new_text_lines, new_width to
new_text_cols. All uses changed.
(struct frame): New members which consolidate common members of
x_output, w32_output, and mac_output structures: left_pos,
top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
win_gravity, size_hint_flags, border_width, internal_border_width,
line_height, fringe_cols, left_fringe_width, right_fringe_width,
want_fullscreen. All uses changed.
(struct frame): New member column_width contaning the canonical
column width, analogue to line_height. All uses changed.
(struct frame): Rename members scroll_bar_pixel_width to
config_scroll_bar_width, and scroll_bar_cols to
config_scroll_bar_cols. All uses changed.
(struct frame): New member scroll_bar_actual_width which
consolidates and renames the vertical_scroll_bar_extra member of
x_output, w32_output, and mac_output structures. All uses changed.
(FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_height.
(FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_width.
(FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed.
Also change code which referred to f->height.
(FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed.
Also change code which referred to f->width.
(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
to update new_text_lines and new_text_cols members directly.
(FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
(FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
FRAME_SCROLL_BAR_COLS. All uses changed.
(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
(FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
(SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
(FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
(FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally
return line_height member (it now has proper value also for
non-window frames).
(FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally
return new column_width member (rather than the default font width).
(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
(FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
from x/w32/macterm.h files. Unconditionally return corresponding
member of frame structure (they now have proper values also for
non-window frames).
(FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
Calculate return value from left and right widths.
(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
internal_border_width member (has proper value for non-window frame).
(FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
(FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
(FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
(FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
(FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
(FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:58:07 +0000 |
parents | 23a1cea22d13 |
children | 695cf19ef79e d7ddb3e565de |
rev | line source |
---|---|
12507
da322c027bf0
Replace `#!/bin/sh' with `#! /bin/sh', for benefit of systems
Paul Eggert <eggert@twinsun.com>
parents:
9611
diff
changeset
|
1 #! /bin/sh |
2273 | 2 |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
3 # This script accepts any number of file arguments and checks them into RCS. |
36226 | 4 |
43223 | 5 # Copyright (C) 1993, 1994, 1995, 2001, 2002 Free Software Foundation, Inc. |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
6 # |
36226 | 7 # This file is part of GNU Emacs. |
8 # | |
9 # GNU Emacs is free software; you can redistribute it and/or modify | |
10 # it under the terms of the GNU General Public License as published by | |
11 # the Free Software Foundation; either version 2, or (at your option) | |
12 # any later version. | |
13 # | |
14 # GNU Emacs is distributed in the hope that it will be useful, | |
15 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 # GNU General Public License for more details. | |
18 # | |
19 # You should have received a copy of the GNU General Public License | |
20 # along with GNU Emacs; see the file COPYING. If not, write to the | |
21 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 # Boston, MA 02111-1307, USA. | |
23 | |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
24 # Arguments which are detectably either RCS masters (with names ending in ,v) |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
25 # or Emacs version files (with names of the form foo.~<number>~) are ignored. |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
26 # For each file foo, the script looks for Emacs version files related to it. |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
27 # These files are checked in as deltas, oldest first, so that the contents of |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
28 # the file itself becomes the latest revision in the master. |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
29 # |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
30 # The first line of each file is used as its description text. The file itself |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
31 # is not deleted, as under VC with vc-keep-workfiles at its default of t, but |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
32 # all the version files are. |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
33 # |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
43223
diff
changeset
|
34 # If an argument file is already version-controlled under RCS, any version |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
35 # files are added to the list of deltas and deleted, and then the workfile |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
36 # is checked in again as the latest version. This is probably not quite |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
37 # what was wanted, and is the main reason VC doesn't simply call this to |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
38 # do checkins. |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
39 # |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
40 # This script is intended to be used to convert files with an old-Emacs-style |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
41 # version history for use with VC (the Emacs 19 version-control interface), |
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
42 # which likes to use RCS as its back end. It was written by Paul Eggert |
2689
dcbc46826515
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2275
diff
changeset
|
43 # and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993. |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
44 |
2273 | 45 case $# in |
46 0) | |
47 echo "rcs-checkin: usage: rcs-checkin file ..." | |
48 echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file" | |
49 echo "rcs-checkin: function: uses the file's first line for the description" | |
50 esac | |
51 | |
52 # expr pattern to extract owner from ls -l output | |
53 ls_owner_pattern='[^ ][^ ]* *[^ ][^ ]* *\([^ ][^ ]*\)' | |
54 | |
55 for file | |
56 do | |
57 # Make it easier to say `rcs-checkin *' | |
58 # by ignoring file names that already contain `~', or end in `,v'. | |
59 case $file in | |
60 *~* | *,v) continue | |
61 esac | |
62 # Ignore non-files too. | |
63 test -f "$file" || continue | |
64 | |
4343
aa19e3673b9f
Don't check whether file is readable until we have decided not to ignore it.
Paul Eggert <eggert@twinsun.com>
parents:
2689
diff
changeset
|
65 # Check that file is readable. |
9611
9e5812a795da
Use test -r instead of < to check readability, to avoid syntax error.
David J. MacKenzie <djm@gnu.org>
parents:
4343
diff
changeset
|
66 test -r "$file" || exit |
4343
aa19e3673b9f
Don't check whether file is readable until we have decided not to ignore it.
Paul Eggert <eggert@twinsun.com>
parents:
2689
diff
changeset
|
67 |
2273 | 68 # If the RCS file does not already exist, |
69 # initialize it with a description from $file's first line. | |
70 rlog -R "$file" >/dev/null 2>&1 || | |
71 rcs -i -q -t-"`sed 1q $file`" "$file" || exit | |
72 | |
73 # Get list of old files. | |
74 oldfiles=` | |
75 ls $file.~[0-9]*~ 2>/dev/null | | |
43221
fadb49348c98
Use `sort -k 2', not `sort +1', as POSIX 1003.1-2001
Paul Eggert <eggert@twinsun.com>
parents:
36226
diff
changeset
|
76 sort -t~ -n -k 2 |
2273 | 77 ` |
78 | |
79 # Check that they are properly sorted by date. | |
80 case $oldfiles in | |
81 ?*) | |
82 oldfiles_by_date=`ls -rt $file $oldfiles` | |
83 test " $oldfiles | |
84 $file" = " $oldfiles_by_date" || { | |
85 echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order. | |
86 | |
87 Sorted by mod time: | |
88 $oldfiles_by_date | |
89 | |
90 Sorted by name: | |
91 $oldfiles | |
92 $file" | |
93 continue | |
94 } | |
95 esac | |
96 | |
97 echo >&2 rcs-checkin: checking in: $oldfiles $file | |
98 | |
99 # Save $file as $file.~-~ temporarily. | |
100 mv "$file" "$file.~-~" || exit | |
101 | |
102 # Rename each old file to $file, and check it in. | |
103 for oldfile in $oldfiles | |
104 do | |
105 mv "$oldfile" "$file" || exit | |
106 ls_l=`ls -l "$file"` || exit | |
107 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= | |
2275
c70f9af7c66a
Added documentation, made the change comment for old versions more
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2273
diff
changeset
|
108 echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit |
2273 | 109 done |
110 | |
111 # Bring $file back from $file.~-~, and check it in. | |
112 mv "$file.~-~" "$file" || exit | |
113 ls_l=`ls -l "$file"` || exit | |
114 owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner= | |
115 ci -d -q -u $owner -m"entered into RCS" "$file" || exit | |
116 done | |
117 |