diff options
| author | Paul Eggert | 2017-01-01 01:10:47 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-01 01:10:47 -0800 |
| commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
| tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /lisp/shell.el | |
| parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
| parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
| download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip | |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index cabd1e5a474..133771aeb32 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*- | 1 | ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1988, 1993-1997, 2000-2016 Free Software Foundation, | 3 | ;; Copyright (C) 1988, 1993-1997, 2000-2017 Free Software Foundation, |
| 4 | ;; Inc. | 4 | ;; Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Olin Shivers <shivers@cs.cmu.edu> | 6 | ;; Author: Olin Shivers <shivers@cs.cmu.edu> |