From 05e1ead695394f7d9fae8730e90e8db6dce2cc17 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 6 Sep 2002 07:54:17 +0000 Subject: [PATCH] * gnus-vers.el (gnus-revision-number): Increment to 01. * gnus-msg.el (gnus-copy-article-buffer): Set a copy buffer mutibyte; remove invisible and intangible test properties from a copied article. --- ChangeLog | 14 +++++++++++++ lisp/gnus-msg.el | 59 ++++++++++++++++++++++++++++++----------------------- lisp/gnus-vers.el | 2 +- texi/ptexinfmt.el | 55 ++++++++++++++++++++++++++++--------------------- 4 files changed, 80 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index dca2ee2..736b11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2002-09-06 Katsumi Yamaoka + + * lisp/gnus-vers.el (gnus-revision-number): Increment to 01. + + * lisp/gnus-msg.el (gnus-copy-article-buffer): Set a copy buffer + mutibyte; remove invisible and intangible test properties from a + copied article. + +2002-09-05 TAKAHASHI Kaoru + + * texi/ptexinfmt.el: discard @documentdescription. Support + @ifplaintext, @ifnotplaintext, @ifhtml. Remove obsolete commands. + (texinfo-format-ifhtml, texinfo-format-ifplaintext): New function. + 2002-08-06 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.7 revision 00. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 6bf7aaf..89f7a01 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -805,6 +805,9 @@ header line with the old Message-ID." ;; if ARTICLE-BUFFER is nil, gnus-article-buffer is used ;; this buffer should be passed to all mail/news reply/post routines. (setq gnus-article-copy (gnus-get-buffer-create " *gnus article copy*")) + (save-excursion + (set-buffer gnus-article-copy) + (set-buffer-multibyte t)) (let ((article-buffer (or article-buffer gnus-article-buffer)) end beg) (if (not (and (get-buffer article-buffer) @@ -821,32 +824,36 @@ header line with the old Message-ID." ;; Copy over the (displayed) article buffer, delete ;; hidden text and remove text properties. (widen) - (let ((inhibit-read-only t)) - (copy-to-buffer gnus-article-copy (point-min) (point-max)) - (set-buffer gnus-article-copy) - (when yank-string - (message-goto-body) - (delete-region (point) (point-max)) - (insert yank-string)) - ;; Encode bitmap smileys to ordinary text. - ;; Possibly, the original text might be restored. - (static-unless (featurep 'xemacs) - (when (featurep 'smiley-mule) - (smiley-encode-buffer))) - (gnus-article-delete-text-of-type 'annotation) - (gnus-remove-text-with-property 'gnus-prev) - (gnus-remove-text-with-property 'gnus-next) - (gnus-remove-text-with-property 'gnus-decoration) - (gnus-remove-text-with-property 'x-face-mule-bitmap-image) - (insert - (prog1 - (static-if (featurep 'xemacs) - ;; Revome smiley extents for (possibly) XEmacs 21.1. - (format "%s" - (buffer-substring-no-properties (point-min) - (point-max))) - (buffer-substring-no-properties (point-min) (point-max))) - (erase-buffer)))) + (copy-to-buffer gnus-article-copy (point-min) (point-max)) + (set-buffer gnus-article-copy) + ;; There's invisible and intangible text in T-gnus. Especially, + ;; if there is a boundary line (X-Boundary: ------------------), + ;; in the end of a header, it will cause a serious problem. + (add-text-properties (point-min) (point-max) + '(invisible nil intangible nil)) + (when yank-string + (message-goto-body) + (delete-region (point) (point-max)) + (insert yank-string)) + ;; Encode bitmap smileys to ordinary text. + ;; Possibly, the original text might be restored. + (static-unless (featurep 'xemacs) + (when (featurep 'smiley-mule) + (smiley-encode-buffer))) + (gnus-article-delete-text-of-type 'annotation) + (gnus-remove-text-with-property 'gnus-prev) + (gnus-remove-text-with-property 'gnus-next) + (gnus-remove-text-with-property 'gnus-decoration) + (gnus-remove-text-with-property 'x-face-mule-bitmap-image) + (insert + (prog1 + (static-if (featurep 'xemacs) + ;; Revome smiley extents for (possibly) XEmacs 21.1. + (format "%s" + (buffer-substring-no-properties (point-min) + (point-max))) + (buffer-substring-no-properties (point-min) (point-max))) + (erase-buffer))) ;; Find the original headers. (set-buffer gnus-original-article-buffer) (goto-char (point-min)) diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index 117fcbe..764428c 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -34,7 +34,7 @@ (require 'product) (provide 'gnus-vers) -(defconst gnus-revision-number "00" +(defconst gnus-revision-number "01" "Revision number for this version of gnus.") ;; Product information of this gnus. diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el index 86e21dc..919dbae 100644 --- a/texi/ptexinfmt.el +++ b/texi/ptexinfmt.el @@ -115,19 +115,11 @@ This is NO-NOTICE argument in `broken-facility'.") ptexinfmt-disable-broken-notice-flag) -;;; Obsolete -;; Removed Texinfo 3.8 -(put 'overfullrule 'texinfo-format 'texinfo-discard-line) -(put 'smallbreak 'texinfo-format 'texinfo-discard-line) -(put 'medbreak 'texinfo-format 'texinfo-discard-line) -(put 'bigbreak 'texinfo-format 'texinfo-discard-line) -;; Removed Texinfo 3.9 -(put 'setchapterstyle 'texinfo-format 'texinfo-discard-line-with-args) - ;;; Hardcopy and HTML (discard) -;; I18N +;; html (put 'documentlanguage 'texinfo-format 'texinfo-discard-line-with-args) (put 'documentencoding 'texinfo-format 'texinfo-discard-line-with-args) +(put 'documentdescription 'texinfo-format 'texinfo-discard-line-with-args) ;; size (put 'smallbook 'texinfo-format 'texinfo-discard-line) @@ -158,6 +150,7 @@ This is NO-NOTICE argument in `broken-facility'.") ;; misc (put 'page 'texinfo-format 'texinfo-discard-line) +(put 'hyphenation 'texinfo-format 'texinfo-discard-command-and-arg) @@ -186,7 +179,7 @@ This is NO-NOTICE argument in `broken-facility'.") (texinfo-pop-stack 'direntry)) -;;; Block Enclosing and Conditional +;;; Block Enclosing ;; @detailmenu ... @end detailmenu (put 'detailmenu 'texinfo-format 'texinfo-discard-line) (put 'detailmenu 'texinfo-end 'texinfo-discard-command) @@ -199,33 +192,52 @@ This is NO-NOTICE argument in `broken-facility'.") (put 'smallformat 'texinfo-format 'texinfo-format-flushleft) (put 'smallformat 'texinfo-end 'texinfo-end-flushleft) -;; @ifnottex ... @end ifnottex +;; @cartouche ... @end cartouche +(put 'cartouche 'texinfo-format 'texinfo-discard-line) +(put 'cartouche 'texinfo-end 'texinfo-discard-command) + + +;;; Conditional +;; @ifnottex ... @end ifnottex (makeinfo 3.11 or later) (put 'ifnottex 'texinfo-format 'texinfo-discard-line) (put 'ifnottex 'texinfo-end 'texinfo-discard-command) -;; @ifnothtml ... @end ifnothtml +;; @ifnothtml ... @end ifnothtml (makeinfo 3.11 or later) (put 'ifnothtml 'texinfo-format 'texinfo-discard-line) (put 'ifnothtml 'texinfo-end 'texinfo-discard-command) -;; @ifnotinfo ... @end ifnotinfo +;; @ifnotplaintext ... @end ifnotplaintext (makeinfo 4.2 or later) +(put 'ifnotplaintext 'texinfo-format 'texinfo-discard-line) +(put 'ifnotplaintext 'texinfo-end 'texinfo-discard-command) + + +;; @ifnotinfo ... @end ifnotinfo (makeinfo 3.11 or later) (put 'ifnotinfo 'texinfo-format 'texinfo-format-ifnotinfo) -(put 'endifnotinfo 'texinfo-format 'texinfo-discard-line) (defun-maybe texinfo-format-ifnotinfo () (delete-region texinfo-command-start (progn (re-search-forward "@end ifnotinfo[ \t]*\n") (point)))) -;; @html ... @end html +;; @html ... @end html (makeinfo 3.11 or later) (put 'html 'texinfo-format 'texinfo-format-html) -(put 'endhtml 'texinfo-format 'texinfo-discard-line) (defun-maybe texinfo-format-html () (delete-region texinfo-command-start (progn (re-search-forward "@end html[ \t]*\n") (point)))) -;; @cartouche ... @end cartouche -(put 'cartouche 'texinfo-format 'texinfo-discard-line) -(put 'cartouche 'texinfo-end 'texinfo-discard-command) +;; @ifhtml ... @end ifhtml (makeinfo 3.8 or later) +(put 'ifhtml 'texinfo-format 'texinfo-format-ifhtml) +(defun texinfo-format-ifhtml () + (delete-region texinfo-command-start + (progn (re-search-forward "@end ifhtml[ \t]*\n") + (point)))) + +;; @ifplaintext ... @end ifplaintext (makeinfo 4.2 or later) +(put 'ifplaintext 'texinfo-format 'texinfo-format-ifplaintext) +(defun-maybe texinfo-format-ifplaintext () + (delete-region texinfo-command-start + (progn (re-search-forward "@end ifplaintext[ \t]*\n") + (point)))) @@ -513,9 +525,6 @@ otherwise, insert URL-TITLE followed by URL in parentheses." texinfo-alias-list)) (texinfo-discard-command)))) -;; @definfoenclose NEWCMD, BEFORE, AFTER - - ;;; Special ;; @image{FILENAME, [WIDTH], [HEIGHT]} -- 1.7.10.4