]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Tue, 19 Jan 2016 06:56:34 +0000 (22:56 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Tue, 19 Jan 2016 06:56:34 +0000 (22:56 -0800)
3ae7934 ; * etc/NEWS: Mark entries that don't need further treatment.
6165c36 * lisp/files.el (dir-locals--all-files): Respect absolute file-names
2ffdf15 * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
71ecd62 * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
f0b82b3 * lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
86e4513 Fix incompatbilities with MS-Windows 2000 and older
4e96521 Mention in PROBLEMS an issue with MS-Windows NT4
15c23aa Ensure 8-byte aligned memory allocation on MS-Windows 9X
39afa42 Fix tests for active region in hideif.el
05df666 Fix interactive specs in some hideif.el commands

1  2 
etc/NEWS
lisp/dired-x.el
src/w32.c
src/w32.h

diff --cc etc/NEWS
Simple merge
diff --cc lisp/dired-x.el
Simple merge
diff --cc src/w32.c
Simple merge
diff --cc src/w32.h
Simple merge