From 5f3e395c05f3a053abd5bcae37d599cee795d9ab Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 3 Sep 2002 03:33:46 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 7 ++++++- lisp/gnus-util.el | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 + + * gnus-util.el (gnus-frame-or-window-display-name): Exclude + invalid display names. + 2002-08-30 Simon Josefsson * 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 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) -- 1.7.10.4