diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 10:47:17 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 10:47:17 -0800 |
| commit | 6ddd819467d1d9d0e78f13e5a15c1af9125ae67b (patch) | |
| tree | bb6782a87dc52bed05166ac4ae458998c3418e70 /nt | |
| parent | 935fa6151b3e411c5308d62338744ff25f1a8ddb (diff) | |
| parent | a5f90a37622e9d0cb066da413846c1c3f6900b51 (diff) | |
| download | emacs-6ddd819467d1d9d0e78f13e5a15c1af9125ae67b.tar.gz | |
Merge from origin/emacs-24
a5f90a3 * .gitattributes: New file.
5a9710f Make sure tool-bar changes are reflected on display.
93796ba * autogen.sh: Port better to non-GNU 'cp'.
9758516 Fix a typo in a comment in the previous commit.
aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473)
d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out.
9278f05 Omit trailing white space
1c93fd3 Sync with Tramp 2.2.11.
96ebe18 Sync with Tramp 2.2.11.
e792450 Sync with Tramp 2.2.11.
2d17e12 Fix ChangeLog entry.
6444482 Fix auto-revert-tail-mode for remote files
b5c9c13 Spelling fixes
c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458)
Conflicts:
ChangeLog
doc/misc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 2467e64bbef..693b7adc711 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -815,7 +815,7 @@ 2012-10-01 Eli Zaretskii <eliz@gnu.org> * preprep.c (RVA_TO_PTR): Use 'unsigned char *' instead of - 'void *', for pointer arithmetics. + 'void *', for pointer arithmetic. (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET): Enclose all macro arguments in parentheses. |