aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text/e-entry.c
Commit message (Collapse)AuthorAgeFilesLines
* bumped up to 0.10.99.3jacob berkman2001-08-101-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-08-09 jacob berkman <jacob@ximian.com> * configure.in: bumped up to 0.10.99.3 * gal/e-text/e-completion-view.c (e_completion_view_init): init matches array (e_completion_view_destroy): free matches array (e_completion_view_disconnect): disconnect from the clear and lost_match signals (e_completion_view_clear_choices): fixup for ptr array (e_completion_view_set_cursor_row): ditto (e_completion_view_select): ditto (e_completion_view_key_press_handler): ditto (clear_completion_cb): handle the clear signal (lost_completion_cb): remove a row from the model (table_row_count): fixup for ptr array (table_value_at): ditto (e_completion_view_construct): connect to clear and lost completion signals (e_completion_view_set_width): ptr array fixup again * gal/e-text/e-completion.c (e_completion_class_init): add new clean / lost completion signals (e_completion_init): initialize the matches array (e_completion_destroy): free the matches array (e_completion_add_match): fixup for matches being a GPtrArray (e_completion_clear_matches): ditto (e_completion_clear): new function to clear the list of matches (e_completion_foreach_match): fixup for ptrarray (e_completion_restart): ditto (e_completion_found_match): if we are at the limit return first, rather than adding and then unreffing. there very well could be some weird crashes this caused but it is kind of unlikely. (e_completion_lost_match): new function to forget about a match (e_completion_end_search): add a comment on why this is broken * gal/e-text/e-entry.c (e_entry_text_keypress): only start a delayed completion if our completion timeout is >= 0. this provides a way for the completion starting / stopping to be controlled by something other than the EEntry (ie, file-sel) svn path=/trunk/; revision=11843
* Bumped version up to 0.10.99.2.Jon Trowbridge2001-08-091-25/+65
| | | | | | | | | | | | | | | | | | | | | | 2001-08-09 Jon Trowbridge <trow@ximian.com> * configure.in: Bumped version up to 0.10.99.2. * gal/e-text/e-entry.c (e_entry_class_init): Added "completion_popup" signal. (e_entry_show_popup): Emit "completion_popup" signal if the popup has appeared or disappeared. (e_entry_enable_completion_full): Listen for "cancel_completion" signals from our model, and disable our completion if get one. (e_entry_completion_popup_is_visible): Added. Returns TRUE if the completion popup is on the screen. * gal/e-text/e-text-model.c (e_text_model_class_init): Added "cancel_completion" signal. (e_text_model_cancel_completion): Added. Emits "cancel_completion" signal. svn path=/trunk/; revision=11824
* Quintuple sigh. See below.Federico Mena Quintero2001-08-091-0/+3
| | | | | | | | | | 2001-08-09 Federico Mena Quintero <federico@ximian.com> * gal/e-text/e-entry.c (e_entry_destroy): Quintuple sigh. See below. * gal/util/e-bit-array.c (eba_destroy): Sextuple sigh. svn path=/trunk/; revision=11815
* Change window policy to allow the completion window to shrink when theJon Trowbridge2001-07-211-1/+1
| | | | | | | | | | | | | 2001-07-20 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_enable_completion_full): Change window policy to allow the completion window to shrink when the number of options decreases. * gal/e-text/e-completion-view.c (e_completion_view_construct): Removed some obsolete code. svn path=/trunk/; revision=11292
* we can ignore the border, as e-text takes care of that for usjacob berkman2001-06-071-22/+13
| | | | | | | | | | | | | | 2001-06-07 jacob berkman <jacob@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate): we can ignore the border, as e-text takes care of that for us (canvas_size_request): correctly handle when borders should be drawn * gal/e-text/e-completion-view.c (e_completion_view_paint): fix a small bug in the drawing-2-pixel-border change to my patch svn path=/trunk/; revision=10149
* Applied patch from Jacob Berkman to un-offset the completion popup and addJon Trowbridge2001-06-071-2/+8
| | | | | | | | | | | | 2001-06-06 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c: * gal/e-text/e-completion-view.c: Applied patch from Jacob Berkman to un-offset the completion popup and add a border around it. I tweaked it slightly to make the border two pixels thick instead of one. (Which I like, but might annoy everyone else. We'll see.) svn path=/trunk/; revision=10133
* Small changes throughout to use ECompletionMatch.Jon Trowbridge2001-06-061-8/+8
| | | | | | | | | | | | | | | | | | | | 2001-06-05 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-entry.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion-view.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion-match.h: * gal/e-text/e-completion-match.c: Added. A struct to contain completion matches. This lets us more easily pass around information between the various bits of completion machinery. svn path=/trunk/; revision=10118
* set allow_newlines on the etext item to false, since we are like an entryjacob berkman2001-06-011-0/+1
| | | | | | | | | 2001-05-31 jacob berkman <jacob@ximian.com> * gal/e-text/e-entry.c (e_entry_init): set allow_newlines on the etext item to false, since we are like an entry svn path=/trunk/; revision=10061
* Request an update if just our line widths needed recalculation. This fixesFederico Mena Quintero2001-05-081-1/+1
| | | | | | | | | | | 2001-05-07 Federico Mena Quintero <federico@ximian.com> * gal/e-text/e-text.c (e_text_reflow): Request an update if just our line widths needed recalculation. This fixes the bug where the text item would not repaint itself if the canvas lost the focus. svn path=/trunk/; revision=9705
* Limit total matches, for better performance on slow machines. It isJon Trowbridge2001-04-201-12/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-04-20 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-test.c: Limit total matches, for better performance on slow machines. It is supposed to be a test, so correctness of the completion operations isn't really a priority... * gal/e-text/e-completion-view.c (e_completion_view_construct): Set GTK_CAN_FOCUS flag. * gal/e-text/e-entry.c (e_entry_show_popup): Evil! Evil! Unclean! Unclean! Manually check if the pointer is in the area where the popup is going to appear, and if it is, warp the pointer out of the way. After days of fucking around, this horrible hack is the only way that I've been able to figure out to keep the focus from being taken away from the entry and ending up somewhere strange when the popup pops up. (The main problem is with the case of focus-follows-cursor --- click-to-focus works fine. Sawfish idiocincracies may also be causing problems, but I don't want to unjustly accuse the WM of anything, as tempting and appealing as that can be.) (key_press_cb): Proxy for forwarding the popup's key press events to the entry. (key_release_cb): Proxy for forwarding the popup's key release events to the entry. These proxies should be enough to take care of my focus problems. Unfortunately, they aren't, and the pointer-warping-focus-horror is required for reasons that I don't fully understand. * gal/e-text/e-text.c (_get_xy_from_position): Made _get_xy_from_position return a boolean. It returns TRUE if the computation was successful (and if valid data is now in *xp and *yp), FALSE otherwise. Make sure that text->lines is not NULL, and return FALSE if it is. (_get_position): Test that _get_xy_from_position returns TRUE before using the values in x and y. (_get_position): Test that _get_xy_from_position returns TRUE before using the values in x and y. Garbage values being returned in passed-in pointers created a race condition where you could hang an EText if you deleted the entire contents of the buffer really quickly. svn path=/trunk/; revision=9468
* Fix headers. Ditto. Ditto. Ditto. Ditto. Ditto. Ditto. Same. Ditto. SameKjartan Maraas2001-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-04-04 Kjartan Maraas <kmaraas@gnome.org> * gal/e-text/e-entry.c: Fix headers. * gal/e-text/e-table-text-model.[ch]: Ditto. * gal/e-text/e-table-text-model-uri.c: Ditto. * gal/e-text/e-text-model-uri.[ch]: Ditto. * gal/e-text/e-text-model.[ch]: Ditto. * gal/e-text/e-text.[ch]: Ditto. * gal/util/e-text-event-processor-emacs-like.[ch]: Ditto. * gal/util/e-text-event-processor.[ch]: Same. * gal/util/e-util.h: Ditto. * gal/util/e-xml-utils.[ch]: Same here. * gal/widgets/color-group.[ch]: Ditto. * gal/widgets/color-palette.[ch]: Ditto. * gal/widgets/e-canvas-utils.h: Ditto. * gal/widgets/e-canvas-vbox.[ch]: Ditto. * gal/widgets/e-canvas.[ch]: Ditto. * gal/widgets/e-categories.h: Ditto. * gal/widgets/e-colors.[ch]: Ditto. * gal/widgets/e-cursors.c: Ditto. * gal/widgets/e-gui-utils.c: Ditto * gal/widgets/e-popup-menu.[ch]: Same. * gal/widgets/e-reflow-sorted.c: Same. * gal/widgets/e-reflow.[ch]: Same. * gal/widgets/e-selection-model.c: Same * gal/widgets/e-unicode.[ch]: Same. * gal/widgets/gtk-combo-stack.[ch]: Same. * gal/widgets/widget-color-combo.[ch]: Same. * gal/widgets/widget-pixmap-combo.[ch]: Same. svn path=/trunk/; revision=9168
* Set the size of the thing to a decent value that lets us test stuff.Miguel de Icaza2001-03-191-58/+62
| | | | | | | | | | | | | | 2001-03-18 Miguel de Icaza <miguel@ximian.com> * tests/test-tree-1.c (create_tree): Set the size of the thing to a decent value that lets us test stuff. 2001-03-16 Miguel de Icaza <miguel@ximian.com> * gal/e-text/e-entry.h: Expose the canvas/item that used to be public and that were privatized. svn path=/trunk/; revision=8802
* Added. This is part of a change of sematics that makes things much nicerJon Trowbridge2001-03-061-10/+49
| | | | | | | | | | | | | | | | | | | | | | | 2001-03-06 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-entry.c (e_entry_text_keypress): Added. This is part of a change of sematics that makes things much nicer for the user --- auto-activate the completion popup only on keypresses than also change the entry. (e_entry_proxy_changed): Record that the underlying EText has changed, and set up a timeout to clear the changed_since_keypress flag in a very short amount of time. (e_entry_init): Connect to the EText's "keypress" signal". (e_entry_destroy): If our completion_delay_tag timeout is still floating around out there when we are winding things down, remove it. * gal/e-text/e-text.c (e_text_class_init): Added keypress signal. (e_text_text_model_reposition): Removed some old cruft. (e_text_event): Emit our keypress signal after handling events of type GDK_KEY_PRESS. svn path=/trunk/; revision=8566
* Set version number to 0.5.99.5Jon Trowbridge2001-03-061-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-03-05 Jon Trowbridge <trow@gnu.org> * configure.in: Set version number to 0.5.99.5 * gal/e-text/e-entry.c (e_entry_class_init): Add a "popup" signal. If you have trepidations about this, see the technical argument below. (e_entry_init): Connect to the EText's popup signal. (e_entry_proxy_popup): Proxy emitter for popup signals from the EText. * gal/e-text/e-text.c (e_text_class_init): Added a "popup" signal. (e_text_event): Emit the "popup" signal on right-clicks. Now you could ask yourself: "should there be a signal named 'popup' in EText that gets emitted on right-clicks?" And this is a reasonable question, since... well, this has a funny feeling to it. But the whole point of GNOME, or at least one of the original points of GNOME, was to impose policy in a reasonable way when it made sense in order to simplify the user's experience. Convention dictates that popup menus are tied to right-clicks --- so rather than setting up some elaborate forwarding of button-press signals, why not just impose a little policy and set up a signal that is closely tied to a familiar set of semantics? Maybe it isn't the best thing to do from a aesthetics-of-the-API point of view, but I doubt anyone could condemn it as being anything more than mostly harmless. svn path=/trunk/; revision=8565
* Boost version number to 0.5.99.3.Jon Trowbridge2001-03-021-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-03-01 Jon Trowbridge <trow@ximian.com> * configure.in: Boost version number to 0.5.99.3. * gal/e-text/e-entry.c (e_entry_show_popup): Grab pointer when the popup is visible, and then hide the popup if any button press events occur outside of the popup. This lets up avoid most of the worst "floating popup" cases that would occur if windows are moved, desktops changed, etc. with the mouse. (Doing things like changing desktop w/ keybindings can still cause a "floating popup", but that is also true of Gtk's own combo box.) Change popup positioning to slightly offset it from the entry, rather than just plopping it down directly below. (button_press_cb): Determine if a button press occured outside of the popup when the pointer was grabbed, and unbrowse accordingly. * gal/e-text/e-completion-view.c (e_completion_view_key_press_handler): Improve keystroke handling. Allow Tabs to pass through (after hiding the pop-up) in order to allow focus change requests to work properly. (e_completion_view_construct): Disable horizontal scrollbars. * gal/e-text/e-completion-test.c (main): Reworked to use signals instead of explicit callbacks. * gal/e-text/e-completion.h: * gal/e-text/e-completion.c: Fix the awkward mix of signals and explicitly-specified callbacks by taking out the explicit callbacks. This approach is more gtk-ish, after all. svn path=/trunk/; revision=8458
* Fixed. (e_entry_select_region): Fixed. (e_entry_show_popup): Grab/ungrabJon Trowbridge2001-02-241-4/+40
| | | | | | | | | | | | | | | | | | | 2001-02-23 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_set_position): Fixed. (e_entry_select_region): Fixed. (e_entry_show_popup): Grab/ungrab the pointer and keyboard when the popup appears/disappears. This (mostly) solves the "floating popup" problem. (button_press_cb): Added. We catch button presses outside of the popup, and hide the popup when they occur. * gal/e-text/e-completion-view.c (e_completion_view_get_type, e_completion_view_class_init): Changed base class to GtkEventBox. (e_completion_view_key_press_handler): Make Escape always cause an unbrowse, even wehen we are editting. svn path=/trunk/; revision=8369
* Added. Allows you to attach an ECompletion to an EEntry, and have thatJon Trowbridge2001-02-201-92/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-02-19 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_enable_completion_full): Added. Allows you to attach an ECompletion to an EEntry, and have that ECompletion be used for (obviously enough) completions. * gal/e-text/e-completion-view.h, gal/e-text/e-completion-view.c: Added. ECompletionView is a widget for displaying the results of a completion request in a format that is appropriate for a drop-down window. * gal/e-text/e-completion.h, gal/e-text/e-completion.c: Added. ECompletion is a "pure virtual base class" for completion-type operations. It is implemented so that completions can be either synchronous or asynchronous. * gal/e-text/e-text.c: Lots of changes to accomodate the ETextModel changes. First of all, we render embedded text objects as being underlined. We also cause the model to emit the appropriate object activation signal when an embedded object is double-clicked. Also, all of the code that moves the cursor in response to user input has been removed. Instead, the EText now listens for "reposition" events from the underlying model, and bases all cursor motions on those. (get_bounds_item_relative): Fixed bug in the handling of differently-anchored text. Being differently-anchored is not a crime or a perversion --- it is an alternative lifestyle that we have to respect. * gal/e-text/e-text-model-uri.h, gal/e-text/e-text-model-uri.c: A sample ETextModel that converts URIs into embedded objects that get opened in the browser when you double-click them. * gal/e-text/e-text-model-repos.h, gal/e-text/e-text-model-repos.c: Added. A group of simple structures & functions for handling various cursor movement rules. These are the sorts of things that are passed as arguments to ETextModel "reposition" event handlers. * gal/e-text/e-text-model.h, gal/e-text/e-text-model.c: Privitized the ETextModel struct and "methodized" all of the operations, so that derived classes can do arbitrarily respond to get/set requests in arbitrarily strange ways. Also added the concept of declaring regions of the text as "embedded text objects". Finally, caused operations that change the text to emit a "reposition" signal that passes information that can be used by a view (like an EText) to move the cursor or selection in an intelligent way in response to those changes. This means that you can now open two ETexts that look at the same ETextModel, and have the cursor in one do the right thing when you edit the other. (As opposed to producing a lot of potential segfaults, as it was before.) svn path=/trunk/; revision=8280
* Fixed allocation and placement of text for no bordered text.Christopher James Lahey2001-01-311-16/+33
| | | | | | | | | 2001-01-30 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Fixed allocation and placement of text for no bordered text. svn path=/trunk/; revision=7922
* Fixed allocation and placement of text window.Christopher James Lahey2001-01-311-9/+8
| | | | | | | | | | | 2001-01-30 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Fixed allocation and placement of text window. * gal/e-text/e-text.c (e_text_draw): Fixed display of the text. svn path=/trunk/; revision=7920
* Fixed text misplacement.Christopher James Lahey2001-01-191-10/+12
| | | | | | | | 2001-01-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Fixed text misplacement. svn path=/trunk/; revision=7632
* Center text vertically.Christopher James Lahey2001-01-181-10/+13
| | | | | | | | | 2001-01-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Center text vertically. svn path=/trunk/; revision=7619
* Made EEntry be shrinkable.Christopher James Lahey2001-01-181-3/+6
| | | | | | | | 2001-01-17 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c (e_entry_init): Made EEntry be shrinkable. svn path=/trunk/; revision=7604
* Make justification work properly for entries. Documented.Christopher James Lahey2001-01-181-2/+49
| | | | | | | | | 2001-01-17 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c, gal/e-text/e-entry.h (et_set_arg): Make justification work properly for entries. Documented. svn path=/trunk/; revision=7603
* Add support here for "cursor_pos". (et_get_arg): Handle ARG_CURSOR_POS.Miguel de Icaza2000-12-291-4/+16
| | | | | | | | | | | | | | | 2000-12-29 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-entry.c: Add support here for "cursor_pos". (et_get_arg): Handle ARG_CURSOR_POS. (et_set_arg): ditto. * gal/e-text/e-text.c: Add new argument: "cursor_pos". (e_text_get_arg): Handle ARG_CURSOR_POS. (e_text_set_arg): Handle ARG_CURSOR_POS. (e_text_class_init): Add. svn path=/trunk/; revision=7192
* Added a "draw_background" argument. Set the default for theChristopher James Lahey2000-12-271-1/+18
| | | | | | | | | | | | | 2000-12-26 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Added a "draw_background" argument. Set the default for the "draw_background" argument to the contained EText to TRUE. * gal/e-text/e-text.c: Changed the default for the "draw_background" argument to FALSE. svn path=/trunk/; revision=7176
* Connect to the "changed" and "activate" signals on the EText to the proxyMiguel de Icaza2000-12-261-0/+22
| | | | | | | | | | | 2000-12-26 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-entry.c: Connect to the "changed" and "activate" signals on the EText to the proxy routines. (e_entry_proxy_changed): Proxy this to our signals. (e_entry_proxy_activate): ditto. svn path=/trunk/; revision=7173
* Always have some text. Fixes crash.Miguel de Icaza2000-12-261-1/+0
| | | | | | | | | | 2000-12-25 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_init): Always have some text. Fixes crash. * gal/widgets/e-reflow.c (set_empty): Set draw_background to FALSE. svn path=/trunk/; revision=7172
* Always have some text. Fixes crash.Miguel de Icaza2000-12-261-2/+2
| | | | | | | | 2000-12-25 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_init): Always have some text. Fixes crash. svn path=/trunk/; revision=7171
* Handle draw background. (e_text_draw): Support both border drawing andMiguel de Icaza2000-12-251-37/+70
| | | | | | | | | | | | | 2000-12-24 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_set_arg): Handle draw background. (e_text_draw): Support both border drawing and background drawing. * gal/e-text/e-entry.c (et_get_arg, et_set_arg): Reduce code size by casting once. (et_set_arg, et_get_arg): Add ARG_DRAW_BORDERS handling. svn path=/trunk/; revision=7159
* Added an "allow_newlines" argument.Christopher James Lahey2000-10-271-2/+14
| | | | | | | | | | | | | 2000-10-27 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c, gal/e-text/e-text-event-processor-emacs-like.c, gal/e-text/e-text-event-processor-emacs-like.h, gal/e-text/e-text-event-processor.c, gal/e-text/e-text-event-processor.h, gal/e-text/e-text.c: Added an "allow_newlines" argument. svn path=/trunk/; revision=6226
* Made EEntry accept focus properly.Christopher James Lahey2000-10-191-0/+11
| | | | | | | | 2000-10-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Made EEntry accept focus properly. svn path=/trunk/; revision=6015
* Moved files, fixed header files and paths - FedericoFederico Mena Quintero2000-09-201-3/+3
| | | | svn path=/trunk/; revision=5513
* Changed #include lines to get e-text to compile.Chris Lahey2000-09-181-3/+3
| | | | svn path=/trunk/; revision=5481
* Removed some border padding and set the "draw_borders" argument of theChristopher James Lahey2000-07-091-7/+4
| | | | | | | | | | | | | 2000-07-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Removed some border padding and set the "draw_borders" argument of the contained GtkText. * widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a "draw_borders" argument which, if set, makes the EText look more like a GtkEntry. svn path=/trunk/; revision=4011
* Set "anchor" and "fill_clip_rectangle" arguments.Christopher James Lahey2000-07-081-0/+2
| | | | | | | | | | | | | 2000-07-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle" arguments. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added "fill_clip_rectangle" argument which describes whether to accept clicks throughout the clipping rectangle. svn path=/trunk/; revision=3956
* Fixed some typos.Christopher James Lahey2000-07-081-9/+5
| | | | | | | | 2000-07-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Fixed some typos. svn path=/trunk/; revision=3949
* Added e-entry.c and e-entry.h.Christopher James Lahey2000-07-041-0/+413
2000-07-03 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h. * widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to be a widget containing a text item. * widgets/e-text/e-text.c: Fixed some spacing. svn path=/trunk/; revision=3874