[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog info.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog info.el |
Date: |
Mon, 14 Dec 2009 05:09:13 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 09/12/14 05:09:12
Modified files:
lisp : ChangeLog info.el
Log message:
* 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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16900&r2=1.16901
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.571&r2=1.572
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16900
retrieving revision 1.16901
diff -u -b -r1.16900 -r1.16901
--- ChangeLog 14 Dec 2009 04:17:00 -0000 1.16900
+++ ChangeLog 14 Dec 2009 05:09:08 -0000 1.16901
@@ -1,3 +1,10 @@
+2009-12-14 David Kastrup <address@hidden>
+
+ * 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 <address@hidden>
* cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode)
Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -b -r1.571 -r1.572
--- info.el 5 Dec 2009 19:49:51 -0000 1.571
+++ info.el 14 Dec 2009 05:09:12 -0000 1.572
@@ -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)))