diff options
author | Alan Mackenzie <acm@muc.de> | 2017-02-05 16:28:53 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2017-02-05 16:28:53 +0000 |
commit | d5514332d4a6092673ce1f78fadcae0c57f7be64 (patch) | |
tree | 1780337154904dcfad8ecfa76614b47c082160dd /lisp/emacs-lisp/lisp-mode.el | |
parent | cecc25c68f5a1834c356e18259aa2af402a70ce1 (diff) | |
parent | de3336051ef74e0c3069374ced5b5fc7bb9fba15 (diff) | |
download | emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.tar.gz |
Merge branch 'master' into comment-cache
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 2 |
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 |