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
86f5c034
Commit
86f5c034
authored
Feb 24, 2010
by
Stefan Monnier
Browse files
(gnus-treat-display-x-face): Protect against errors (bug#5299).
parent
f95a5fd0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog
+5
-0
lisp/gnus/gnus-art.el
lisp/gnus/gnus-art.el
+6
-2
No files found.
lisp/gnus/ChangeLog
View file @
86f5c034
2010-02-24 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-art.el (gnus-treat-display-x-face): Don't burp if
shell-command-to-string signals an error (bug#5299).
2010-02-24 Glenn Morris <rgm@gnu.org>
* message.el (message-smtpmail-send-it)
...
...
lisp/gnus/gnus-art.el
View file @
86f5c034
...
...
@@ -1422,8 +1422,12 @@ predicate. See Info node `(gnus)Customizing Articles'."
(gnus-image-type-available-p 'xbm)
(if (featurep 'xemacs)
(featurep 'xface)
(and (string-match "^0x" (shell-command-to-string "uncompface"))
(executable-find "icontopbm")))
(condition-case nil
(and (string-match "^0x" (shell-command-to-string "uncompface"))
(executable-find "icontopbm"))
;; shell-command-to-string may signal an error, e.g. if
;; shell-file-name is not found.
(error nil)))
'head)
"Display X-Face headers.
Valid values are nil and `head'.
...
...
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