# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1188512077 0
# Node ID 105d3bc0aae53ee8a2ba0c9e8484dd6784726b5f
# Parent  c6b3153120321e2cfd92a6ef88823a78e76e05a5
(speedbar-frame-reposition-smartly)
(speedbar-set-mode-line-format, speedbar-reconfigure-keymaps)
(speedbar-check-vc): Don't use dframe-xemacsp.

diff -r c6b315312032 -r 105d3bc0aae5 lisp/speedbar.el
--- a/lisp/speedbar.el	Thu Aug 30 08:16:55 2007 +0000
+++ b/lisp/speedbar.el	Thu Aug 30 22:14:37 2007 +0000
@@ -994,7 +994,7 @@
 		     'speedbar-buffer
 		     "Speedbar"
 		     #'speedbar-frame-mode
-		     (if dframe-xemacsp
+		     (if (featurep 'xemacs)
 			 (append speedbar-frame-plist
 				 ;; This is a hack to get speedbar to iconfiy
 				 ;; with the selected frame.
@@ -1020,7 +1020,7 @@
 
 (defun speedbar-frame-reposition-smartly ()
   "Reposition the speedbar frame to be next to the attached frame."
-  (cond ((and dframe-xemacsp
+  (cond ((and (featurep 'xemacs)
 	      (or (member 'left speedbar-frame-plist)
 		  (member 'top speedbar-frame-plist)))
 	 (dframe-reposition-frame
@@ -1029,7 +1029,7 @@
 	  (cons (car (cdr (member 'left speedbar-frame-plist)))
 		(car (cdr (member 'top speedbar-frame-plist)))))
 	 )
-	((and (not dframe-xemacsp)
+	((and (not (featurep 'xemacs))
 	      (or (assoc 'left speedbar-frame-parameters)
 		  (assoc 'top speedbar-frame-parameters)))
 	 ;; if left/top were specified in the parameters, pass them
@@ -1164,7 +1164,7 @@
 This gives visual indications of what is up.  It EXPECTS the speedbar
 frame and window to be the currently active frame and window."
   (if (and (frame-live-p (speedbar-current-frame))
-	   (or (not dframe-xemacsp)
+	   (or (not (featurep 'xemacs))
 	       (with-no-warnings
 		 (specifier-instance has-modeline-p)))
 	   speedbar-buffer)
@@ -1252,7 +1252,7 @@
       (if speedbar-previous-menu (easy-menu-remove speedbar-previous-menu))
       (setq speedbar-previous-menu md)
       ;; Now add the new menu
-      (if (not dframe-xemacsp)
+      (if (not (featurep 'xemacs))
 	  (easy-menu-define speedbar-menu-map (current-local-map)
 			    "Speedbar menu" md)
 	(easy-menu-add md (current-local-map))
@@ -2915,7 +2915,7 @@
 	     (not (or (and (featurep 'ange-ftp)
 			   (string-match
 			    (car (symbol-value
-				  (if dframe-xemacsp
+				  (if (featurep 'xemacs)
 				      'ange-ftp-directory-format
 				    'ange-ftp-name-format)))
 			    (expand-file-name default-directory)))