* lisp/rect.el (rectangle--string-preview): Don't assume there

a non-nil default.

Fixes: debbugs:17984

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac591963c0f8100f10d3ac4261077ddad924f4af..a468cbfc801e244629b2ce7f57204390e1c373fd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * rect.el (rectangle--string-preview): Don't assume there
+       a non-nil default (bug#17984).
+
 2014-07-16  Glenn Morris  <rgm@gnu.org>
 
        * desktop.el (after-init-hook): Disable startup frame restoration

diff --git a/lisp/rect.el b/lisp/rect.el
index 4c3aa08d7bda8ffdc353119ddf98b4624f2bbce0..e536e3e372c156e66ce7b460f53061010f4845cd 100644 (file)
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -396,7 +396,7 @@ With a prefix (or a FILL) argument, also fill too short lines."
     (when (equal str "")
       (setq str (or (car-safe minibuffer-default)
                     (if (stringp minibuffer-default) minibuffer-default))))
-    (setq str (propertize str 'face 'region))
+    (when str (setq str (propertize str 'face 'region)))
     (with-selected-window rectangle--string-preview-window
       (unless (or (null rectangle--string-preview-state)
                   (equal str (car rectangle--string-preview-state)))