Mercurial > hg > xemacs-beta
annotate lisp/userlock.el @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | 576fb035e263 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; userlock.el --- handle file access contention between multiple users |
| 2 | |
| 3 ;; Copyright (C) 1985, 1986, 1993 Free Software Foundation, inc. | |
| 4 | |
| 5 ;; Maintainer: FSF | |
| 6 ;; Keywords: internal | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: FSF 19.34. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is autoloaded to handle certain conditions | |
| 30 ;; detected by the file-locking code within XEmacs. | |
| 31 ;; The two entry points are `ask-user-about-lock' and | |
| 32 ;; `ask-user-about-supersession-threat'. | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 36 (define-error 'file-locked "File is locked" 'file-error) ; XEmacs | |
| 37 | |
| 444 | 38 (defun ask-user-about-lock-minibuf (filename other-user) |
| 428 | 39 (save-window-excursion |
| 40 (let (answer) | |
| 41 (while (null answer) | |
| 444 | 42 (message "%s is locking %s: action (s, q, p, ?)? " other-user filename) |
| 428 | 43 (let ((tem (let ((inhibit-quit t) |
| 44 (cursor-in-echo-area t)) | |
| 45 (prog1 (downcase (read-char)) | |
| 46 (setq quit-flag nil))))) | |
| 47 (if (= tem help-char) | |
| 48 (ask-user-about-lock-help) | |
| 49 (setq answer (assoc tem '((?s . t) | |
| 50 (?q . yield) | |
| 51 (?\C-g . yield) | |
| 52 (?p . nil) | |
| 53 (?? . help)))) | |
| 54 (cond ((null answer) | |
| 55 (beep) | |
| 56 (message "Please type q, s, or p; or ? for help") | |
| 57 (sit-for 3)) | |
| 58 ((eq (cdr answer) 'help) | |
| 59 (ask-user-about-lock-help) | |
| 60 (setq answer nil)) | |
| 61 ((eq (cdr answer) 'yield) | |
| 444 | 62 (signal 'file-locked (list "File is locked" filename other-user))))))) |
| 428 | 63 (cdr answer)))) |
| 64 | |
| 65 (defun ask-user-about-lock-help () | |
| 66 (with-output-to-temp-buffer "*Help*" | |
| 67 (princ "It has been detected that you want to modify a file that someone else has | |
| 68 already started modifying in EMACS. | |
| 69 | |
| 70 You can <s>teal the file; The other user becomes the | |
| 71 intruder if (s)he ever unmodifies the file and then changes it again. | |
| 72 You can <p>roceed; you edit at your own (and the other user's) risk. | |
| 73 You can <q>uit; don't modify this file.") | |
| 74 (save-excursion | |
| 75 (set-buffer standard-output) | |
| 76 (help-mode)))) | |
| 77 | |
| 78 (define-error 'file-supersession "File changed on disk" 'file-error) ; XEmacs | |
| 79 | |
| 444 | 80 (defun ask-user-about-supersession-threat-minibuf (filename) |
| 428 | 81 (save-window-excursion |
| 82 (let (answer) | |
| 83 (while (null answer) | |
| 84 (message "%s changed on disk; really edit the buffer? (y, n, r or C-h) " | |
| 444 | 85 (file-name-nondirectory filename)) |
| 428 | 86 (let ((tem (downcase (let ((cursor-in-echo-area t)) |
| 87 (read-char))))) | |
| 88 (setq answer | |
| 89 (if (= tem help-char) | |
| 90 'help | |
| 91 (cdr (assoc tem '((?n . yield) | |
| 92 (?\C-g . yield) | |
| 93 (?y . proceed) | |
| 94 (?r . revert) | |
| 95 (?? . help)))))) | |
| 96 (cond ((null answer) | |
| 97 (beep) | |
| 98 (message "Please type y, n or r; or ? for help") | |
| 99 (sit-for 3)) | |
| 100 ((eq answer 'help) | |
| 101 (ask-user-about-supersession-help) | |
| 102 (setq answer nil)) | |
| 103 ((eq answer 'revert) | |
| 104 (revert-buffer nil (not (buffer-modified-p))) | |
| 105 ; ask confirmation iff buffer modified | |
| 106 (signal 'file-supersession | |
| 444 | 107 (list "File reverted" filename))) |
| 428 | 108 ((eq answer 'yield) |
| 109 (signal 'file-supersession | |
| 444 | 110 (list "File changed on disk" filename)))))) |
| 428 | 111 (message |
| 112 "File on disk now will become a backup file if you save these changes.") | |
| 113 (setq buffer-backed-up nil)))) | |
| 114 | |
| 115 (defun ask-user-about-supersession-help () | |
| 116 (with-output-to-temp-buffer "*Help*" | |
| 117 (princ "You want to modify a buffer whose disk file has changed | |
| 118 since you last read it in or saved it with this buffer. | |
| 119 | |
| 120 If you say `y' to go ahead and modify this buffer, | |
| 121 you risk ruining the work of whoever rewrote the file. | |
| 122 If you say `r' to revert, the contents of the buffer are refreshed | |
| 123 from the file on disk. | |
| 124 If you say `n', the change you started to make will be aborted. | |
| 125 | |
| 126 Usually, you should type `n' and then `M-x revert-buffer', | |
| 127 to get the latest version of the file, then make the change again.") | |
| 128 (save-excursion | |
| 129 (set-buffer standard-output) | |
| 130 (help-mode)))) | |
| 131 | |
| 132 ;;; dialog-box versions [XEmacs] | |
| 133 | |
| 444 | 134 (defun ask-user-about-lock-dbox (filename other-user) |
| 442 | 135 (let ((echo-keystrokes 0)) |
| 136 (make-dialog-box | |
| 137 'question | |
| 138 :question (format "%s is locking %s\n | |
| 428 | 139 It has been detected that you want to modify a file that |
| 140 someone else has already started modifying in XEmacs." | |
| 444 | 141 other-user filename) |
| 442 | 142 :buttons |
| 143 '(["Steal Lock\n\nThe other user will\nbecome the intruder" steal t] | |
| 144 ["Proceed\n\nEdit file at your own\n\(and the other user's) risk" | |
| 145 proceed t] | |
| 146 nil | |
| 147 ["Abort\n\nDon't modify the buffer\n" yield t])) | |
| 428 | 148 (catch 'aual-done |
| 149 (while t | |
| 150 (let ((event (next-command-event))) | |
| 442 | 151 (cond ((and (misc-user-event-p event) |
| 152 (eq (event-object event) 'proceed)) | |
| 428 | 153 (throw 'aual-done nil)) |
| 442 | 154 ((and (misc-user-event-p event) |
| 155 (eq (event-object event) 'steal)) | |
| 428 | 156 (throw 'aual-done t)) |
| 442 | 157 ((and (misc-user-event-p event) |
| 158 (eq (event-object event) 'yield)) | |
| 444 | 159 (signal 'file-locked (list "File is locked" filename other-user))) |
| 428 | 160 ((and (misc-user-event-p event) |
| 161 (eq (event-object event) 'menu-no-selection-hook)) | |
| 162 (signal 'quit nil)) | |
| 442 | 163 ;; safety check, so we're not endlessly stuck when no |
| 164 ;; dialog box up | |
| 165 ((not (popup-up-p)) | |
| 166 (signal 'quit nil)) | |
| 428 | 167 ((button-release-event-p event) ;; don't beep twice |
| 168 nil) | |
| 169 (t | |
| 170 (beep) | |
| 171 (message "please answer the dialog box")))))))) | |
| 172 | |
| 444 | 173 (defun ask-user-about-supersession-threat-dbox (filename) |
| 442 | 174 (let ((echo-keystrokes 0)) |
| 175 (make-dialog-box | |
| 176 'question | |
| 177 :question | |
| 178 (format "File %s has changed on disk | |
| 428 | 179 since its buffer was last read in or saved. |
| 180 | |
| 444 | 181 Do you really want to edit the buffer? " filename) |
| 442 | 182 :buttons |
| 183 '(["Yes\n\nEdit the buffer anyway,\nignoring the disk file" | |
| 184 proceed t] | |
| 185 ["No\n\nDon't modify the buffer\n" yield t] | |
| 186 nil | |
| 187 ["No\n\nDon't modify the buffer\nbut revert it" revert t] | |
| 188 )) | |
| 428 | 189 (catch 'auast-done |
| 190 (while t | |
| 191 (let ((event (next-command-event))) | |
| 192 (cond ((and (misc-user-event-p event) (eq (event-object event) 'proceed)) | |
| 193 (throw 'auast-done nil)) | |
| 194 ((and (misc-user-event-p event) (eq (event-object event) 'yield)) | |
| 444 | 195 (signal 'file-supersession (list filename))) |
| 428 | 196 ((and (misc-user-event-p event) (eq (event-object event) 'revert)) |
| 444 | 197 (or (equal filename (buffer-file-name)) |
| 428 | 198 (error |
| 199 "ask-user-about-supersession-threat called bogusly")) | |
| 200 (revert-buffer nil t) | |
| 201 (signal 'file-supersession | |
| 444 | 202 (list filename "(reverted)"))) |
| 428 | 203 ((and (misc-user-event-p event) |
| 204 (eq (event-object event) 'menu-no-selection-hook)) | |
| 205 (signal 'quit nil)) | |
| 442 | 206 ;; safety check, so we're not endlessly stuck when no |
| 207 ;; dialog box up | |
| 208 ((not (popup-up-p)) | |
| 209 (signal 'quit nil)) | |
| 428 | 210 ((button-release-event-p event) ;; don't beep twice |
| 211 nil) | |
| 212 (t | |
| 213 (beep) | |
| 214 (message "please answer the dialog box")))))))) | |
| 215 | |
| 216 | |
| 217 ;;; top-level | |
| 218 | |
| 219 ;;;###autoload | |
| 444 | 220 (defun ask-user-about-lock (filename other-user) |
| 221 "Ask user wanting to edit FILENAME, locked by OTHER-USER, what to do. | |
| 428 | 222 This function has a choice of three things to do: |
| 444 | 223 do (signal 'file-locked (list FILENAME OTHER-USER)) |
| 428 | 224 to refrain from editing the file |
| 225 return t (grab the lock on the file) | |
| 226 return nil (edit the file even though it is locked). | |
| 444 | 227 You can rewrite it to use any criteria you like to choose which one to do." |
| 428 | 228 (discard-input) |
| 442 | 229 (if (should-use-dialog-box-p) |
| 444 | 230 (ask-user-about-lock-dbox filename other-user) |
| 231 (ask-user-about-lock-minibuf filename other-user))) | |
| 428 | 232 |
| 233 ;;;###autoload | |
| 444 | 234 (defun ask-user-about-supersession-threat (filename) |
| 235 "Ask user who is about to modify an obsolete buffer what to do. | |
| 428 | 236 This function has two choices: it can return, in which case the modification |
| 444 | 237 of the buffer will proceed, or it can (signal 'file-supersession (FILENAME)), |
| 428 | 238 in which case the proposed buffer modification will not be made. |
| 239 | |
| 444 | 240 You can rewrite this to use any criteria you like to choose which one to do. |
| 428 | 241 The buffer in question is current when this function is called." |
| 242 (discard-input) | |
| 442 | 243 (if (should-use-dialog-box-p) |
| 444 | 244 (ask-user-about-supersession-threat-dbox filename) |
| 245 (ask-user-about-supersession-threat-minibuf filename))) | |
| 428 | 246 |
| 247 ;;; userlock.el ends here |