Small speedbar-related clean-up

* lisp/dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape):
Remove unnecessary declarations.
(dframe-message): Doc fix.

* lisp/info.el (dframe-select-attached-frame, dframe-current-frame):
Declare.

* lisp/speedbar.el (speedbar-message): Make it an obsolete alias.
Update all callers.
(speedbar-with-attached-buffer)
(speedbar-maybee-jump-to-attached-frame): Make these aliases obsolete.
(speedbar-with-writable): Use backquote.

* lisp/emacs-lisp/eieio-opt.el (eieio-describe-class-sb):

* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-handle-click):
Use dframe-with-attached-buffer, dframe-maybee-jump-to-attached-frame
rather than speedbar- aliases.

* lisp/mail/rmail.el: Load dframe rather than speedbar when compiling.
(speedbar-make-specialized-keymap, speedbar-insert-button)
(dframe-select-attached-frame, dframe-maybee-jump-to-attached-frame)
(speedbar-do-function-pointer): Declare.
(rmail-speedbar-button, rmail-speedbar-find-file)
(rmail-speedbar-move-message):
Use dframe-with-attached-buffer rather than speedbar- alias.

* lisp/progmodes/gud.el: Load dframe rather than speedbar when compiling.
(dframe-message, speedbar-make-specialized-keymap)
(speedbar-add-expansion-list, speedbar-mode-functions-list)
(speedbar-make-tag-line, speedbar-remove-localized-speedbar-support)
(speedbar-insert-button, dframe-select-attached-frame)
(dframe-maybee-jump-to-attached-frame)
(speedbar-change-initial-expansion-list)
(speedbar-previously-used-expansion-list-name): Declare.
(gud-speedbar-item-info, gud-gdb-goto-stackframe):
Use dframe-message, dframe-with-attached-buffer rather than
speedbar- aliases.
(gud-sentinel): Silence compiler.

* lisp/progmodes/vhdl-mode.el (speedbar-refresh)
(speedbar-do-function-pointer, speedbar-add-supported-extension)
(speedbar-add-mode-functions-list, speedbar-make-specialized-keymap)
(speedbar-change-initial-expansion-list, speedbar-add-expansion-list)
(speedbar-extension-list-to-regex, speedbar-directory-buttons)
(speedbar-file-lists, speedbar-make-tag-line)
(speedbar-line-directory, speedbar-goto-this-file)
(speedbar-center-buffer-smartly, speedbar-change-expand-button-char)
(speedbar-delete-subblock, speedbar-position-cursor-on-line)
(speedbar-make-button, speedbar-reset-scanners)
(speedbar-files-item-info, speedbar-line-text)
(speedbar-find-file-in-frame, speedbar-set-timer)
(dframe-maybee-jump-to-attached-frame, speedbar-line-file): Declare.
(speedbar-with-writable): Do not (re)define it.
(vhdl-speedbar-find-file): Use dframe-maybee-jump-to-attached-frame
rather than speedbar- alias.

* lisp/cedet/ede/speedbar.el (ede-file-find, ede-tag-find):
* lisp/cedet/semantic/sb.el (semantic-sb-token-jump):
Use dframe-maybee-jump-to-attached-frame rather than speedbar- alias.

* lisp/mh-e/mh-speed.el (mh-speed-view):
Use dframe-with-attached-buffer rather than speedbar- alias.

1 files changed, 38 insertions, 39 deletions

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 70bf5f41518..9daa77b740f 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -73,7 +73,7 @@ this version is not backward compatible to 0.14 or earlier.")
 ;; `speedbar-insert-generic-list'.  If you use
 ;; `speedbar-insert-generic-list', also read the doc for
 ;; `speedbar-tag-hierarchy-method' in case you wish to override it.
-;; The macro `speedbar-with-attached-buffer' brings you back to the
+;; The macro `dframe-with-attached-buffer' brings you back to the
 ;; buffer speedbar is displaying for.
 ;;
 ;; For those functions that make buttons, the "function" should be a
@@ -1137,10 +1137,7 @@ in the selected file.
 	  dframe-mouse-position-function #'speedbar-position-cursor-on-line))
   speedbar-buffer)
 
-(defmacro speedbar-message (fmt &rest args)
-  "Like `message', but for use in the speedbar frame.
-Argument FMT is the format string, and ARGS are the arguments for message."
-  `(dframe-message ,fmt ,@args))
+(define-obsolete-function-alias 'speedbar-message 'dframe-message "24.4")
 
 (defsubst speedbar-y-or-n-p (prompt &optional deleting)
   "Like `y-or-n-p', but for use in the speedbar frame.
