* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4c117e43b6a29acb2eaef39d7c3e2c82c3225a4..2015c5356cff67ca4e79d1eaa682c444a1dbe112 100644 (file)
--- 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 1bd82efdf2a357b85497603092855237bd49d33c..0d7686d758576d07e804922d91005548025409bf 100644 (file)
--- 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)))