diff options
| author | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
| commit | eed18bf1fd1162872e196091ab795a773f277e8e (patch) | |
| tree | f3fee81f1e7fdf23b57138740437e07ce244ede8 /lib-src | |
| parent | 8a85c254de2528be0f3ff154fa24df65e6557c1a (diff) | |
| parent | 1fc82d89a8a603754d17a35be1ce78e66d0b6fd6 (diff) | |
| download | emacs-eed18bf1fd1162872e196091ab795a773f277e8e.tar.gz emacs-eed18bf1fd1162872e196091ab795a773f277e8e.zip | |
Merge from emacs-24
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d741ffdba7e..0093abe5c0c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -7739,7 +7739,7 @@ | |||
| 7739 | (consider_token): DEFUNs now treated like funcs in ctags mode. | 7739 | (consider_token): DEFUNs now treated like funcs in ctags mode. |
| 7740 | 7740 | ||
| 7741 | * etags.c (LEVEL_OK_FOR_FUNCDEF): Remove. | 7741 | * etags.c (LEVEL_OK_FOR_FUNCDEF): Remove. |
| 7742 | (C_entries): Optimized the test that used LEVEL_OK_FOR_FUNCDEF. | 7742 | (C_entries): Optimize the test that used LEVEL_OK_FOR_FUNCDEF. |
| 7743 | (C_entries): Remove a piece of useless code. | 7743 | (C_entries): Remove a piece of useless code. |
| 7744 | (C_entries): Making typedef tags is delayed until a semicolon | 7744 | (C_entries): Making typedef tags is delayed until a semicolon |
| 7745 | is met. This handles "typedef int X, Y, Z;" correctly. | 7745 | is met. This handles "typedef int X, Y, Z;" correctly. |
| @@ -8139,7 +8139,7 @@ | |||
| 8139 | * Makefile.in (prefix, bindir, libdir, srcdir): New variables, as | 8139 | * Makefile.in (prefix, bindir, libdir, srcdir): New variables, as |
| 8140 | described in the top-level Makefile. | 8140 | described in the top-level Makefile. |
| 8141 | (UTILITIES): Add make-path to the list of utility programs. | 8141 | (UTILITIES): Add make-path to the list of utility programs. |
| 8142 | (../arch-lib): Replaced by the ${archlibdir} target, which places | 8142 | (../arch-lib): Replace by the ${archlibdir} target, which places |
| 8143 | the executables in their permanent home. | 8143 | the executables in their permanent home. |
| 8144 | (install, install.sysv, install.xenix): Consolidated into one | 8144 | (install, install.sysv, install.xenix): Consolidated into one |
| 8145 | target which should work under all circumstances, modulo a few | 8145 | target which should work under all circumstances, modulo a few |