From 256fdbaa9d56b75154364c2faf6a94441ea4993e Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Fri, 17 Sep 2010 06:23:30 +0000 Subject: [PATCH] gnus-html.el: Replace process-kill-without-query by gnus-set-process-query-on-exit-flag. --- lisp/ChangeLog | 10 ++++++++++ lisp/dgnushack.el | 7 ++++--- lisp/gnus-html.el | 4 ++-- lisp/lpath.el | 4 ---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a04b88df2..82aaed87c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2010-09-17 Katsumi Yamaoka + + * dgnushack.el (dgnushack-compile): Add comment. + + * lpath.el: No need to fbind propertize for XEmacs 21.4. + + * gnus-html.el (gnus-html-schedule-image-fetching) + (gnus-html-prefetch-images): Replace process-kill-without-query by + gnus-set-process-query-on-exit-flag. + 2010-09-16 Romain Francoise * gnus-html.el: Require gnus-art for `gnus-with-article-buffer'. diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index a008d1165..8252fb119 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -308,15 +308,14 @@ dgnushack-compile." (unless warn (setq byte-compile-warnings '(free-vars unresolved callargs redefine))) - (let ((files (delete ".dir-locals.el" - (directory-files srcdir nil "^[^=].*\\.el$"))) + (let ((files (directory-files srcdir nil "^[^=].*\\.el$")) ;;(byte-compile-generate-call-tree t) file elc) ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet ;; installed. (when (featurep 'xemacs) (setq gnus-xmas-glyph-directory "dummy")) - (dolist (file '("dgnushack.el" "lpath.el")) + (dolist (file '(".dir-locals.el" "dgnushack.el" "lpath.el")) (setq files (delete file files))) (when (featurep 'base64) (setq files (delete "base64.el" files))) @@ -327,6 +326,8 @@ dgnushack-compile." (dolist (file '("webmail.el" "nnwfm.el")) (setq files (delete file files))))) (condition-case code + ;; Under XEmacs 21.4 this loads easy-mmode.elc that provides + ;; the Emacs functions `propertize' and `replace-regexp-in-string'. (require 'mh-e) (error (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") "")) diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el index dec8c5093..c390ae0bc 100644 --- a/lisp/gnus-html.el +++ b/lisp/gnus-html.el @@ -299,7 +299,7 @@ fit these criteria." "--max-time" "60" "-o" (gnus-html-image-id url) (mm-url-decode-entities-string url)))) - (process-kill-without-query process) + (gnus-set-process-query-on-exit-flag process nil) (set-process-sentinel process 'gnus-html-curl-sentinel) (gnus-set-process-plist process (list 'images images 'buffer buffer))))) @@ -463,7 +463,7 @@ This only works if the article in question is HTML." "--location" "--max-time" "60" urls))) - (process-kill-without-query process)))))) + (gnus-set-process-query-on-exit-flag process nil)))))) (provide 'gnus-html) diff --git a/lisp/lpath.el b/lisp/lpath.el index 1eb3540cb..b2aa91c70 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -121,10 +121,6 @@ '(header-line-format scroll-margin timer-list))) - (when (and (= emacs-major-version 21) (= emacs-minor-version 4)) - (maybe-fbind - '(propertize))) - (unless (featurep 'mule) (maybe-fbind '(ccl-execute-on-string -- 2.34.1