[Emacs-diffs] trunk r117550: * lisp/rect.el (rectangle--string-preview): Don't assume there

[Stefan Monnier]

------------------------------------------------------------
revno: 117550
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17984
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-18 21:43:29 -0400
message:
  * lisp/rect.el (rectangle--string-preview): Don't assume there
  a non-nil default.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/rect.el                   rect.el-20091113204419-o5vbwnq5f7feedwu-83

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-16 17:06:12 +0000
+++ b/lisp/ChangeLog    2014-07-19 01:43:29 +0000
@@ -1,3 +1,8 @@
+2014-07-19  Stefan Monnier  <address@hidden>
+
+       * rect.el (rectangle--string-preview): Don't assume there
+       a non-nil default (bug#17984).
+
 2014-07-16  Glenn Morris  <address@hidden>
 
        * desktop.el (after-init-hook): Disable startup frame restoration

=== modified file 'lisp/rect.el'
--- a/lisp/rect.el      2014-07-09 02:20:21 +0000
+++ b/lisp/rect.el      2014-07-19 01:43:29 +0000
@@ -396,7 +396,7 @@
     (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)))