From 230f4b640991c7cc6517c6dd535845e446a18865 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 7 Jan 2002 23:02:10 +0000
Subject: [PATCH] * gnus-picon.el: Don't require `mail-parse'.

* nnheader.el (mail-header-fold-field): Alias to `std11-fold-field'.
(std11-fold-field): New function.
(mail-narrow-to-head): Alias to `std11-narrow-to-header'.
(mail-header-narrow-to-field): Alias to `std11-narrow-to-field'.
(std11-narrow-to-field): New function.

and a few fixes.
---
 ChangeLog          |   15 +++++++++++++--
 lisp/ChangeLog     |    4 ++++
 lisp/gnus-fun.el   |    3 ---
 lisp/gnus-picon.el |    1 -
 lisp/gnus.el       |    1 +
 lisp/nnheader.el   |   29 +++++++++++++++++++++++++++++
 6 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ead05ae..6ad242f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,22 @@
 2002-01-07  Katsumi Yamaoka <yamaoka@jpl.org>
 
+	* lisp/gnus-picon.el: Don't require `mail-parse'.
+
+2002-01-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* lisp/nnheader.el (mail-header-fold-field): Alias to
+	`std11-fold-field'.
+	(std11-fold-field): New function.
+	(mail-narrow-to-head): Alias to `std11-narrow-to-header'.
+	(mail-header-narrow-to-field): Alias to `std11-narrow-to-field'.
+	(std11-narrow-to-field): New function.
+
+2002-01-07  Katsumi Yamaoka <yamaoka@jpl.org>
+
 	* lisp/gnus-vers.el (gnus-revision-number): Increment to 10.
 
 	* lisp/gnus-picon.el: Require `mail-parse'.
 
-	* lisp/gnus-fun.el: Autoload "compface" for `uncompface'.
-
 	* lisp/sha1-el.el (sha1-use-external): Replace `executable-find'
 	with `exec-installed-p'.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8ed8f2..0694404 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,6 +21,10 @@
 	(gnus-xmas-put-image): Use end-glyph. Make text invisible.
 	(gnus-xmas-remove-image): Make text visible, remove glyph.
 
+2002-01-01 02:32:53 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>
+
+	* gnus.el: Oort Gnus v0.04 is released.
+
 2002-01-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-delay.el (gnus-delay-send-queue): Renamed.
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 34b6f66..978bccf 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -25,9 +25,6 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (autoload 'uncompface "compface"))
-
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
   :group 'gnus-fun
diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index a483e58..c9847a1 100644
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -43,7 +43,6 @@
 (require 'gnus)
 (require 'custom)
 (require 'gnus-art)
-(require 'mail-parse)
 
 ;;; User variables:
 
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 90b88d5..87b1852 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2194,6 +2194,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       gnus-unplugged gnus-agentize gnus-agent-batch)
      ("gnus-vm" :interactive t gnus-summary-save-in-vm
       gnus-summary-save-article-vm)
+     ("compface" uncompface)
      ("gnus-draft" :interactive t gnus-draft-mode gnus-group-send-queue)
      ("gnus-mlspl" gnus-group-split gnus-group-split-fancy)
      ("gnus-mlspl" :interactive t gnus-group-split-setup
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 3301b5f..d2dad79 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -1183,6 +1183,7 @@ find-file-hooks, etc.
       (message "%s(Y/n) Yes" prompt)
       t)))
 
+;; mm- stuff.
 (unless (featurep 'mm-util)
   (defun nnheader-image-load-path (&optional package)
     (let (dir result)
@@ -1208,6 +1209,34 @@ find-file-hooks, etc.
 	'multibyte-string-p
       'ignore)))
 
+;; rfc-2047 stuff.
+(unless (featurep 'mail-parse)
+  (defun-maybe std11-narrow-to-field ()
+    "Narrow the buffer to the header on the current line."
+    (forward-line 0)
+    (narrow-to-region (point)
+		      (progn
+			(std11-field-end)
+			(when (eolp) (forward-line 1))
+			(point)))
+    (goto-char (point-min)))
+
+  (defalias 'mail-header-narrow-to-field 'std11-narrow-to-field)
+
+  (defalias 'mail-narrow-to-head 'std11-narrow-to-header)
+
+  (defun-maybe std11-fold-field ()
+    "Fold the current line."
+    (save-excursion
+      (save-restriction
+	(std11-narrow-to-field)
+	(let ((str (std11-unfold-string
+		    (buffer-substring (point-min) (point-max)))))
+	  (delete-region (point-min) (point-max))
+	  (insert str)))))
+
+  (defalias 'mail-header-fold-field 'std11-fold-field))
+
 (when (featurep 'xemacs)
   (require 'nnheaderxm))
 
-- 
1.7.10.4