diff options
| author | Juri Linkov | 2009-12-14 05:09:08 +0000 |
|---|---|---|
| committer | Juri Linkov | 2009-12-14 05:09:08 +0000 |
| commit | d3de1c8e9c8646d1c8bb4905f55147b444b98fe6 (patch) | |
| tree | d36620e3447c26545182126a3349bb55224aeeda | |
| parent | f192624c76d391df6401fc49bccfe785b0c3fe59 (diff) | |
| download | emacs-d3de1c8e9c8646d1c8bb4905f55147b444b98fe6.tar.gz emacs-d3de1c8e9c8646d1c8bb4905f55147b444b98fe6.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/info.el | 3 |
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 @@ | |||
| 1 | 2009-12-14 David Kastrup <dak@gnu.org> | ||
| 2 | |||
| 3 | * info.el (Info-hide-cookies-node): Before hiding a cookie, | ||
| 4 | check if it already has the `display' property added by | ||
| 5 | `Info-display-images-node', and not put the `invisible' property | ||
| 6 | in this case. | ||
| 7 | |||
| 1 | 2009-12-14 Chong Yidong <cyd@stupidchicken.com> | 8 | 2009-12-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 3 | * cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode) | 10 | * 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 (\\\",\\\\)." | |||
| 1446 | "\\(\0[\0-\37][[][^\0]*\0[\0-\37][]]\n?\\)" | 1446 | "\\(\0[\0-\37][[][^\0]*\0[\0-\37][]]\n?\\)" |
| 1447 | nil t) | 1447 | nil t) |
| 1448 | (let* ((start (match-beginning 1))) | 1448 | (let* ((start (match-beginning 1))) |
| 1449 | (if (not (get-text-property start 'invisible)) | 1449 | (if (and (not (get-text-property start 'invisible)) |
| 1450 | (not (get-text-property start 'display))) | ||
| 1450 | (put-text-property start (point) 'invisible t))))) | 1451 | (put-text-property start (point) 'invisible t))))) |
| 1451 | (set-buffer-modified-p nil))) | 1452 | (set-buffer-modified-p nil))) |
| 1452 | 1453 | ||