summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eldoc.el
diff options
context:
space:
mode:
authorK. Handa <handa@gnu.org>2016-01-14 21:55:43 +0900
committerK. Handa <handa@gnu.org>2016-01-14 21:55:43 +0900
commit641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch)
tree85e524c8d12caca29588382205f536b2008edc55 /lisp/emacs-lisp/eldoc.el
parent9835757013569673854b692ccbb58bfb3c3ed1f7 (diff)
parentee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff)
downloademacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz
emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.bz2
emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
-rw-r--r--lisp/emacs-lisp/eldoc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index bbc8e153f74..d5e7178b226 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -1,6 +1,6 @@
;;; eldoc.el --- Show function arglist or variable docstring in echo area -*- lexical-binding:t; -*-
-;; Copyright (C) 1996-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
;; Author: Noah Friedman <friedman@splode.com>
;; Maintainer: friedman@splode.com