From: yamaoka <yamaoka>
Date: Tue, 29 Sep 1998 09:50:09 +0000 (+0000)
Subject: 	* lisp/message.el (message-make-user-agent): Make a user-agent
X-Git-Tag: pgnus-ichikawa-199811302358~199
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8caaf5bf4d7026f7a6e7bf0fdc98d60d7046aa5;p=elisp%2Fgnus.git-

	* lisp/message.el (message-make-user-agent): Make a user-agent
	string without MUA info, if the value of `message-user-agent' is
	nil nor `gnus-inviolable-extended-version' is not exists.
---

diff --git a/lisp/message.el b/lisp/message.el
index 2e56439..d6ec312 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3132,6 +3132,7 @@ give as trustworthy answer as possible."
 (defvar mule-version)
 (defvar emacs-beta-version)
 (defvar xemacs-codename)
+(defvar gnus-inviolable-extended-version)
 
 (defun message-make-user-agent ()
   "Return user-agent info."
@@ -3155,12 +3156,13 @@ give as trustworthy answer as possible."
 		      (when (string-match "[\n\t ]+$" value)
 			(setq value
 			      (substring value 0 (match-beginning 0))))
-		      (unless (string-match
-			       (concat
-				"^" (regexp-quote
-				     gnus-inviolable-extended-version))
-			       value)
-			(delete-region start (1+ (point))))
+		      (when (boundp 'gnus-inviolable-extended-version)
+			(unless (string-match
+				 (concat
+				  "^" (regexp-quote
+				       gnus-inviolable-extended-version))
+				 value)
+			  (delete-region start (1+ (point)))))
 		      (if (string-equal "" value)
 			  nil
 			value))))))
@@ -3228,8 +3230,12 @@ give as trustworthy answer as possible."
 		   "Meadow"))		; unknown format
 	     "")			; not Meadow
 	   ))))
-    (concat (or message-user-agent gnus-inviolable-extended-version)
-	    "\n " user-agent)))
+    (cond (message-user-agent
+	   (concat message-user-agent "\n " user-agent))
+	  ((boundp 'gnus-inviolable-extended-version)
+	   (concat gnus-inviolable-extended-version "\n " user-agent))
+	  (t
+	   user-agent))))
 
 (defun message-generate-headers (headers)
   "Prepare article HEADERS.