Merge from origin/emacs-24
commit4d0108a132788e0c3903eb4d5875321ed6e8eef1
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
treed079bc14c90021591629403d42370ab9ceb453a6
parent32a2c91658bd02c4e761030f93eb5f0415524104
parenta3505cb3ef00ad3c9f886e2eb7f245845eb4c1ee
Merge from origin/emacs-24

a3505cb doc/lispref/variables.texi (Creating Buffer-Local): Improve indexing (Bug#19608)
d132c7b erc-backend.el: Give hook-name a default value of nil and add-to-list unconditionally. Fixes debbugs:19363
61cc7bf Fix support of non-ASCII frame titles on MS-Windows  (Bug#19590)
1e5902a * filenotify.el (file-notify--descriptor): Do not cons for remote files.
b1ea160 Handle watching of several files in the same directory for inotify.
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/erc/ChangeLog
lisp/net/tramp.el
src/ChangeLog
src/w32fns.c