(speedbar-recenter): Typo, and fix logic.

(speedbar-expand-line): Make arg optional.
(speedbar-mode): Avoid a compiler warning.

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 2bd71901c9e532e2f524ef411e728e93b3ef0b6d..b5c2980ac558c9c0dbbe5c19e110c0197eb444e3 100644 (file)
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1273,13 +1273,10 @@ in the selected file.
     (toggle-read-only 1)
     (speedbar-set-mode-line-format)
     (if speedbar-xemacsp
-       (progn
-         (make-local-variable 'mouse-motion-handler)
-         (setq mouse-motion-handler 'speedbar-track-mouse-xemacs))
+       (set (make-local-variable 'mouse-motion-handler)
+            'speedbar-track-mouse-xemacs)
       (if speedbar-track-mouse-flag
-         (progn
-           (make-local-variable 'track-mouse)
-           (setq track-mouse t)))      ;this could be messy.
+         (set (make-local-variable 'track-mouse) t))   ;this could be messy.
       (setq auto-show-mode nil))       ;no auto-show for Emacs
     (run-hooks 'speedbar-mode-hook))
   (speedbar-update-contents)
@@ -3397,7 +3394,7 @@ directory with these items."
          nil))
       (speedbar-do-function-pointer)))
 
-(defun speedbar-expand-line (arg)
+(defun speedbar-expand-line (&optional arg)
   "Expand the line under the cursor.
 With universal argument ARG, flush cached data."
   (interactive "P")
@@ -4105,7 +4102,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
 
 (defun speedbar-recenter ()
   "Recenter the current buffer so POINT is in the center of the window."
-  (recenter (window-hight (/ (selected-window) 2))))
+  (recenter (/ (window-height (selected-window)) 2)))
 
 \f
 ;;; Color loading section.