HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Gnus trunk.
[bpt/emacs.git]
/
lisp
/
gnus
/
gnus-ems.el
diff --git
a/lisp/gnus/gnus-ems.el
b/lisp/gnus/gnus-ems.el
index
7b3f3d8
..
e1e37eb
100644
(file)
--- a/
lisp/gnus/gnus-ems.el
+++ b/
lisp/gnus/gnus-ems.el
@@
-277,7
+277,7
@@
(defun gnus-put-image (glyph &optional string category)
(let ((point (point)))
(defun gnus-put-image (glyph &optional string category)
(let ((point (point)))
- (insert-image glyph (or string "
"))
+ (insert-image glyph (or string "
*
"))
(put-text-property point (point) 'gnus-image-category category)
(unless string
(put-text-property (1- (point)) (point)
(put-text-property point (point) 'gnus-image-category category)
(unless string
(put-text-property (1- (point)) (point)
@@
-307,6
+307,12
@@
end nil))))))
(eval-and-compile
end nil))))))
(eval-and-compile
+ ;; XEmacs does not have window-inside-pixel-edges
+ (defalias 'gnus-window-inside-pixel-edges
+ (if (fboundp 'window-inside-pixel-edges)
+ 'window-inside-pixel-edges
+ 'window-pixel-edges))
+
(if (fboundp 'set-process-plist)
(progn
(defalias 'gnus-set-process-plist 'set-process-plist)
(if (fboundp 'set-process-plist)
(progn
(defalias 'gnus-set-process-plist 'set-process-plist)