Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

[gnu-emacs] / lisp / expand.el

diff --git a/lisp/expand.el b/lisp/expand.el
index 14bc210232cc04bda2cdae59dd46763bbd7b1d12..544d0b1cb177708054656e6fa248425ef37b4c50 100644 (file)
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -1,7 +1,6 @@
 ;;; expand.el --- make abbreviations more usable
 
-;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
 ;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
@@ -470,7 +469,6 @@ This is used only in conjunction with `expand-add-abbrevs'."
                      (beginning-of-defun)
                      (point))
                    (point-min)))
-          (here (point))
           (state (parse-partial-sexp lim (point))))
       (cond
        ((nth 3 state) 'string)
@@ -504,5 +502,4 @@ This is used only in conjunction with `expand-add-abbrevs'."
 ;; run load hooks
 (run-hooks 'expand-load-hook)
 
-;; arch-tag: fee53e9e-30e3-4ef3-b191-9785e1f8e885
 ;;; expand.el ends here