* mel-b.el (base64-internal-encoded-length): Refined.

* mel-ccl.el (q-encoding-ccl-encoded-length): Remove bogus
DOC-string.

* mel.el (q-encoding-ccl-encoded-length): Remove bogus
DOC-string.

diff --git a/ChangeLog b/ChangeLog
index b47e8ec..358b8cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1998-09-11  Tanaka Akira      <akr@jaist.ac.jp>
+
+       * mel-b.el (base64-internal-encoded-length): Refined.
+
+       * mel-ccl.el (q-encoding-ccl-encoded-length): Remove bogus
+       DOC-string.
+
+       * mel.el (q-encoding-ccl-encoded-length): Remove bogus
+       DOC-string.
+
 1998-09-10  Tanaka Akira      <akr@jaist.ac.jp>
 
        * mel-ccl.el (mel-ccl-encode-q-generic): New compile-time

diff --git a/mel-b.el b/mel-b.el
index 4eb9ca7..72f1e51 100644 (file)
--- a/mel-b.el
+++ b/mel-b.el
@@ -288,11 +288,7 @@ START and END are buffer positions."
 ;;;
 
 (defun base64-internal-encoded-length (string)
-  (let ((len (length string)))
-    (* (+ (/ len 3)
-         (if (= (mod len 3) 0) 0 1)
-         ) 4)
-    ))
+  (* (/ (+ (length string) 2) 3) 4))
 
 (defun pack-sequence (seq size)
   "Split sequence SEQ into SIZE elements packs,

diff --git a/mel-ccl.el b/mel-ccl.el
index 0dfe2b8..ee76d3f 100644 (file)
--- a/mel-ccl.el
+++ b/mel-ccl.el
@@ -1180,9 +1180,6 @@ MODE allows `text', `comment', `phrase' or nil.  Default value is
 
 (unless running-xemacs
   (defun q-encoding-ccl-encoded-length (string &optional mode)
-    "Encode STRING to Q-encoding of encoded-word, and return the result.
-MODE allows `text', `comment', `phrase' or nil.  Default value is
-`phrase'."
     (let ((status [nil nil nil nil nil nil nil nil nil]))
       (fillarray status nil)
       (ccl-execute-on-string

diff --git a/mel.el b/mel.el
index c113b92..8f7603c 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -186,7 +186,7 @@ external decoder is called.")
       "Encode STRING with quoted-printable encoding.")
     (autoload 'quoted-printable-ccl-encode-region "mel-ccl"
       "Encode the region from START to END with quoted-printable
-  encoding." t)
+encoding." t)
     (autoload 'quoted-printable-ccl-insert-encoded-file "mel-ccl"
       "Encode contents of the file named as FILENAME, and insert it." t))
 
@@ -200,16 +200,13 @@ external decoder is called.")
 
   (autoload 'q-encoding-ccl-encode-string "mel-ccl"
     "Encode STRING to Q-encoding of encoded-word, and return the result.
-  MODE allows `text', `comment', `phrase' or nil.  Default value is
-  `phrase'.")
+MODE allows `text', `comment', `phrase' or nil.  Default value is
+`phrase'.")
   (autoload 'q-encoding-ccl-decode-string "mel-ccl"
     "Decode Q encoded STRING and return the result.")
 
   (unless running-xemacs
-    (autoload 'q-encoding-ccl-encoded-length "mel-ccl"
-      "Encode STRING to Q-encoding of encoded-word, and return the result.
-MODE allows `text', `comment', `phrase' or nil.  Default value is
-`phrase'.")
+    (autoload 'q-encoding-ccl-encoded-length "mel-ccl")
     )
   )