@@ -1157,8 +1154,10 @@ return true without a query."
   (dframe-select-attached-frame (speedbar-current-frame)))
 
 ;; Backwards compatibility
-(defalias 'speedbar-with-attached-buffer 'dframe-with-attached-buffer)
-(defalias 'speedbar-maybee-jump-to-attached-frame 'dframe-maybee-jump-to-attached-frame)
+(define-obsolete-function-alias 'speedbar-with-attached-buffer
+  'dframe-with-attached-buffer "24.4") ; macro
+(define-obsolete-function-alias 'speedbar-maybee-jump-to-attached-frame
+  'dframe-maybee-jump-to-attached-frame "24.4")
 
 (defun speedbar-set-mode-line-format ()
   "Set the format of the mode line based on the current speedbar environment.
@@ -1285,7 +1284,7 @@ and the existence of packages."
 	      (if (eq major-mode 'speedbar-mode)
 		  ;; XEmacs may let us get in here in other mode buffers.
 		  (speedbar-item-info)))
-	  (error (speedbar-message nil)))))))
+	  (error (dframe-message nil)))))))
 
 (defun speedbar-show-info-under-mouse ()
   "Call the info function for the line under the mouse."
@@ -1417,13 +1416,13 @@ Argument ARG represents to force a refresh past any caches that may exist."
             (delq (assoc d speedbar-directory-contents-alist)
                   speedbar-directory-contents-alist)))
     (if (<= 1 speedbar-verbosity-level)
-	(speedbar-message "Refreshing speedbar..."))
+	(dframe-message "Refreshing speedbar..."))
     (speedbar-update-contents)
     (speedbar-stealthy-updates)
     ;; Reset the timer in case it got really hosed for some reason...
     (speedbar-set-timer dframe-update-speed)
     (if (<= 1 speedbar-verbosity-level)
-	(speedbar-message "Refreshing speedbar...done"))))
+	(dframe-message "Refreshing speedbar...done"))))
 
 (defun speedbar-item-load ()
   "Load the item under the cursor or mouse if it is a Lisp file."
@@ -1467,7 +1466,7 @@ File style information is displayed with `speedbar-item-info'."
     ;; Skip items in "folder" type text characters.
     (if (looking-at "\\s-*[[<({].[]>)}] ") (goto-char (match-end 0)))
     ;; Get the text
-    (speedbar-message "Text: %s" (buffer-substring-no-properties
+    (dframe-message "Text: %s" (buffer-substring-no-properties
 				  (point) (line-end-position)))))
 
 (defun speedbar-item-info ()
@@ -1485,7 +1484,7 @@ Return nil if not applicable.  If FILENAME, then use that
 instead of reading it from the speedbar buffer."
   (let* ((item (or filename (speedbar-line-file)))
 	 (attr (if item (file-attributes item) nil)))
-    (if (and item attr) (speedbar-message "%s %-6d %s" (nth 8 attr)
+    (if (and item attr) (dframe-message "%s %-6d %s" (nth 8 attr)
 					  (nth 7 attr) item)
       nil)))
 
@@ -1506,14 +1505,14 @@ Return nil if not applicable."
 		(when (and (semantic-tag-overlay attr)
 			   (semantic-tag-buffer attr))
 		  (set-buffer (semantic-tag-buffer attr)))
-		(speedbar-message
+		(dframe-message
 		 (funcall semantic-sb-info-format-tag-function attr)
 		 )))
 	    (looking-at "\\([0-9]+\\):")
 	    (setq item (file-name-nondirectory (speedbar-line-directory)))
-	    (speedbar-message "Tag: %s  in %s" tag item)))
+	    (dframe-message "Tag: %s  in %s" tag item)))
       (if (re-search-forward "{[+-]} \\([^\n]+\\)$" (line-end-position) t)
-	  (speedbar-message "Group of tags \"%s\"" (match-string 1))
+	  (dframe-message "Group of tags \"%s\"" (match-string 1))
 	(if (re-search-forward " [+-]?[()|@] \\([^\n]+\\)$" nil t)
 	    (let* ((detailtext (match-string 1))
 		   (detail (or (speedbar-line-token) detailtext))
@@ -1532,18 +1531,18 @@ Return nil if not applicable."
 	      (if (featurep 'semantic)
 		  (with-no-warnings
 		    (if (semantic-tag-p detail)
-			(speedbar-message
+			(dframe-message
 			 (funcall semantic-sb-info-format-tag-function detail parent))
 		      (if parent
-			  (speedbar-message "Detail: %s of tag %s" detail
+			  (dframe-message "Detail: %s of tag %s" detail
 					    (if (semantic-tag-p parent)
 						(semantic-format-tag-name parent nil t)
 					      parent))
-			(speedbar-message "Detail: %s" detail))))
+			(dframe-message "Detail: %s" detail))))
 		;; Not using `semantic':
 		(if parent
-		    (speedbar-message "Detail: %s of tag %s" detail parent)
-		  (speedbar-message "Detail: %s" detail))))
+		    (dframe-message "Detail: %s of tag %s" detail parent)
+		  (dframe-message "Detail: %s" detail))))
 	  nil)))))
 
 (defun speedbar-files-item-info ()
@@ -1641,7 +1640,7 @@ Files can be renamed to new names or moved to new directories."
 	  (if (file-directory-p f)
 	      (delete-directory f t t)
 	    (delete-file f t))
-	  (speedbar-message "Okie dokie.")
+	  (dframe-message "Okie dokie.")
 	  (let ((p (point)))
 	    (speedbar-refresh)
 	    (goto-char p))
@@ -1706,9 +1705,9 @@ variable `speedbar-obj-alist'."
 
 (defmacro speedbar-with-writable (&rest forms)
   "Allow the buffer to be writable and evaluate FORMS."
-  (list 'let '((inhibit-read-only t))
-	(cons 'progn forms)))
-(put 'speedbar-with-writable 'lisp-indent-function 0)
+  (declare (indent 0))
+  `(let ((inhibit-read-only t))
+     ,@forms))
 
 (defun speedbar-insert-button (text face mouse function
 				    &optional token prevline)
@@ -2437,7 +2436,7 @@ name will have the function FIND-FUN and not token."
 				     (car (car lst)) ;button name
 				     nil nil 'speedbar-tag-face
 				     (1+ level)))
