Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org
authorGlenn Morris <rgm@gnu.org>
Sun, 24 Feb 2013 19:45:17 +0000 (11:45 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 24 Feb 2013 19:45:17 +0000 (11:45 -0800)
commit1abfd3e85fa9b340699430cd9e15dd9f0073bdbe
tree7e5b3bef0d0813f0627af5da403440708b212be2
parent4b9f0b67dae95106356e2cd7c7f03622702026f2
parentc0c2eb8295bb99b6ac0bbf8c1e06b60220074a5b
Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org
doc/lispref/ChangeLog
doc/lispref/files.texi
doc/misc/ChangeLog
doc/misc/tramp.texi
etc/TODO
src/ChangeLog
src/filelock.c
src/xdisp.c