projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* riece-mini.el (riece-mini-enabled): New flag.
[riece]
/
lisp
/
riece-icon.el
diff --git
a/lisp/riece-icon.el
b/lisp/riece-icon.el
index
0e067f9
..
82ce4e6
100644
(file)
--- a/
lisp/riece-icon.el
+++ b/
lisp/riece-icon.el
@@
-182,7
+182,8
@@
static char * a_xpm[] = {
(defun riece-icon-available-p ()
(if (featurep 'xemacs)
(featurep 'xpm)
(defun riece-icon-available-p ()
(if (featurep 'xemacs)
(featurep 'xpm)
- (image-type-available-p 'xpm)))
+ (if (fboundp 'image-type-available-p)
+ (image-type-available-p 'xpm))))
(eval-and-compile
(if (featurep 'xemacs)
(eval-and-compile
(if (featurep 'xemacs)
@@
-203,6
+204,12
@@
static char * a_xpm[] = {
(eval-and-compile
(if (featurep 'xemacs)
(defun riece-icon-add-image-region (image start end)
(eval-and-compile
(if (featurep 'xemacs)
(defun riece-icon-add-image-region (image start end)
+ (map-extents
+ (lambda (extent ignore)
+ (if (or (extent-property extent 'riece-icon-user-list-extent)
+ (extent-property extent 'riece-icon-user-list-annotation))
+ (delete-extent extent)))
+ (current-buffer) start end)
(let ((extent (make-extent start end))
(annotation (make-annotation image end 'text)))
(set-extent-property extent 'end-open t)
(let ((extent (make-extent start end))
(annotation (make-annotation image end 'text)))
(set-extent-property extent 'end-open t)
@@
-212,7
+219,7
@@
static char * a_xpm[] = {
(set-extent-property annotation
'riece-icon-user-list-extent extent)
(set-extent-property extent
(set-extent-property annotation
'riece-icon-user-list-extent extent)
(set-extent-property extent
- 'riece-icon-user-list-
extent
annotation)))
+ 'riece-icon-user-list-
annotation
annotation)))
(defun riece-icon-add-image-region (image start end)
(let ((inhibit-read-only t)
buffer-read-only)
(defun riece-icon-add-image-region (image start end)
(let ((inhibit-read-only t)
buffer-read-only)