summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorNickolas Lloyd <ultrageek.lloyd@gmail.com>2017-02-01 20:28:55 -0500
committerNickolas Lloyd <ultrageek.lloyd@gmail.com>2017-02-01 20:28:55 -0500
commit3dcb25deaefb52c9d314c4eddb93a3a815a58ec0 (patch)
tree4abdced92049dcfb25576ffe16a708b1d680a1d0 /lisp/emacs-lisp/lisp-mode.el
parent3ccffad606386a9344b592cb35bda9c5a1714242 (diff)
parentf3c77d11af65f3b319b1784b4c3cf08c51aa7997 (diff)
downloademacs-3dcb25deaefb52c9d314c4eddb93a3a815a58ec0.tar.gz
Merge branch 'master' into nick.lloyd-bytecode-jit
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index a277d7a6680..d720e0bc573 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,6 +1,6 @@
;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands -*- lexical-binding:t -*-
-;; Copyright (C) 1985-1986, 1999-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1999-2017 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
;; Keywords: lisp, languages