Simon Tatham
8e91c62bfa
We can now configure the terminal's answerback string when it receives ^E.
...
[originally from svn r1031]
2001-04-09 12:43:46 +00:00
Simon Tatham
0d419ab966
The About box now contains a button that starts up a browser pointing
...
at the PuTTY web site. Thanks to Eric Theriault.
[originally from svn r1030]
2001-04-09 12:23:45 +00:00
Simon Tatham
2c39b69a52
Default handling of VT100 line drawing characters in cut and paste is
...
now to translate them into poor man's characters (+--+ and |). We also
have an option to disable this (and map line drawing characters to the
corresponding ASCII code as before). Thanks to Robert de Bath.
[originally from svn r1029]
2001-04-09 11:59:35 +00:00
Simon Tatham
cb9c2e79b9
AES should have accelerator s, not a, to avoid a clash
...
[originally from svn r997]
2001-03-14 11:47:11 +00:00
Simon Tatham
313b332a38
Finally fixed the point/pixel confusion in font handling. Thanks to
...
Roman Surma for pointing me at the relevant bits of documentation. All
font sizes should now be measured in points, and everything should be
consistent, and (with any luck) old Registry settings should adapt
gracefully too.
[originally from svn r992]
2001-03-12 12:24:07 +00:00
Simon Tatham
b182356f99
Support for selecting AES from the GUI. In the process, I've had to
...
introduce another layer of abstraction in SSH2 ciphers, such that a
single `logical cipher' (as desired by a user) can equate to more
than one `physical cipher'. This is because AES comes in several key
lengths (PuTTY will pick the highest supported by the remote end)
and several different SSH2-protocol-level names (aes*-cbc,
rijndael*-cbc, and an unofficial one rijndael-cbc@lysator.liu.se ).
[originally from svn r967]
2001-03-02 13:55:23 +00:00
Simon Tatham
b6255788ca
Jacob's fixes for the Event Log
...
[originally from svn r963]
2001-03-02 09:24:05 +00:00
Simon Tatham
a680cef1b2
Oops, that broke Telnet negotiation display. Fix tabstops in eventlog.
...
[originally from svn r957]
2001-02-27 17:09:04 +00:00
Simon Tatham
0d3ab7306e
Timestamp every line of the Event Log. The primary reason for this
...
(generating detail in bug reports when SSH2 repeat key exchange
failed) is no longer an issue, but it might be useful for other
things. It's a _log_ dammit, and logs should be timestamped.
[originally from svn r956]
2001-02-27 17:02:51 +00:00
Simon Tatham
9b7dbb92cc
Modifications to the new Close On Exit option:
...
- wording change (required a patch to winctrls.c:radioline())
- `only on clean exit' is used when an old-style config says `yes',
on the grounds that it's more generally useful than `always' and
also we want to map the old default to the new default.
[originally from svn r928]
2001-02-05 13:42:33 +00:00
Simon Tatham
4d830f7587
Jacob's patch to improve Close On Exit behaviour
...
[originally from svn r927]
2001-02-05 13:08:18 +00:00
Simon Tatham
0507b7437a
Various bug/warning fixes from Jacob
...
[originally from svn r926]
2001-02-05 13:04:00 +00:00
Simon Tatham
6dc2424db2
Shrink the keepalive-timeout box so the text beside it can all fit in
...
[originally from svn r922]
2001-02-01 14:13:46 +00:00
Simon Tatham
4707d0823e
Avoid mallocing zero bytes in the event log Copy processing, which
...
was apparently a problem for compilers other than Visual C. Thanks
to Roman Pompejus for pointing it out.
[originally from svn r918]
2001-02-01 11:35:15 +00:00
Simon Tatham
0d0c8a5e2e
Jacob's patch to fix all the accelerators. AGAIN.
...
[originally from svn r899]
2001-01-26 09:48:37 +00:00
Simon Tatham
7a79df8fe6
Rethink the whole line discipline architecture. Instead of having
...
multiple switchable line disciplines, we now have a single unified
one which changes its behaviour based on option settings. Each
option setting can be suggested by the back end and/or the terminal
handler, and can be forcibly overridden by the configuration. Local
echo and local line editing are separate, independently switchable,
options.
[originally from svn r895]
2001-01-24 14:08:20 +00:00
Simon Tatham
3082f7e8be
Ahem. The log-file Browse button should set cfg.logfilename and not
...
cfg.keyfile. Next time I copy and paste a huge chunk of code, I
should take more care about it :-/
[originally from svn r893]
2001-01-24 09:29:55 +00:00
Simon Tatham
34af1c4f1a
Roman Pompejus's suggestion: do sensible things with focus when the
...
event log window appears or disappears.
[originally from svn r892]
2001-01-23 17:40:51 +00:00
Simon Tatham
bde2f9ac8a
Roman Pompejus's fix for the TAB-not-working-in-Event-Log bug
...
[originally from svn r891]
2001-01-23 17:37:52 +00:00
Simon Tatham
d58d2cc2bb
When the SSH panel disappears in puttytel, the Tunnels panel should too!
...
[originally from svn r890]
2001-01-23 14:20:04 +00:00
Simon Tatham
5c8e6a5295
Jeremy Sawicki's fix for the multiple-conflicting-accelerators
...
problems: controls are now destroyed and recreated on a panel
switch. In addition, this patch also introduces a better means of
doing the group boxes.
[originally from svn r884]
2001-01-22 17:17:26 +00:00
Simon Tatham
beeaa85fc5
Ability to hide the mouse pointer on a keypress a la Word
...
[originally from svn r883]
2001-01-22 16:38:43 +00:00
Simon Tatham
a9ff0485c0
Add a title to the Tunnels panel
...
[originally from svn r880]
2001-01-22 13:15:52 +00:00
Simon Tatham
c9c214d1e4
Try the blindingly-obvious fix for the hidden-controls-are-still-
...
accessible GUI bug.
[originally from svn r879]
2001-01-22 12:35:16 +00:00
Simon Tatham
4a339ef430
Add X11 forwarding, mainly thanks to Andreas Schultz
...
[originally from svn r878]
2001-01-22 11:34:52 +00:00
Simon Tatham
7edcb497cc
Make sure it's SSH, and not Rlogin, which gets omitted from the
...
PuTTYtel config box. Oops!
[originally from svn r877]
2001-01-20 11:00:07 +00:00
Simon Tatham
ca90be26a8
Experimental Rlogin support, thanks to Delian Delchev. Local flow
...
control is unsupported, and server-to-client comms may fail for want
of working TCP Urgent.
[originally from svn r875]
2001-01-19 10:10:37 +00:00
Simon Tatham
72cdcc611a
Keepalives are now in seconds not minutes
...
[originally from svn r874]
2001-01-19 09:01:50 +00:00
Simon Tatham
d199d419fa
Tidy up that latest checkin. PS_DOTTED is spelled PS_DOT and in any
...
case doesn't really cut it; we have to SetPixel every other one
manually because although PS_ALTERNATE exists it only works under
NT. Meanwhile, IDC_CURSTATIC was already used, for the cursor
_keys_. Duh.
[originally from svn r871]
2001-01-17 17:20:28 +00:00
Simon Tatham
c68959b584
Introduce alternative cursor shapes: underline, vertical line
...
[originally from svn r870]
2001-01-17 16:57:33 +00:00
Simon Tatham
e4532bb582
Enable explicit changing of the window title after session start
...
[originally from svn r852]
2001-01-08 16:28:21 +00:00
Simon Tatham
3a2a06b1fc
Improved session logging courtesy of Roman Pompejus
...
[originally from svn r846]
2001-01-07 18:24:59 +00:00
Simon Tatham
f2b13650c8
`Change Settings' now behaves sensibly w.r.t. window size.
...
[originally from svn r841]
2001-01-07 16:27:48 +00:00
Simon Tatham
5a908bb1d7
Apply `getservbyname' to the Port Number field in case it's
...
non-numeric. Patch due to Christian Biesinger.
[originally from svn r839]
2001-01-07 15:12:20 +00:00
Simon Tatham
93004c40ad
Make the colour list failsafe. Patch due to Robert de Bath
...
[originally from svn r837]
2001-01-07 13:39:31 +00:00
Simon Tatham
d5240d4157
Make memory management uniform: _everything_ now goes through the
...
smalloc() macros and thence to the safemalloc() functions in misc.c.
This should allow me to plug in a debugging allocator and track
memory leaks and segfaults and things.
[originally from svn r818]
2000-12-12 10:33:13 +00:00
Simon Tatham
7a3c5f57b5
Patch from Robert de Bath: blank the saved-session name edit box
...
when loading `Default Settings'.
[originally from svn r806]
2000-11-21 19:00:11 +00:00
Simon Tatham
462063cdc5
Implement Zlib compression, in both SSH1 and SSH2.
...
[originally from svn r792]
2000-11-01 21:34:21 +00:00
Simon Tatham
091acb4e06
Add support for Always On Top. Patch due to Janes "Ender" Brown.
...
[originally from svn r773]
2000-10-27 09:46:04 +00:00
Simon Tatham
fc63ad0046
Gaaah, I might have known. Split combined app cursor / app keypad
...
disablement option into two options so the app cursor keys and app
keypad can be controlled separately. The Pedantic Software Award in
this case goes to the Midnight Commander for its egregious failure
to just use the terminal in Perfectly Normal mode.
[originally from svn r766]
2000-10-25 14:20:47 +00:00
Simon Tatham
9e6dc1faa1
Fix control ID bug causing rogue Appearance title bars in other panels
...
[originally from svn r764]
2000-10-25 08:23:41 +00:00
Simon Tatham
fc9b38ed01
Add configurable option to disable application keypad/cursor keys totally
...
[originally from svn r760]
2000-10-24 13:49:23 +00:00
Simon Tatham
8f7a1e30f7
Remove a rogue diagnostic
...
[originally from svn r758]
2000-10-24 13:39:21 +00:00
Simon Tatham
ea0d42801a
Add the Appearance panel and reorganise things a bit
...
[originally from svn r757]
2000-10-24 13:38:27 +00:00
Simon Tatham
bbbda4110b
Created a shiny new abstraction for the socket handling. Has many
...
advantages:
- protocol modules can call sk_write() without having to worry
about writes blocking, because blocking writes are handled in the
abstraction layer and retried later.
- `Lost connection while sending' is a thing of the past.
- <winsock.h> is no longer needed in most modules, because
"putty.h" doesn't have to declare `SOCKET' variables any more,
only the abstracted `Socket' type.
- select()-equivalent between multiple sockets will now be handled
sensibly, which opens the way for things like SSH port
forwarding.
[originally from svn r744]
2000-10-23 10:32:37 +00:00
Simon Tatham
6eb613e3c4
Three new configurable options:
...
- Robert de Bath's Compose key is now off by default and configurable on
- The ages-old controversy over whether ALT by itself should bring the
System menu up is now controllable by a config option
- You can now independently configure whether scrollback resets on a
keypress _and_ whether it resets on screen activity.
[originally from svn r741]
2000-10-21 16:30:58 +00:00
Simon Tatham
51b05a4438
Rename "Stored Sessions" to "Saved Sessions" for consistency
...
[originally from svn r732]
2000-10-20 15:09:56 +00:00
Simon Tatham
4b08041d42
Some better IDC_* names for the controls on the Colours panel
...
[originally from svn r731]
2000-10-20 15:09:35 +00:00
Simon Tatham
8e7a270f7f
Miscellaneous cleanups and reorgs in preparation for building
...
PuTTYgen. In particular, moved self-managing controls stuff out of
windlg.c into the new and reusable winctrls.c.
[originally from svn r714]
2000-10-18 15:36:32 +00:00
Simon Tatham
e67f143e61
Implement a much more visually appealing, but much more internally
...
grotty, hack to get around Explorer maximising the config box.
[originally from svn r707]
2000-10-12 12:56:33 +00:00
Simon Tatham
3e83d75154
Add a config option to emulate the HMAC bug in commercial SSH v2.3.x
...
and earlier (namely, it uses only 16 bytes of key rather than 20).
[originally from svn r706]
2000-10-12 12:39:44 +00:00
Simon Tatham
421aafb4c0
Stop the SSH panel appearing in PuTTYtel
...
[originally from svn r705]
2000-10-12 09:10:45 +00:00
Simon Tatham
fff1053350
Trivial bug with the function-key radio buttons
...
[originally from svn r699]
2000-10-10 09:17:13 +00:00
Simon Tatham
6b620323e0
Now when a saved session is loaded, its name appears in the
...
IDC_SESSEDIT box, so that clicking Save will save over it. Useful
for people who want to load, modify, and re-save. Special case: this
doesn't apply to Default Settings, because I think people will be
more likely to load DS, modify it, and save under a _different_
name, so it's good not to allow a single mouse click to screw them
up.
[originally from svn r698]
2000-10-10 09:03:20 +00:00
Simon Tatham
ef5965e430
Move initialisation of the saved session box outside init_dlg_ctrls() so
...
that you don't end up with twice as many items after clicking Load
[originally from svn r697]
2000-10-10 08:33:49 +00:00
Simon Tatham
a453e02987
Rename IDC_FUNCTILDE from "VT400" to "ESC[n~" because another VT400 now
...
exists!
[originally from svn r696]
2000-10-10 08:20:26 +00:00
Simon Tatham
7b444de332
Add ISO8859-2 / CP852 translation courtesy of Jaromir Filsak
...
[originally from svn r695]
2000-10-09 16:29:12 +00:00
Simon Tatham
3e7c4813d7
Work around horrifyingly nonportable use of unions in <commctrl.h>
...
[originally from svn r694]
2000-10-09 16:12:51 +00:00
Simon Tatham
ceab40ec49
Abandon the tab control in favour of a tree view
...
[originally from svn r693]
2000-10-09 15:51:14 +00:00
Simon Tatham
fd5588d087
Robert de Bath's big patch:
...
- cope with strange WinSock wrappers not supporting SIOCATMARK
- define yet more terminal compatibility modes
- support UK-ASCII (just like US-ASCII but # is a sterling sign)
- support connection keepalives at a configurable interval
[originally from svn r692]
2000-10-09 12:53:32 +00:00
Simon Tatham
5e71961719
Remove the hierarchical dialog structure
...
[originally from svn r690]
2000-10-09 12:16:27 +00:00
Simon Tatham
82dcef256f
Fix sorting of saved sessions list box so Default Settings is back at
...
the top of the list instead of being filed under D
[originally from svn r686]
2000-10-06 16:19:44 +00:00
Simon Tatham
0129f94d1c
Stop throwing out the Connection panel during midsession reconfig.
...
Instead, only throw out the useless parts of it. See, the new auto-
layout features bear fruit immediately!
[originally from svn r685]
2000-10-06 16:01:09 +00:00
Simon Tatham
b584238186
Create settings.c and move the load/save session code out of
...
windlg.c into it. Allows plink and pscp to no longer link with
windlg.c, meaning they lose some of the sillier stub functions and
also can provide a console-based form of verify_ssh_host_key().
[originally from svn r683]
2000-10-06 13:21:36 +00:00
Simon Tatham
43abfd1783
Move omission of SSH protocol setting in PuTTYtel into windlg.c and
...
remove nosshres.rc accordingly
[originally from svn r682]
2000-10-06 12:43:19 +00:00
Simon Tatham
7b6106d62a
Add a parameter to write_clip() so that windlg.c need not call term_deselect
...
[originally from svn r681]
2000-10-06 12:32:25 +00:00
Simon Tatham
a46e11406e
Mistaken identity in sesssaver() was breaking saved-session edit box
...
[originally from svn r678]
2000-10-06 11:49:40 +00:00
Simon Tatham
8c169b0c6d
Tighten up use of "static" throughout. Module-internal things should NOT
...
be exported willy-nilly. It encourages people to use them.
[originally from svn r677]
2000-10-06 11:42:30 +00:00
Simon Tatham
38a6322cec
Localise control IDs in each dialog procedure, for maintainability
...
[originally from svn r676]
2000-10-06 09:06:33 +00:00
Simon Tatham
0a42aa2090
Add LBS_STANDARD on saved session list box, so you can double-click
...
[originally from svn r675]
2000-10-06 08:10:53 +00:00
Simon Tatham
5d359d9528
Revamp the auto-layout of PuTTY configuration box controls. They are
...
now auto-laid-out at runtime instead of compile time. Byebye
win_res.inp and mkres.c; byebye most of win_res.rc; hello a whole
new load of control-creation functions in windlg.c. Also, now that
we're creating the tab control at runtime, we can check to see if it
succeeded and use an alternative if so. This _should_ enable the
config box to work on Win32s, although at the time of checkin that's
untested.
[originally from svn r673]
2000-10-05 17:19:04 +00:00
Simon Tatham
e9caa5e3b6
Ability to specify a remote command in PuTTY proper
...
[originally from svn r664]
2000-10-02 15:22:41 +00:00
Simon Tatham
7fc8ef792f
Add ability to configure the initial window title
...
[originally from svn r661]
2000-10-02 12:24:58 +00:00
Simon Tatham
bda15976a8
Fix a very old bug nobody ever noticed: multiple About boxes :-)
...
[originally from svn r647]
2000-09-29 08:42:55 +00:00
Simon Tatham
087f33eb71
While we're doing a hostkey reorg, store port numbers as well
...
[originally from svn r643]
2000-09-28 08:37:10 +00:00
Simon Tatham
5b2b3de044
Finish creating the storage.h abstraction and winstore.c implementation
...
[originally from svn r640]
2000-09-27 16:21:52 +00:00
Simon Tatham
aad0a52dfb
Rationalised host key storage. Also started code reorg: persistent-state
...
routines have been moved out into a replaceable module winstore.c.
[originally from svn r639]
2000-09-27 15:21:04 +00:00
Simon Tatham
f80f9d4299
Implement "putty -cleanup"
...
[originally from svn r626]
2000-09-25 15:47:57 +00:00
Simon Tatham
cbdd9b3ac5
Enable copying the Event Log
...
[originally from svn r619]
2000-09-22 14:46:26 +00:00
Simon Tatham
ddbc120725
Make the Event Log scroll down when more things appear on it
...
[originally from svn r618]
2000-09-22 14:24:27 +00:00
Simon Tatham
e70425dda6
Enable better build-time flexibility over which WinSock to include
...
[originally from svn r615]
2000-09-22 13:16:49 +00:00
Simon Tatham
c89ca570fe
Closing the About box now returns focus to the config box, and likewise
...
closing the Licence box returns focus to the About box
[originally from svn r611]
2000-09-22 09:38:35 +00:00
Simon Tatham
c320531909
Saved-session name box now persists over panel switches
...
[originally from svn r610]
2000-09-22 09:35:06 +00:00
Simon Tatham
f8be19a08b
Configuration option for agent forwarding
...
[originally from svn r597]
2000-09-15 11:26:18 +00:00
Simon Tatham
334b79e16c
Add switch to choose SSH v1-versus-v2 protocol preference where both
...
are available
[originally from svn r584]
2000-09-11 09:37:43 +00:00
Simon Tatham
be711d9cd4
plink can now execute a specific command instead of just a shell session
...
[originally from svn r576]
2000-09-08 15:24:19 +00:00
Simon Tatham
d9af8f4b90
RSA key authentication in ssh1 works; SSH2 is nearly there
...
[originally from svn r572]
2000-09-07 16:33:49 +00:00
Simon Tatham
0d5d39064a
Robert de Bath's Big Patch, part 1
...
[originally from svn r516]
2000-07-26 12:13:51 +00:00
Simon Tatham
7a01fd48b6
Make beep optional - thanks to Antal Novak
...
[originally from svn r507]
[this commit reordered to come after creation of 0.49 tag]
2000-06-24 17:00:49 +00:00
Simon Tatham
6d6ab0cc39
Fix subtle problem with scp protocol/port selection
...
[originally from svn r505]
2000-06-23 09:44:15 +00:00
Simon Tatham
5f93b919ac
Environment settings were broken. Fix due to Andros Tantas
...
[originally from svn r465]
2000-04-26 08:07:08 +00:00
Simon Tatham
7d85289621
Patch to RDB's blinking cursor: make it configurable and by default
...
off. It's terribly distracting.
[originally from svn r423]
2000-03-17 10:46:59 +00:00
Simon Tatham
cfc0852580
RDB's patch: thanks to improvements in OEMANSI font mode, it can now
...
be the default
[originally from svn r419]
2000-03-17 10:35:09 +00:00
Simon Tatham
96dbf9c6e6
First stab at the ability to compile puttytel.exe, an SSH-free
...
variant which is patent-safe in the US and legal in France and
Russia. This is a horrible hack in some ways: it's shown up serious
deficiencies in the module boundaries. Needs further work, probably
once the SSH implementations are recombined.
[originally from svn r410]
2000-03-15 15:08:48 +00:00
Simon Tatham
8446532e4a
Cleanups to remove warnings for GNU/mingw32 compilation
...
[originally from svn r325]
1999-11-22 10:07:24 +00:00
Simon Tatham
1c73cba012
Add ISO-8859-2 / Win-1250 char set translation
...
[originally from svn r318]
1999-11-17 10:44:43 +00:00
Simon Tatham
429b6f4a83
Added local-editing line discipline to make raw backend usable
...
[originally from svn r287]
1999-11-09 12:05:34 +00:00
Simon Tatham
f6c63320ea
Changes from executor:
...
- NetHack keypad mode (Shift only works with NumLock off)
- Alt-Space handling (best I could manage; not too bad considering)
- Event Log rather than Telnet Negotiation Log
[originally from svn r284]
1999-11-09 11:10:04 +00:00
Simon Tatham
59e798fc6d
Add TIS authentication option
...
[originally from svn r283]
1999-11-08 17:42:12 +00:00
Simon Tatham
e913e99b40
Oleg Panashchenko's Cyrillic support patch
...
[originally from svn r277]
1999-11-08 11:08:09 +00:00
Simon Tatham
97994b235d
Warn-on-close is now configurable off
...
[originally from svn r273]
1999-11-05 09:50:49 +00:00
Simon Tatham
6693daa636
Mark Baker's raw-TCP back end (untested and experimental as yet)
...
[originally from svn r266]
1999-11-01 16:40:40 +00:00
Owen Dunn
9fc2b746b0
Added saved sessions submenu from system menu.
...
[originally from svn r263]
1999-10-28 16:07:25 +00:00
Simon Tatham
a019c66786
Add the ability to do ssh by default: using -ssh command line option,
...
or by manually adding protocol and port settings to Default Settings in the
Registry, or by compiling with -DSSH_DEFAULT
[originally from svn r260]
1999-10-27 14:28:11 +00:00
Simon Tatham
2d6fcb0a7a
Single-DES encryption, patch courtesy of Murphy Lam
...
[originally from svn r253]
1999-10-25 08:59:40 +00:00
Simon Tatham
2da19fc59d
Silly error in loading Default Settings - reset port but not protocol
...
[originally from svn r247]
1999-10-22 15:47:26 +00:00
Simon Tatham
4e889024e3
Jimen Ching's patches to remove compiler warnings
...
[originally from svn r183]
1999-07-20 13:01:56 +00:00
Simon Tatham
3774094e46
Remove double close of registry key
...
[originally from svn r182]
1999-07-16 08:13:51 +00:00
Simon Tatham
585c14f365
Add encryption selection, and Blowfish as second option
...
[originally from svn r175]
1999-07-06 19:42:57 +00:00
Simon Tatham
cd5c916e25
Improve error handling in registry code
...
[originally from svn r170]
1999-07-05 16:13:31 +00:00
Simon Tatham
ab681763af
Use different window procedures for the About box and the Licence box.
...
Should prevent the version string masking part of the licence text ;-)
[originally from svn r51]
1999-02-20 18:12:47 +00:00
Simon Tatham
485c1f7508
Use SetCapture() to fix the problem with double-clicks on saved sessions
...
carrying throuh to the window below the config box
[originally from svn r37]
1999-02-18 10:39:23 +00:00
Simon Tatham
ee9e246617
Fix various segfaults and heap trashes. Thanks to Andrew Mobbs.
...
[originally from svn r29]
1999-02-09 15:39:08 +00:00
Simon Tatham
3b1389a474
Added automatic version distinguishing code, to differentiate releases
...
from nightly builds from random development builds
[originally from svn r28]
1999-02-09 15:18:34 +00:00
Simon Tatham
e68a529cc9
Add SSH don't-allocate-pty option, and corresponding LF-implies-CR
...
terminal setting
[originally from svn r16]
1999-01-15 11:30:40 +00:00
Simon Tatham
60ab6a5d82
John Sullivan's patches plus more fixes:
...
- Stop using the identifier `environ' as some platforms make it a macro
- Fix silly error box at end of connection in FWHACK mode
- Fix GPF on maximise-then-restore
- Use SetCapture to allow drag-selecting outside the window
- Correctly update window title when iconic and in win_name_always mode
[originally from svn r12]
1999-01-08 13:10:19 +00:00
Simon Tatham
c74130d423
Initial checkin: beta 0.43
...
[originally from svn r11]
1999-01-08 13:02:13 +00:00