From 80ba12d7a49db9a74101652d0dffc2277e902c09 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 30 Aug 2007 22:14:51 +0000 Subject: [PATCH] (speedbar-frame-reposition-smartly) (speedbar-set-mode-line-format, speedbar-reconfigure-keymaps) (speedbar-check-vc): Don't use dframe-xemacsp. --- lisp/ChangeLog | 6 ++++++ lisp/speedbar.el | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76a6a7c4726..02bd3a9d8f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-30 Richard Stallman + + * speedbar.el (speedbar-frame-reposition-smartly) + (speedbar-set-mode-line-format, speedbar-reconfigure-keymaps) + (speedbar-check-vc): Don't use dframe-xemacsp. + 2007-08-30 Martin Rudalics * files.el (backup-buffer-copy): Try to overwrite old backup diff --git a/lisp/speedbar.el b/lisp/speedbar.el index c51d2ef9a80..6861615d468 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -994,7 +994,7 @@ supported at a time. '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 @@ supported at a time. (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 @@ supported at a time. (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 @@ return true without a query." 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 @@ and the existence of packages." (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 @@ to add more types of version control systems." (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))) -- 2.39.2