Merge from emacs-23

This commit is contained in:
Stefan Monnier 2011-01-14 12:18:41 -05:00
commit 77ab81d054
1937 changed files with 2344 additions and 2348 deletions

View file

@ -1,7 +1,7 @@
;;; eldoc.el --- show function arglist or variable docstring in echo area
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Noah Friedman <friedman@splode.com>
;; Maintainer: friedman@splode.com