HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
startup.el
diff --git
a/lisp/startup.el
b/lisp/startup.el
index
6a207ba
..
5406c0f
100644
(file)
--- a/
lisp/startup.el
+++ b/
lisp/startup.el
@@
-1,6
+1,7
@@
;;; startup.el --- process Emacs shell arguments -*- lexical-binding: t -*-
;;; startup.el --- process Emacs shell arguments -*- lexical-binding: t -*-
-;; Copyright (C) 1985-1986, 1992, 1994-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1992, 1994-2013 Free Software Foundation,
+;; Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal