auto upstream

2 files changed, 9 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2e9609451c..cb5118cde40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf-eldef.el (minibuf-eldef-update-minibuffer): Don't mess with
+        the `intangible' property.
+        Suggested by Christopher Schmidt <christopher@ch.ristopher.com>
+
 2012-12-05  Deniz Dogan  <deniz@dogan.se>
 
         * net/rcirc.el (rcirc-urls): Update documentation.
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 950c28b227f..c9e663eedba 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -152,15 +152,11 @@ been set up by `minibuf-eldef-setup-minibuffer'."
               (and (= (point-max) minibuf-eldef-initial-buffer-length)
                    (string-equal (minibuffer-contents-no-properties)
                                  minibuf-eldef-initial-input)))
-    ;; swap state
+    ;; Swap state.
     (setq minibuf-eldef-showing-default-in-prompt
           (not minibuf-eldef-showing-default-in-prompt))
-    (cond (minibuf-eldef-showing-default-in-prompt
-           (overlay-put minibuf-eldef-overlay 'invisible nil)
-           (overlay-put minibuf-eldef-overlay 'intangible nil))
-          (t
-           (overlay-put minibuf-eldef-overlay 'invisible t)
-           (overlay-put minibuf-eldef-overlay 'intangible t)))))
+    (overlay-put minibuf-eldef-overlay 'invisible
+                 (not minibuf-eldef-showing-default-in-prompt))))
 
 
 ;;;###autoload