Merge from emacs-23

[gnu-emacs] / lisp / cedet / ede / speedbar.el

diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 11c3bd8b7e56b5cb35559b61f156e118bcd62f91..c7ea005e6cb983e006168713febbe4e10ce91a5a 100644 (file)
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -1,7 +1,7 @@
 ;;; ede/speedbar.el --- Speedbar viewing of EDE projects
 
-;;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010, 2011
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, tags
@@ -176,10 +176,7 @@ Argument DIR is the directory from which to derive the list of objects."
     (beginning-of-line)
     (looking-at "^\\([0-9]+\\):")
     (let ((depth (string-to-number (match-string 1))))
-      (while (not (re-search-forward "[]] [^ ]"
-                                    (save-excursion (end-of-line)
-                                                    (point))
-                                    t))
+      (while (not (re-search-forward "[]] [^ ]" (point-at-eol) t))
        (re-search-backward (format "^%d:" (1- depth)))
        (setq depth (1- depth)))
       (speedbar-line-token))))
@@ -358,5 +355,4 @@ INDENT is the current indentation level."
 ;; generated-autoload-load-name: "ede/speedbar"
 ;; End:
 
-;; arch-tag: 56721fc9-8eb5-4115-8511-18cf8397ec87
 ;;; ede/speedbar.el ends here