-	    (t (speedbar-message "speedbar-insert-generic-list: malformed list!")
+	    (t (dframe-message "speedbar-insert-generic-list: malformed list!")
 	       ))
       (setq lst (cdr lst)))))
 
@@ -2492,14 +2491,14 @@ name will have the function FIND-FUN and not token."
 		      (expand-file-name default-directory))))
 	    nil
 	  (if (<= 1 speedbar-verbosity-level)
-	      (speedbar-message "Updating speedbar to: %s..."
+	      (dframe-message "Updating speedbar to: %s..."
 				default-directory))
 	  (speedbar-update-directory-contents)
 	  (if (<= 1 speedbar-verbosity-level)
 	      (progn
-		(speedbar-message "Updating speedbar to: %s...done"
+		(dframe-message "Updating speedbar to: %s...done"
 				  default-directory)
-		(speedbar-message nil))))
+		(dframe-message nil))))
       ;; Else, we can do a short cut.  No text cache.
       (let ((cbd (expand-file-name default-directory)))
 	(set-buffer speedbar-buffer)
@@ -2662,16 +2661,16 @@ Also resets scanner functions."
 		    ;;(eq (get major-mode 'mode-class 'special)))
 		    (progn
 		      (if (<= 2 speedbar-verbosity-level)
-			  (speedbar-message
+			  (dframe-message
 			   "Updating speedbar to special mode: %s..."
 			   major-mode))
 		      (speedbar-update-special-contents)
 		      (if (<= 2 speedbar-verbosity-level)
 			  (progn
-			    (speedbar-message
+			    (dframe-message
 			     "Updating speedbar to special mode: %s...done"
 			     major-mode)
-			    (speedbar-message nil))))
+			    (dframe-message nil))))
 
  		  ;; Update all the contents if directories change!
  		  (unless (and (or (member major-mode speedbar-ignored-modes)
@@ -2704,7 +2703,7 @@ interrupted by the user."
 	      (while (and l (funcall (car l)))
 		;;(sit-for 0)
 		(setq l (cdr l))))
-	  ;;(speedbar-message "Exit with %S" (car l))
+	  ;;(dframe-message "Exit with %S" (car l))
 	  ))))
 
 (defun speedbar-reset-scanners ()
@@ -2944,7 +2943,7 @@ the file being checked."
 			(point))))
 	 (fulln (concat f fn)))
     (if (<= 2 speedbar-verbosity-level)
-	(speedbar-message "Speedbar vc check...%s" fulln))
+	(dframe-message "Speedbar vc check...%s" fulln))
     (and (file-writable-p fulln)
 	 (speedbar-this-file-in-vc f fn))))
 
