Merge from origin/emacs-24
commitd7a89815b6d69c3b1793d34bcad8bf0aa21d48c8
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 03:59:34 +0000 (28 00:59 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 03:59:34 +0000 (28 00:59 -0300)
tree6ac62b66bd5386355c96551da34416036cf279b7
parent3a8b7013042adae3c27327a75662fd8e884d4896
parentd279e6680842b872ae3aab1fb429b1879db50f7f
Merge from origin/emacs-24

d279e66 Fix assertion violations in try_window_id (Bug#19511)
031eadc Fix dired quoting bug with "Hit`N`Hide"
5981b4b More doc fixes for bug#19502 -- make documentation less X-specific.
143516c src/emacs.c (syms_of_emacs) <system-configuration>: Doc fix.  (Bug#19502)
doc/lispref/ChangeLog
doc/lispref/frames.texi
lisp/ChangeLog
lisp/files.el
src/ChangeLog
src/emacs.c
src/w32fns.c
src/xdisp.c
src/xfns.c