Source

ecb / ecb-navigate.el

Diff from to

ecb-navigate.el

-;;; ecb-navigate.el --- 
+;;; ecb-navigate.el --- Browser-navigation for ECB
 
-;; Copyright (C) 2001 by Free Software Foundation, Inc.
+;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
+;;                           Klaus Berndl,
+;;                           Kevin A. Burton,
+;;                           Free Software Foundation, Inc.
 
 ;; Author: Jesper Nordenberg <mayhem@home.se>
-;; Keywords: 
+;;         Klaus Berndl <klaus.berndl@sdm.de>
+;;         Kevin A. Burton <burton@openprivacy.org>
+;; Maintainer: Klaus Berndl <klaus.berndl@sdm.de>
+;;             Kevin A. Burton <burton@openprivacy.org>
+;; Keywords: browser, code, programming, tools
+;; Created: 2001
 
-;; This file is part of GNU Emacs.
+;; This program is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free Software
+;; Foundation; either version 2, or (at your option) any later version.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; This program is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+;; details.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; You should have received a copy of the GNU General Public License along with
+;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ;; $Id$
 
 ;; Klaus Berndl <klaus.berndl@sdm.de>: Changed this class from storing the
 ;; whole token to storing explicitly the token-buffer, the marker of the
 ;; token-start, the marker of the token-end. This prevents the stored
-;; navigation-items from getting invalid und unuseable after a full
-;; semantic-reparse because such a reparse makes the overlays containd in the
+;; navigation-items from getting invalid and unusable after a full
+;; semantic-reparse because such a reparse makes the overlays contained in the
 ;; stored tokens invalid so we can not uses their informations.
 (defclass ecb-nav-token-history-item (ecb-nav-history-item)
   ((token-buffer :initarg :token-buffer :initform nil); :protection :private)
         (tok-start (ecb-nav-get-token-start item))
         (tok-end (ecb-nav-get-token-end item)))
     (set-window-buffer (selected-window) tok-buffer)
-    (widen)
+    (ecb-with-original-basic-functions
+     (widen))
     (goto-char tok-start)
     (when (ecb-nav-get-narrow item)
-      (narrow-to-region (ecb-line-beginning-pos) tok-end))
+      (narrow-to-region (ecb-line-beginning-pos) tok-end)
+      (setq ecb-buffer-narrowed-by-ecb t))
     (goto-char (+ tok-start (ecb-nav-get-pos item)))
     (set-window-start (selected-window)
                       (+ tok-start (ecb-nav-get-window-start item)))))