From: Stefan Monnier Date: Sat, 19 Jul 2014 01:43:29 +0000 (-0400) Subject: * lisp/rect.el (rectangle--string-preview): Don't assume there X-Git-Tag: emacs-25.0.90~2636^2~2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31ca1841d2e25983fbcc44302ee9eff0b3a1554a;p=emacs.git * 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 ac591963c0f..a468cbfc801 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-19 Stefan Monnier + + * rect.el (rectangle--string-preview): Don't assume there + a non-nil default (bug#17984). + 2014-07-16 Glenn Morris * desktop.el (after-init-hook): Disable startup frame restoration diff --git a/lisp/rect.el b/lisp/rect.el index 4c3aa08d7bd..e536e3e372c 100644 --- 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)))