changeset 106569:d92d9cf06c0d

* 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.
author Juri Linkov <juri@jurta.org>
date Mon, 14 Dec 2009 05:09:08 +0000
parents a54ddff7ac90
children d673a0a0ee2f
files lisp/ChangeLog lisp/info.el
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Dec 14 04:17:00 2009 +0000
+++ b/lisp/ChangeLog	Mon Dec 14 05:09:08 2009 +0000
@@ -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)
--- a/lisp/info.el	Mon Dec 14 04:17:00 2009 +0000
+++ b/lisp/info.el	Mon Dec 14 05:09:08 2009 +0000
@@ -1446,7 +1446,8 @@
 	      "\\(\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)))