From 022a1411b452c0a19608b2079d2ac0fb92bec192 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 26 Sep 2000 22:10:01 +0000 Subject: [PATCH] Synch with Wanderlust and Gnus. --- ChangeLog | 5 +++++ lisp/ChangeLog | 8 ++++++++ lisp/gnus-draft.el | 1 - lisp/mm-view.el | 7 +++---- lisp/ptexinfmt.el | 8 ++++---- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b913eb0..92aa097 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-26 TAKAHASHI Kaoru + + * lisp/ptexinfmt.el (texinfo-format-printindex): Use (featurep + 'meadow) instead of `texinfmt-version'. + 2000-09-25 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 05. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41ae8e2..5e65c31 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2000-09-26 Dave Love + + * gnus-draft.el: Don't require gnus-agent. + + * mm-view.el: Use featurep for XEmacs test. + (mm-inline-message): Test for `remove-specifier'; don't use + condition-case. + 2000-09-24 Simon Josefsson * nnimap.el (nnimap-request-accept-article): Remove From[^:] lines. diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 7dba250..293209c 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -33,7 +33,6 @@ (require 'message) (require 'gnus-msg) (require 'nndraft) -(require 'gnus-agent) (eval-when-compile (require 'cl)) ;;; Draft minor mode diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 5bf4f09..9f389ba 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -64,7 +64,7 @@ (set-extent-property annot 'duplicable t))) (eval-and-compile - (if (string-match "XEmacs" (emacs-version)) + (if (featurep 'xemacs) (defalias 'mm-inline-image 'mm-inline-image-xemacs) (defalias 'mm-inline-image 'mm-inline-image-emacs))) @@ -251,13 +251,12 @@ handle `(lambda () (let (buffer-read-only) - (condition-case nil + (if (fboundp 'remove-specifier) ;; This is only valid on XEmacs. (mapcar (lambda (prop) (remove-specifier (face-property 'default prop) (current-buffer))) - '(background background-pixmap foreground)) - (error nil)) + '(background background-pixmap foreground))) (delete-region ,(point-min-marker) ,(point-max-marker))))))))) (defun mm-display-inline-fontify (handle mode) diff --git a/lisp/ptexinfmt.el b/lisp/ptexinfmt.el index 2f5ec13..a129355 100644 --- a/lisp/ptexinfmt.el +++ b/lisp/ptexinfmt.el @@ -46,13 +46,14 @@ ;; sort -fd (broken-facility texinfo-format-printindex - "Can't sort on Windows." + "Can't sort on Mule for Windows." (if (and (memq system-type '(windows-nt ms-dos)) - (string< texinfmt-version "2.37 of 24 May 1997")) +;;; (string< texinfmt-version "2.37 of 24 May 1997") + (not (featurep 'meadow))) nil t) ptexinfmt-disable-broken-notice) - + ;; @var (broken-facility texinfo-format-var "Don't perse @var argument." @@ -750,5 +751,4 @@ This command is executed when texinfmt sees @item inside @multitable." (texinfo-sort-region opoint (point)) (shell-command-on-region opoint (point) "sort -fd" 1)))) - ;;; ptexinfmt.el ends here -- 1.7.10.4