[Emacs-diffs] /srv/bzr/emacs/trunk r111114: * lisp/minibuf-eldef.el (minibuf-eldef-update-minibuffer): Don't mess with

[Stefan Monnier]

------------------------------------------------------------
revno: 111114
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-12-05 20:39:03 -0500
message:
  * lisp/minibuf-eldef.el (minibuf-eldef-update-minibuffer): Don't mess with
  the `intangible' property.
  Suggested by Christopher Schmidt <address@hidden>
modified:
  lisp/ChangeLog
  lisp/minibuf-eldef.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-05 16:45:37 +0000
+++ b/lisp/ChangeLog    2012-12-06 01:39:03 +0000
@@ -1,3 +1,9 @@
+2012-12-06  Stefan Monnier  <address@hidden>
+
+       * minibuf-eldef.el (minibuf-eldef-update-minibuffer): Don't mess with
+       the `intangible' property.
+       Suggested by Christopher Schmidt <address@hidden>
+
 2012-12-05  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-urls): Update documentation.

=== modified file 'lisp/minibuf-eldef.el'
--- a/lisp/minibuf-eldef.el     2012-11-07 20:43:38 +0000
+++ b/lisp/minibuf-eldef.el     2012-12-06 01:39:03 +0000
@@ -152,15 +152,11 @@
              (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