Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0c32d782
Commit
0c32d782
authored
Aug 31, 2010
by
Katsumi Yamaoka
Browse files
Fix previous merge from Gnus trunk.
parent
c2861968
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
lisp/gnus/gnus-ems.el
lisp/gnus/gnus-ems.el
+7
-9
lisp/gnus/gnus-html.el
lisp/gnus/gnus-html.el
+2
-1
No files found.
lisp/gnus/gnus-ems.el
View file @
0c32d782
...
...
@@ -274,15 +274,13 @@
(
setq
props
(
plist-put
props
:background
(
face-background
face
))))
(
apply
'create-image
file
type
data-p
props
)))
(
defun
gnus-put-image
(
glyph
&optional
string
category
point
)
(
let
((
point
(
or
point
(
point
))))
(
save-excursion
(
goto-char
point
)
(
insert-image
glyph
(
or
string
" "
))
(
put-text-property
point
(
point
)
'gnus-image-category
category
)
(
unless
string
(
put-text-property
(
1-
(
point
))
(
point
)
'gnus-image-text-deletable
t
)))
(
defun
gnus-put-image
(
glyph
&optional
string
category
)
(
let
((
point
(
point
)))
(
insert-image
glyph
(
or
string
" "
))
(
put-text-property
point
(
point
)
'gnus-image-category
category
)
(
unless
string
(
put-text-property
(
1-
(
point
))
(
point
)
'gnus-image-text-deletable
t
))
glyph
))
(
defun
gnus-remove-image
(
image
&optional
category
)
...
...
lisp/gnus/gnus-html.el
View file @
0c32d782
...
...
@@ -172,7 +172,8 @@
(
if
(
and
image
;; Kludge to avoid displaying 30x30 gif images, which
;; seems to be a signal of a broken image.
(
not
(
and
(
eq
(
getf
(
cdr
image
)
:type
)
'gif
)
(
not
(
and
(
listp
image
)
(
eq
(
getf
(
cdr
image
)
:type
)
'gif
)
(
=
(
car
(
image-size
image
t
))
30
)
(
=
(
cdr
(
image-size
image
t
))
30
))))
(
progn
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment