Mercurial > emacs
comparison lisp/strokes.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Sep 2005 10:20:33 +0000 |
parents | 2d92f5c9d6ae 4d1085b02d64 |
children | c5406394f567 |
comparison
equal
deleted
inserted
replaced
90227:10fe5fadaf89 | 90228:fa0da9b57058 |
---|---|
736 ;; switch to the strokes buffer and | 736 ;; switch to the strokes buffer and |
737 ;; display the stroke as it's being read | 737 ;; display the stroke as it's being read |
738 (save-window-excursion | 738 (save-window-excursion |
739 (set-window-configuration strokes-window-configuration) | 739 (set-window-configuration strokes-window-configuration) |
740 (when prompt | 740 (when prompt |
741 (message prompt) | 741 (message "%s" prompt) |
742 (setq event (read-event)) | 742 (setq event (read-event)) |
743 (or (strokes-button-press-event-p event) | 743 (or (strokes-button-press-event-p event) |
744 (error "You must draw with the mouse"))) | 744 (error "You must draw with the mouse"))) |
745 (unwind-protect | 745 (unwind-protect |
746 (track-mouse | 746 (track-mouse |
767 strokes-character ?\s) | 767 strokes-character ?\s) |
768 (goto-char (point-min)) | 768 (goto-char (point-min)) |
769 (bury-buffer)))) | 769 (bury-buffer)))) |
770 ;; Otherwise, don't use strokes buffer and read stroke silently | 770 ;; Otherwise, don't use strokes buffer and read stroke silently |
771 (when prompt | 771 (when prompt |
772 (message prompt) | 772 (message "%s" prompt) |
773 (setq event (read-event)) | 773 (setq event (read-event)) |
774 (or (strokes-button-press-event-p event) | 774 (or (strokes-button-press-event-p event) |
775 (error "You must draw with the mouse"))) | 775 (error "You must draw with the mouse"))) |
776 (track-mouse | 776 (track-mouse |
777 (or event (setq event (read-event))) | 777 (or event (setq event (read-event))) |
797 (set-window-configuration strokes-window-configuration) | 797 (set-window-configuration strokes-window-configuration) |
798 (let ((pix-locs nil) | 798 (let ((pix-locs nil) |
799 (grid-locs nil)) | 799 (grid-locs nil)) |
800 (if prompt | 800 (if prompt |
801 (while (not (strokes-button-press-event-p event)) | 801 (while (not (strokes-button-press-event-p event)) |
802 (message prompt) | 802 (message "%s" prompt) |
803 (setq event (read-event)))) | 803 (setq event (read-event)))) |
804 (unwind-protect | 804 (unwind-protect |
805 (track-mouse | 805 (track-mouse |
806 (or event (setq event (read-event))) | 806 (or event (setq event (read-event))) |
807 (while (not (and (strokes-button-press-event-p event) | 807 (while (not (and (strokes-button-press-event-p event) |