[Emacs-diffs] Changes to emacs/lisp/speedbar.el

[Nick Roberts]

Index: emacs/lisp/speedbar.el
diff -c emacs/lisp/speedbar.el:1.72 emacs/lisp/speedbar.el:1.73
*** emacs/lisp/speedbar.el:1.72 Sun Oct  9 15:49:52 2005
--- emacs/lisp/speedbar.el      Mon Oct 17 21:10:48 2005
***************
*** 1106,1112 ****
           (or (not dframe-xemacsp)
               (with-no-warnings
                 (specifier-instance has-modeline-p)))
!          speedbar-buffer)      (save-excursion
        (set-buffer speedbar-buffer)
        (let* ((w (or (speedbar-frame-width) 20))
               (p1 "<<")
--- 1106,1113 ----
           (or (not dframe-xemacsp)
               (with-no-warnings
                 (specifier-instance has-modeline-p)))
!          speedbar-buffer)
!       (save-excursion
        (set-buffer speedbar-buffer)
        (let* ((w (or (speedbar-frame-width) 20))
               (p1 "<<")
***************
*** 1677,1685 ****
      (speedbar-make-button start (point) face mouse function token))
    (let ((start (point)))
      (insert "\n")
!     (put-text-property start (point) 'face nil)
!     (put-text-property start (point) 'invisible nil)
!     (put-text-property start (point) 'mouse-face nil)))
  
  (defun speedbar-insert-separator (text)
    "Insert a separation label of TEXT.
--- 1678,1685 ----
      (speedbar-make-button start (point) face mouse function token))
    (let ((start (point)))
      (insert "\n")
!     (add-text-properties
!      start (point) '(face nil invisible nil mouse-face nil))))
  
  (defun speedbar-insert-separator (text)
    "Insert a separation label of TEXT.
***************
*** 1698,1710 ****
    "Create a button from START to END, with FACE as the display face.
  MOUSE is the mouse face.  When this button is clicked on FUNCTION
  will be run with the TOKEN parameter (any Lisp object)"
!   (put-text-property start end 'face face)
!   (put-text-property start end 'mouse-face mouse)
    (if speedbar-use-tool-tips-flag
        (put-text-property start end 'help-echo #'dframe-help-echo))
-   (put-text-property start end 'invisible nil)
-   (put-text-property start end 'speedbar-text
-                    (buffer-substring-no-properties start end))
    (if function (put-text-property start end 'speedbar-function function))
    (if token (put-text-property start end 'speedbar-token token))
    ;; So far the only text we have is less that 3 chars.
--- 1698,1708 ----
    "Create a button from START to END, with FACE as the display face.
  MOUSE is the mouse face.  When this button is clicked on FUNCTION
  will be run with the TOKEN parameter (any Lisp object)"
!   (add-text-properties
!    start end `(face ,face mouse-face ,mouse invisible nil
!                speedbar-text ,(buffer-substring-no-properties start end)))
    (if speedbar-use-tool-tips-flag
        (put-text-property start end 'help-echo #'dframe-help-echo))
    (if function (put-text-property start end 'speedbar-function function))
    (if token (put-text-property start end 'speedbar-token token))
    ;; So far the only text we have is less that 3 chars.
***************
*** 2455,2464 ****
        (set-buffer speedbar-buffer)
        (speedbar-with-writable
          (erase-buffer)
!         (while funclst
            (setq default-directory cbd)
!           (funcall (car funclst) cbd 0)
!           (setq funclst (cdr funclst)))
        (speedbar-reconfigure-keymaps)
        (goto-char (point-min)))
        ))))
--- 2453,2461 ----
        (set-buffer speedbar-buffer)
        (speedbar-with-writable
          (erase-buffer)
!         (dolist (func funclst)
            (setq default-directory cbd)
!           (funcall func cbd 0))
        (speedbar-reconfigure-keymaps)
        (goto-char (point-min)))
        ))))
***************
*** 2535,2544 ****
                            speedbar-shown-directories))
                 (insert (cdr cache)))
                (t
!                (while funclst
!                  (setq default-directory cbd)
!                  (funcall (car funclst) cbd 0)
!                  (setq funclst (cdr funclst))))))
        (goto-char (point-min)))))
    (speedbar-reconfigure-keymaps))
  
--- 2532,2540 ----
                            speedbar-shown-directories))
                 (insert (cdr cache)))
                (t
!         (dolist (func funclst)
!           (setq default-directory cbd)
!           (funcall func cbd 0)))))
        (goto-char (point-min)))))
    (speedbar-reconfigure-keymaps))
  
***************
*** 2561,2571 ****
              speedbar-shown-directories nil))
        ;; Now fill in the buffer with our newly found specialized list.
        (speedbar-with-writable
!       (while funclst
!         ;; We do not erase the buffer because these functions may
!         ;; decide NOT to update themselves.
!         (funcall (car funclst) specialbuff)
!         (setq funclst (cdr funclst))))
  
        (goto-char (point-min))))
    (speedbar-reconfigure-keymaps))
--- 2557,2566 ----
              speedbar-shown-directories nil))
        ;; Now fill in the buffer with our newly found specialized list.
        (speedbar-with-writable
!         (dolist (func funclst)
!           ;; We do not erase the buffer because these functions may
!           ;; decide NOT to update themselves.
!           (funcall func specialbuff)))
  
        (goto-char (point-min))))
    (speedbar-reconfigure-keymaps))
***************
*** 3822,3827 ****
--- 3817,3823 ----
      ["Contract File Tags" speedbar-contract-line
       (save-excursion (beginning-of-line)
                     (looking-at "[0-9]+: *.-. "))]
+     "----"
      ["Kill Buffer" speedbar-buffer-kill-buffer
       (save-excursion (beginning-of-line)
                     (looking-at "[0-9]+: *.[-+?]. "))]