update.

[elisp/apel.git] / richtext.el

diff --git a/richtext.el b/richtext.el
index 0ef10f4..07e2f64 100644 (file)
--- a/richtext.el
+++ b/richtext.el
@@ -1,10 +1,10 @@
 ;;; richtext.el -- read and save files in text/richtext format
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/7/15
-;; Version: $Id: richtext.el,v 3.3 1996/11/28 19:26:19 morioka Exp $
+;; Version: $Id: richtext.el,v 3.6 1997/06/28 17:58:34 morioka Exp $
 ;; Keywords: wp, faces, MIME, multimedia
 
 ;; This file is not part of GNU Emacs yet.
@@ -76,6 +76,7 @@ of this structure.")
 ;;; @ encoder
 ;;;
 
+;;;###autoload
 (defun richtext-encode (from to)
   (if enriched-verbose (message "Richtext: encoding document..."))
   (save-restriction
@@ -136,6 +137,7 @@ Return value is \(begin end name positive-p), or nil if none was found."
               ))
        ))))
 
+;;;###autoload
 (defun richtext-decode (from to)
   (if enriched-verbose (message "Richtext: decoding document..."))
   (save-excursion
@@ -164,11 +166,8 @@ Return value is \(begin end name positive-p), or nil if none was found."
                                  'richtext-next-annotation)
 
        ;; Fill paragraphs
-       (if (or (and file-width         ; possible reasons not to fill:
-                    (= file-width (enriched-text-width))) ; correct wd.
-               (null enriched-fill-after-visiting) ; never fill
-               (and (eq 'ask enriched-fill-after-visiting) ; asked & declined
-                    (not (y-or-n-p "Re-fill for current display width? "))))
+       (if (and file-width             ; possible reasons not to fill:
+                (= file-width (enriched-text-width))) ; correct wd.
            ;; Minimally, we have to insert indentation and justification.
            (enriched-insert-indentation)
          (if enriched-verbose (message "Filling paragraphs..."))