- ((and (misc-user-event-p event) (eq (event-object event) 'yield))
- (signal 'file-locked (list "File is locked" fn opponent)))
+ ((and (misc-user-event-p event)
+ (eq (event-object event) 'yield))
+ (signal 'file-locked (list "File is locked" filename other-user)))
+ ((and (misc-user-event-p event)
+ (eq (event-object event) 'menu-no-selection-hook))
+ (signal 'quit nil))
+ ;; safety check, so we're not endlessly stuck when no
+ ;; dialog box up
+ ((not (popup-up-p))
+ (signal 'quit nil))