From: yamaoka <yamaoka>
Date: Tue, 3 Sep 2002 03:33:46 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-01-quimby~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5f3e395c05f3a053abd5bcae37d599cee795d9ab;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3c61f7..342f5f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-03  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* gnus-util.el (gnus-frame-or-window-display-name): Exclude
+	invalid display names.
+
 2002-08-30  Simon Josefsson  <jas@extundo.com>
 
 	* gnus-group.el (gnus-group-fetch-control): Fix typo in last
@@ -9,7 +14,7 @@
 	(gnus-group-fetch-control-use-browse-url): New option.
 
 	* gnus-group.el (gnus-group-fetch-charter): New function.
-	(gnus-group-fetch-control): New function.  
+	(gnus-group-fetch-control): New function.
 	Add them to the keymap and menu. Require mm-url.
 
 2002-08-30  Katsumi Yamaoka <yamaoka@jpl.org>
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index b299dd4..5b6e403 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1350,7 +1350,12 @@ Return nil otherwise."
     (if (or (framep object)
 	    (and (windowp object)
 		 (setq object (window-frame object))))
-	(frame-parameter object 'display))))
+	(let ((display (frame-parameter object 'display)))
+	  (if (and (stringp display)
+		   ;; Exclude invalid display names.
+		   (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'"
+				 display))
+	      display)))))
 
 (provide 'gnus-util)