diff options
| author | Eli Zaretskii | 2013-03-30 20:37:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-30 20:37:57 +0300 |
| commit | f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b (patch) | |
| tree | 48e20bfab4262d7171593d4ef98309ae717c1cb6 /ChangeLog | |
| parent | 7c4026b6ad03974a55a175af17c8e76c61931b69 (diff) | |
| parent | 119b2d43cc40759394cae256c0a38624cacbf776 (diff) | |
| download | emacs-f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b.tar.gz emacs-f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b.zip | |
Merge from trunk.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 27 |
1 files changed, 5 insertions, 22 deletions
| @@ -1,22 +1,15 @@ | |||
| 1 | 2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz> | 1 | 2013-03-30 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * etc/NEWS: Added entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz | 3 | Merge from gnulib, incorporating: |
| 4 | 2013-03-29 stdalign: port to stricter ISO C11 | ||
| 5 | This helps to run 'configure' on MS-Windows; see Eli Zaretskii in | ||
| 6 | <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>. | ||
| 4 | 7 | ||
| 5 | 2013-03-27 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2013-03-27 Paul Eggert <eggert@cs.ucla.edu> |
| 6 | 9 | ||
| 7 | * configure.ac (HAVE_XKBGETKEYBOARD): Remove. | 10 | * configure.ac (HAVE_XKBGETKEYBOARD): Remove. |
| 8 | Subsumed by HAVE_XKB. All uses changed. | 11 | Subsumed by HAVE_XKB. All uses changed. |
| 9 | 12 | ||
| 10 | 2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz> | ||
| 11 | |||
| 12 | * lisp/eshell/em-unix.el: Moved su and sudo to... | ||
| 13 | * lisp/eshell/em-tramp.el: ...Eshell tramp module | ||
| 14 | * doc/misc/eshell.texi: Updated manual to reflect changes. | ||
| 15 | |||
| 16 | External su and sudo commands are now the default; the internal, | ||
| 17 | TRAMP-using variants can still be used by enabling the eshell-tramp | ||
| 18 | module. | ||
| 19 | |||
| 20 | 2013-03-25 Jan Djärv <jan.h.d@swipnet.se> | 13 | 2013-03-25 Jan Djärv <jan.h.d@swipnet.se> |
| 21 | 14 | ||
| 22 | * configure.ac (HAVE_XKB): Define if Xkb is present. | 15 | * configure.ac (HAVE_XKB): Define if Xkb is present. |
| @@ -90,11 +83,6 @@ | |||
| 90 | not always needed. | 83 | not always needed. |
| 91 | (HAVE_DATA_START): New macro. | 84 | (HAVE_DATA_START): New macro. |
| 92 | 85 | ||
| 93 | 2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz> | ||
| 94 | |||
| 95 | * lisp/eshell/em-cmpl.el: Corrected "context-related help" | ||
| 96 | keybinding in commentary. | ||
| 97 | |||
| 98 | 2013-02-21 Paul Eggert <eggert@cs.ucla.edu> | 86 | 2013-02-21 Paul Eggert <eggert@cs.ucla.edu> |
| 99 | 87 | ||
| 100 | Parallelize documentation builds. | 88 | Parallelize documentation builds. |
| @@ -107,11 +95,6 @@ | |||
| 107 | (info-real): Depend on $(INFOS) rather than doing it sequentially. | 95 | (info-real): Depend on $(INFOS) rather than doing it sequentially. |
| 108 | (dvi): Depend on $(DVIS) rather than doing it sequentially. | 96 | (dvi): Depend on $(DVIS) rather than doing it sequentially. |
| 109 | 97 | ||
| 110 | 2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz> | ||
| 111 | |||
| 112 | * doc/misc/eshell.texi: Added documentation for Eshell insert | ||
| 113 | output redirection operator, >>>. | ||
| 114 | |||
| 115 | 2013-02-15 Paul Eggert <eggert@cs.ucla.edu> | 98 | 2013-02-15 Paul Eggert <eggert@cs.ucla.edu> |
| 116 | 99 | ||
| 117 | Fix AIX port (Bug#13650). | 100 | Fix AIX port (Bug#13650). |