2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4c117e43b6..2015c5356cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-14  David Kastrup  <dak@gnu.org>
+
+        * info.el (Info-hide-cookies-node): Before hiding a cookie,
+        check if it already has the `display' property added by
+        `Info-display-images-node', and not put the `invisible' property
+        in this case.
+
 2009-12-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode)
diff --git a/lisp/info.el b/lisp/info.el
index 1bd82efdf2a..0d7686d7585 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1446,7 +1446,8 @@ any double quotes or backslashes must be escaped (\\\",\\\\)."
               "\\(\0[\0-\37][[][^\0]*\0[\0-\37][]]\n?\\)"
               nil t)
         (let* ((start (match-beginning 1)))
-          (if (not (get-text-property start 'invisible))
+          (if (and (not (get-text-property start 'invisible))
+                   (not (get-text-property start 'display)))
               (put-text-property start (point) 'invisible t)))))
     (set-buffer-modified-p nil)))