[Emacs-diffs] /srv/bzr/emacs/trunk r107551: Fix speedbar highlighting bug.

[Chong Yidong]

------------------------------------------------------------
revno: 107551
fixes bug(s): http://debbugs.gnu.org/10275
author: Martin Rudalics <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-03-10 15:58:54 +0800
message:
  Fix speedbar highlighting bug.
  
  * lisp/speedbar.el (speedbar-unhighlight-one-tag-line): Avoid
  unhighlighting due to frame switching.
modified:
  lisp/ChangeLog
  lisp/speedbar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-10 07:08:51 +0000
+++ b/lisp/ChangeLog    2012-03-10 07:58:54 +0000
@@ -1,3 +1,8 @@
+2012-03-10  Martin Rudalics  <address@hidden>
+
+       * speedbar.el (speedbar-unhighlight-one-tag-line): Avoid
+       unhighlighting due to frame switching (Bug#10275).
+
 2012-03-10  Chong Yidong  <address@hidden>
 
        * minibuffer.el (completion-in-region, completion-help-at-point):

=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el  2012-01-19 07:21:25 +0000
+++ b/lisp/speedbar.el  2012-03-10 07:58:54 +0000
@@ -3987,11 +3987,11 @@
 
 (defun speedbar-unhighlight-one-tag-line ()
   "Unhighlight the currently highlighted line."
-  (if speedbar-highlight-one-tag-line
-      (progn
-       (speedbar-delete-overlay speedbar-highlight-one-tag-line)
-       (setq speedbar-highlight-one-tag-line nil)))
-  (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line))
+  (when (and speedbar-highlight-one-tag-line
+            (not (eq this-command 'handle-switch-frame)))
+    (speedbar-delete-overlay speedbar-highlight-one-tag-line)
+    (setq speedbar-highlight-one-tag-line nil)
+    (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line)))
 
 (defun speedbar-recenter-to-top ()
   "Recenter the current buffer so point is on the top of the window."