From: teranisi <teranisi>
Date: Fri, 25 Jan 2002 10:38:49 +0000 (+0000)
Subject: * wl.el (wl-other-frame): If wl-folder-use-frame is non-nil, call `wl'
X-Git-Tag: wl-2_9_7~29
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=94021ed9d69d1a675c3729ab39671bd4f9e02d0e;p=elisp%2Fwanderlust.git

* wl.el (wl-other-frame): If wl-folder-use-frame is non-nil, call `wl'
 directly.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 463db4a..33b7287 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-25  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl.el (wl-other-frame): If wl-folder-use-frame is non-nil,
+	call `wl' directly.
+
 2002-01-25  pf21 GOTO_Toshiya <goto.toshiya@canon.co.jp>
 
 	* wl-draft.el (wl-draft-reedit): Removed duplicated
diff --git a/wl/wl.el b/wl/wl.el
index cbff2e6..e81b208 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -844,32 +844,34 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
 (defun wl-other-frame (&optional arg)
   "Pop up a frame to read messages via Wanderlust."
   (interactive)
-  (let ((focusing-functions (append '(raise-frame select-frame)
-				    (if (fboundp 'x-focus-frame)
-					'(x-focus-frame)
-				      '(focus-frame))))
-	(folder (get-buffer wl-folder-buffer-name))
-	window frame wl-folder-use-frame)
-    (if (and folder
-	     (setq window (get-buffer-window folder t))
-	     (window-live-p window)
-	     (setq frame (window-frame window)))
-	(progn
-	  (while focusing-functions
-	    (funcall (car focusing-functions) frame)
-	    (setq focusing-functions (cdr focusing-functions)))
-	  (wl arg))
-      (setq frame (make-frame))
-      (while focusing-functions
-	(funcall (car focusing-functions) frame)
-	(setq focusing-functions (cdr focusing-functions)))
-      (setq wl-delete-startup-frame-function
-	    `(lambda ()
-	       (setq wl-delete-startup-frame-function nil)
-	       (let ((frame ,frame))
-		 (if (eq (selected-frame) frame)
-		     (delete-frame frame)))))
-      (wl arg))))
+  (if wl-folder-use-frame
+      (wl arg)
+    (let ((focusing-functions (append '(raise-frame select-frame)
+				      (if (fboundp 'x-focus-frame)
+					  '(x-focus-frame)
+					'(focus-frame))))
+	  (folder (get-buffer wl-folder-buffer-name))
+	  window frame wl-folder-use-frame)
+      (if (and folder
+	       (setq window (get-buffer-window folder t))
+	       (window-live-p window)
+	       (setq frame (window-frame window)))
+	  (progn
+	    (while focusing-functions
+	      (funcall (car focusing-functions) frame)
+	      (setq focusing-functions (cdr focusing-functions)))
+	    (wl arg))
+	(setq frame (make-frame))
+	(while focusing-functions
+	  (funcall (car focusing-functions) frame)
+	  (setq focusing-functions (cdr focusing-functions)))
+	(setq wl-delete-startup-frame-function
+	      `(lambda ()
+		 (setq wl-delete-startup-frame-function nil)
+		 (let ((frame ,frame))
+		   (if (eq (selected-frame) frame)
+		       (delete-frame frame)))))
+	(wl arg)))))
 
 ;; Define some autoload functions WL might use.
 (eval-and-compile