Merge from trunk

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/strokes.el b/lisp/strokes.el
index 9006a41275..feeb8fec94 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1,7 +1,6 @@
 ;;; strokes.el --- control Emacs through mouse strokes
 
-;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2011  Free Software Foundation, Inc.
 
 ;; Author: David Bakhash <[email protected]>
 ;; Maintainer: FSF
@@ -736,6 +735,11 @@ Optional EVENT is acceptable as the starting event of the stroke."
 	  ;; display the stroke as it's being read
 	  (save-window-excursion
 	    (set-window-configuration strokes-window-configuration)
+	    ;; The frame has been resized, so we need to refill the
+	    ;; strokes buffer so that the strokes canvas is the whole
+	    ;; visible buffer.
+	    (unless (> 1 (abs (- (line-end-position) (window-width))))
+	      (strokes-fill-current-buffer-with-whitespace))
 	    (when prompt
 	      (message "%s" prompt)
 	      (setq event (read-event))
@@ -1000,7 +1004,7 @@ If you'd like to create graphical files with strokes, you'll have to
 be running a version of Emacs with XPM support.  You use the binding
 to `strokes-compose-complex-stroke' to start drawing your strokes.
 These are just complex strokes, and thus continue drawing with mouse-1
-or mouse-2 and end with mouse-3.  Then the stroke image gets inserted
+or mouse-2 and   end with mouse-3.  Then the stroke image gets inserted
 into the buffer.  You treat it somewhat like any other character,
 which you can copy, paste, delete, move, etc.  When all is done, you
 may want to send the file, or save it.  This is done with
@@ -1749,5 +1753,4 @@ Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
 (run-hooks 'strokes-load-hook)
 (provide 'strokes)
 
-;; arch-tag: 8377f60e-43fb-467a-bbcd-2774f91f833e
 ;;; strokes.el ends here