annotate lisp/userlock.el @ 4677:8f1ee2d15784

Support full Common Lisp multiple values in C. lisp/ChangeLog 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el : Update this file to support full C-level multiple values. This involves: -- Four new bytecodes, and special compiler functions to compile multiple-value-call, multiple-value-list-internal, values, values-list, and, since it now needs to pass back multiple values and is a special form, throw. -- There's a new compiler variable, byte-compile-checks-on-load, which is a list of forms that are evaluated at the very start of a file, with an error thrown if any of them give nil. -- The header is now inserted *after* compilation, giving a chance for the compilation process to influence what those checks are. There is still a check done before compilation for non-ASCII characters, to try to turn off dynamic docstrings if appopriate, in `byte-compile-maybe-reset-coding'. Space is reserved for checks; comments describing the version of the byte compiler generating the file are inserted if space remains for them. * bytecomp.el (byte-compile-version): Update this, we're a newer version of the byte compiler. * byte-optimize.el (byte-optimize-funcall): Correct a comment. * bytecomp.el (byte-compile-lapcode): Discard the arg with byte-multiple-value-call. * bytecomp.el (byte-compile-checks-and-comments-space): New variable, describe how many octets to reserve for checks at the start of byte-compiled files. * cl-compat.el: Remove the fake multiple-value implementation. Have the functions that use it use the real multiple-value implementation instead. * cl-macs.el (cl-block-wrapper, cl-block-throw): Revise the byte-compile properties of these symbols to work now we've made throw into a special form; keep the byte-compile properties as anonymous lambdas, since we don't have docstrings for them. * cl-macs.el (multiple-value-bind, multiple-value-setq) (multiple-value-list, nth-value): Update these functions to work with the C support for multiple values. * cl-macs.el (values): Modify the setf handler for this to call #'multiple-value-list-internal appropriately. * cl-macs.el (cl-setf-do-store): If the store form is a cons, treat it specially as wrapping the store value. * cl.el (cl-block-wrapper): Make this an alias of #'and, not #'identity, since it needs to pass back multiple values. * cl.el (multiple-value-apply): We no longer support this, mark it obsolete. * lisp-mode.el (eval-interactive-verbose): Remove a useless space in the docstring. * lisp-mode.el (eval-interactive): Update this function and its docstring. It now passes back a list, basically wrapping any eval calls with multiple-value-list. This allows multiple values to be printed by default in *scratch*. * lisp-mode.el (prin1-list-as-multiple-values): New function, printing a list as multiple values in the manner of Bruno Haible's clisp, separating each entry with " ;\n". * lisp-mode.el (eval-last-sexp): Call #'prin1-list-as-multiple-values on the return value of #'eval-interactive. * lisp-mode.el (eval-defun): Call #'prin1-list-as-multiple-values on the return value of #'eval-interactive. * mouse.el (mouse-eval-sexp): Deal with lists corresponding to multiple values from #'eval-interactive. Call #'cl-prettyprint, which is always available, instead of sometimes calling #'pprint and sometimes falling back to prin1. * obsolete.el (obsolete-throw): New function, called from eval.c when #'funcall encounters an attempt to call #'throw (now a special form) as a function. Only needed for compatibility with 21.4 byte-code. man/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * cl.texi (Organization): Remove references to the obsolete multiple-value emulating code. src/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * bytecode.c (enum Opcode /* Byte codes */): Add four new bytecodes, to deal with multiple values. (POP_WITH_MULTIPLE_VALUES): New macro. (POP): Modify this macro to ignore multiple values. (DISCARD_PRESERVING_MULTIPLE_VALUES): New macro. (DISCARD): Modify this macro to ignore multiple values. (TOP_WITH_MULTIPLE_VALUES): New macro. (TOP_ADDRESS): New macro. (TOP): Modify this macro to ignore multiple values. (TOP_LVALUE): New macro. (Bcall): Ignore multiple values where appropriate. (Breturn): Pass back multiple values. (Bdup): Preserve multiple values. Use TOP_LVALUE with most bytecodes that assign anything to anything. (Bbind_multiple_value_limits, Bmultiple_value_call, Bmultiple_value_list_internal, Bthrow): Implement the new bytecodes. (Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop, BRgotoifnonnilelsepop): Discard any multiple values. * callint.c (Fcall_interactively): Ignore multiple values when calling #'eval, in two places. * device-x.c (x_IO_error_handler): * macros.c (pop_kbd_macro_event): * eval.c (Fsignal): * eval.c (flagged_a_squirmer): Call throw_or_bomb_out, not Fthrow, now that the latter is a special form. * eval.c: Make Qthrow, Qobsolete_throw available as symbols. Provide multiple_value_current_limit, multiple-values-limit (the latter as specified by Common Lisp. * eval.c (For): Ignore multiple values when comparing with Qnil, but pass any multiple values back for the last arg. * eval.c (Fand): Ditto. * eval.c (Fif): Ignore multiple values when examining the result of the condition. * eval.c (Fcond): Ignore multiple values when comparing what the clauses give, but pass them back if a clause gave non-nil. * eval.c (Fprog2): Never pass back multiple values. * eval.c (FletX, Flet): Ignore multiple when evaluating what exactly symbols should be bound to. * eval.c (Fwhile): Ignore multiple values when evaluating the test. * eval.c (Fsetq, Fdefvar, Fdefconst): Ignore multiple values. * eval.c (Fthrow): Declare this as a special form; ignore multiple values for TAG, preserve them for VALUE. * eval.c (throw_or_bomb_out): Make this available to other files, now Fthrow is a special form. * eval.c (Feval): Ignore multiple values when calling a compiled function, a non-special-form subr, or a lambda expression. * eval.c (Ffuncall): If we attempt to call #'throw (now a special form) as a function, don't error, call #'obsolete-throw instead. * eval.c (make_multiple_value, multiple_value_aset) (multiple_value_aref, print_multiple_value, mark_multiple_value) (size_multiple_value): Implement the multiple_value type. Add a long comment describing our implementation. * eval.c (bind_multiple_value_limits): New function, used by the bytecode and by #'multiple-value-call, #'multiple-value-list-internal. * eval.c (multiple_value_call): New function, used by the bytecode and #'multiple-value-call. * eval.c (Fmultiple_value_call): New special form. * eval.c (multiple_value_list_internal): New function, used by the byte code and #'multiple-value-list-internal. * eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1): New special forms. * eval.c (Fvalues, Fvalues_list): New Lisp functions. * eval.c (values2): New function, for C code returning multiple values. * eval.c (syms_of_eval): Make our new Lisp functions and symbols available. * eval.c (multiple-values-limit): Make this available to Lisp. * event-msw.c (dde_eval_string): * event-stream.c (execute_help_form): * glade.c (connector): * glyphs-widget.c (glyph_instantiator_to_glyph): * glyphs.c (evaluate_xpm_color_symbols): * gui-x.c (wv_set_evalable_slot, button_item_to_widget_value): * gui.c (gui_item_value, gui_item_display_flush_left): * lread.c (check_if_suppressed): * menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1): * menubar-msw.c (populate_menu_add_item): * print.c (Fwith_output_to_temp_buffer): * symbols.c (Fsetq_default): Ignore multiple values when calling Feval. * symeval.h: Add the header declarations necessary for the multiple-values implementation. * inline.c: #include symeval.h, now that it has some inline functions. * lisp.h: Update Fthrow's declaration. Make throw_or_bomb_out available to all files. * lrecord.h (enum lrecord_type): Add the multiple_value type here.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 16 Aug 2009 20:55:49 +0100
parents 576fb035e263
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 ;;; userlock.el --- handle file access contention between multiple users
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 ;; Copyright (C) 1985, 1986, 1993 Free Software Foundation, inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 ;; Maintainer: FSF
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Keywords: internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 ;;; Synched up with: FSF 19.34.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 ;; This file is autoloaded to handle certain conditions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;; detected by the file-locking code within XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 ;; The two entry points are `ask-user-about-lock' and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;; `ask-user-about-supersession-threat'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 (define-error 'file-locked "File is locked" 'file-error) ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
38 (defun ask-user-about-lock-minibuf (filename other-user)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 (save-window-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 (let (answer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 (while (null answer)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
42 (message "%s is locking %s: action (s, q, p, ?)? " other-user filename)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 (let ((tem (let ((inhibit-quit t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 (cursor-in-echo-area t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 (prog1 (downcase (read-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 (setq quit-flag nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 (if (= tem help-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 (ask-user-about-lock-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 (setq answer (assoc tem '((?s . t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 (?q . yield)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 (?\C-g . yield)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 (?p . nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 (?? . help))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 (cond ((null answer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 (beep)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 (message "Please type q, s, or p; or ? for help")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 (sit-for 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 ((eq (cdr answer) 'help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 (ask-user-about-lock-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 (setq answer nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 ((eq (cdr answer) 'yield)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
62 (signal 'file-locked (list "File is locked" filename other-user)))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 (cdr answer))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 (defun ask-user-about-lock-help ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 (with-output-to-temp-buffer "*Help*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 (princ "It has been detected that you want to modify a file that someone else has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 already started modifying in EMACS.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 You can <s>teal the file; The other user becomes the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 intruder if (s)he ever unmodifies the file and then changes it again.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 You can <p>roceed; you edit at your own (and the other user's) risk.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 You can <q>uit; don't modify this file.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 (set-buffer standard-output)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 (help-mode))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 (define-error 'file-supersession "File changed on disk" 'file-error) ; XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
80 (defun ask-user-about-supersession-threat-minibuf (filename)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 (save-window-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 (let (answer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 (while (null answer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 (message "%s changed on disk; really edit the buffer? (y, n, r or C-h) "
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
85 (file-name-nondirectory filename))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 (let ((tem (downcase (let ((cursor-in-echo-area t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 (read-char)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 (setq answer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 (if (= tem help-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 'help
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 (cdr (assoc tem '((?n . yield)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 (?\C-g . yield)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 (?y . proceed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 (?r . revert)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 (?? . help))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 (cond ((null answer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 (beep)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 (message "Please type y, n or r; or ? for help")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 (sit-for 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 ((eq answer 'help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 (ask-user-about-supersession-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 (setq answer nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 ((eq answer 'revert)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 (revert-buffer nil (not (buffer-modified-p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 ; ask confirmation iff buffer modified
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 (signal 'file-supersession
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
107 (list "File reverted" filename)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 ((eq answer 'yield)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 (signal 'file-supersession
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
110 (list "File changed on disk" filename))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 (message
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 "File on disk now will become a backup file if you save these changes.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 (setq buffer-backed-up nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 (defun ask-user-about-supersession-help ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 (with-output-to-temp-buffer "*Help*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 (princ "You want to modify a buffer whose disk file has changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 since you last read it in or saved it with this buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 If you say `y' to go ahead and modify this buffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 you risk ruining the work of whoever rewrote the file.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 If you say `r' to revert, the contents of the buffer are refreshed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 from the file on disk.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 If you say `n', the change you started to make will be aborted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 Usually, you should type `n' and then `M-x revert-buffer',
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 to get the latest version of the file, then make the change again.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 (set-buffer standard-output)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 (help-mode))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132 ;;; dialog-box versions [XEmacs]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
134 (defun ask-user-about-lock-dbox (filename other-user)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
135 (let ((echo-keystrokes 0))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
136 (make-dialog-box
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
137 'question
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
138 :question (format "%s is locking %s\n
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 It has been detected that you want to modify a file that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 someone else has already started modifying in XEmacs."
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
141 other-user filename)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
142 :buttons
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
143 '(["Steal Lock\n\nThe other user will\nbecome the intruder" steal t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
144 ["Proceed\n\nEdit file at your own\n\(and the other user's) risk"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
145 proceed t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
146 nil
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
147 ["Abort\n\nDon't modify the buffer\n" yield t]))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148 (catch 'aual-done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 (while t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 (let ((event (next-command-event)))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
151 (cond ((and (misc-user-event-p event)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
152 (eq (event-object event) 'proceed))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
153 (throw 'aual-done nil))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
154 ((and (misc-user-event-p event)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
155 (eq (event-object event) 'steal))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 (throw 'aual-done t))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
157 ((and (misc-user-event-p event)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
158 (eq (event-object event) 'yield))
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
159 (signal 'file-locked (list "File is locked" filename other-user)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 ((and (misc-user-event-p event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 (eq (event-object event) 'menu-no-selection-hook))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 (signal 'quit nil))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
163 ;; safety check, so we're not endlessly stuck when no
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
164 ;; dialog box up
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
165 ((not (popup-up-p))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
166 (signal 'quit nil))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 ((button-release-event-p event) ;; don't beep twice
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
169 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170 (beep)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 (message "please answer the dialog box"))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
173 (defun ask-user-about-supersession-threat-dbox (filename)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
174 (let ((echo-keystrokes 0))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
175 (make-dialog-box
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
176 'question
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
177 :question
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
178 (format "File %s has changed on disk
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179 since its buffer was last read in or saved.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
181 Do you really want to edit the buffer? " filename)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
182 :buttons
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
183 '(["Yes\n\nEdit the buffer anyway,\nignoring the disk file"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
184 proceed t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
185 ["No\n\nDon't modify the buffer\n" yield t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
186 nil
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
187 ["No\n\nDon't modify the buffer\nbut revert it" revert t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
188 ))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189 (catch 'auast-done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 (while t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191 (let ((event (next-command-event)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
192 (cond ((and (misc-user-event-p event) (eq (event-object event) 'proceed))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
193 (throw 'auast-done nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 ((and (misc-user-event-p event) (eq (event-object event) 'yield))
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
195 (signal 'file-supersession (list filename)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 ((and (misc-user-event-p event) (eq (event-object event) 'revert))
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
197 (or (equal filename (buffer-file-name))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 (error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199 "ask-user-about-supersession-threat called bogusly"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 (revert-buffer nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 (signal 'file-supersession
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
202 (list filename "(reverted)")))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 ((and (misc-user-event-p event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 (eq (event-object event) 'menu-no-selection-hook))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 (signal 'quit nil))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
206 ;; safety check, so we're not endlessly stuck when no
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
207 ;; dialog box up
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
208 ((not (popup-up-p))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
209 (signal 'quit nil))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 ((button-release-event-p event) ;; don't beep twice
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 (beep)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 (message "please answer the dialog box"))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
217 ;;; top-level
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219 ;;;###autoload
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
220 (defun ask-user-about-lock (filename other-user)
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
221 "Ask user wanting to edit FILENAME, locked by OTHER-USER, what to do.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
222 This function has a choice of three things to do:
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
223 do (signal 'file-locked (list FILENAME OTHER-USER))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
224 to refrain from editing the file
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225 return t (grab the lock on the file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
226 return nil (edit the file even though it is locked).
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
227 You can rewrite it to use any criteria you like to choose which one to do."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
228 (discard-input)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
229 (if (should-use-dialog-box-p)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
230 (ask-user-about-lock-dbox filename other-user)
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
231 (ask-user-about-lock-minibuf filename other-user)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 ;;;###autoload
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
234 (defun ask-user-about-supersession-threat (filename)
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
235 "Ask user who is about to modify an obsolete buffer what to do.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 This function has two choices: it can return, in which case the modification
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
237 of the buffer will proceed, or it can (signal 'file-supersession (FILENAME)),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 in which case the proposed buffer modification will not be made.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
240 You can rewrite this to use any criteria you like to choose which one to do.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241 The buffer in question is current when this function is called."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 (discard-input)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
243 (if (should-use-dialog-box-p)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
244 (ask-user-about-supersession-threat-dbox filename)
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
245 (ask-user-about-supersession-threat-minibuf filename)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 ;;; userlock.el ends here