Merge from emacs-24
commit4fda400e58339cdf962b5679bf05ebe62c6189c5
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:30:09 +0000 (5 15:30 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:30:09 +0000 (5 15:30 -0500)
tree8588108b9046f7ec6747112cd30509466ea49459
parent0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7
parentc1c2cee7c5ae1eff6edb198814423e55cb11cc73
Merge from emacs-24
.gitignore
ChangeLog
lisp/ChangeLog
lisp/progmodes/sh-script.el
lisp/simple.el
src/ChangeLog
src/eval.c
src/nsfns.m
src/nsterm.h
src/nsterm.m