Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org
authorGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 02:37:57 +0000 (18:37 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 3 Jan 2013 02:37:57 +0000 (18:37 -0800)
commit0a8bf3afca415fec94742cf830622b22f186062c
tree7ca943a0622ea184e1a9dc97d31509d063e138b5
parent2036b4b8e075479ea5333689e299183b9c2f3ebb
parent75e78d1e904bde7eae13b78202f99081543701dc
Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org
16 files changed:
configure.ac
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/man/emacs.1
doc/man/etags.1
doc/misc/wisent.texi
lisp/ChangeLog
lisp/calc/README
lisp/emacs-lisp/byte-run.el
lisp/net/tramp-sh.el
lisp/subr.el
msdos/sed2v2.inp
nt/config.nt
nt/emacs.rc
nt/emacsclient.rc
src/fns.c