Merge from emacs-24; up to 117687
commit5d515123f188957846bd72e3fad82716e29e7df5
authorGlenn Morris <rgm@gnu.org>
Sat, 8 Nov 2014 18:21:38 +0000 (8 10:21 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 8 Nov 2014 18:21:38 +0000 (8 10:21 -0800)
tree6b8c4631a29fe6a7a997a758e9948eecb72f8409
parent19b3df8f46160300334ae51617b77334ef670246
parentd1a20b0996691290581bdea11e31fb9154c75b81
Merge from emacs-24; up to 117687
doc/misc/eww.texi
lisp/ChangeLog
lisp/emulation/cua-base.el
lisp/files.el
lisp/progmodes/cc-fonts.el
src/ChangeLog
src/callproc.c
src/dired.c
src/nsterm.m
src/syntax.c
src/xgselect.c