@@ -3016,7 +3015,7 @@ the file being checked."
 			(point))))
 	 (fulln (concat f fn)))
     (if (<= 2 speedbar-verbosity-level)
-	(speedbar-message "Speedbar obj check...%s" fulln))
+	(dframe-message "Speedbar obj check...%s" fulln))
     (let ((oa speedbar-obj-alist))
       (while (and oa (not (string-match (car (car oa)) fulln)))
 	(setq oa (cdr oa)))
@@ -3076,7 +3075,7 @@ a function if appropriate."
 				    (buffer-substring-no-properties
 				    (match-beginning 0) (match-end 0))
 				  "0")))))
-    ;;(speedbar-message "%S:%S:%S:%s" fn tok txt dent)
+    ;;(dframe-message "%S:%S:%S:%s" fn tok txt dent)
     (and fn (funcall fn txt tok dent)))
   (speedbar-position-cursor-on-line))
 
@@ -3697,14 +3696,14 @@ Each symbol will be associated with its line position in FILE."
 	  (if (get-buffer "*etags tmp*")
 	      (kill-buffer "*etags tmp*"))	;kill to clean it up
 	  (if (<= 1 speedbar-verbosity-level)
-	      (speedbar-message "Fetching etags..."))
+	      (dframe-message "Fetching etags..."))
 	  (set-buffer (get-buffer-create "*etags tmp*"))
 	  (apply 'call-process speedbar-fetch-etags-command nil
 		 (current-buffer) nil
 		 (append speedbar-fetch-etags-arguments (list file)))
 	  (goto-char (point-min))
 	  (if (<= 1 speedbar-verbosity-level)
-	      (speedbar-message "Fetching etags..."))
+	      (dframe-message "Fetching etags..."))
 	  (let ((expr
 		 (let ((exprlst speedbar-fetch-etags-parse-list)
 		       (ans nil))
@@ -3721,7 +3720,7 @@ Each symbol will be associated with its line position in FILE."
 		      (setq tnl (speedbar-extract-one-symbol expr)))
 		    (if tnl (setq newlist (cons tnl newlist)))
 		    (forward-line 1)))
-	      (speedbar-message
+	      (dframe-message
 	       "Sorry, no support for a file of that extension"))))
       )
     (if speedbar-sort-tags
@@ -3908,7 +3907,7 @@ Argument BUFFER is the buffer being tested."
       (let* ((item (speedbar-line-text))
 	     (buffer (if item (get-buffer item) nil)))
 	(and buffer
-	     (speedbar-message "%s%s %S %d %s"
+	     (dframe-message "%s%s %S %d %s"
 			       (if (buffer-modified-p buffer) "* " "")
 			       item
 			       (with-current-buffer buffer major-mode)