merge from trunk; clean up some issues

1 files changed, 73 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 25ce7c0f9e4..ac6031fa205 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,76 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * grammars/srecode-template.wy (variable): Accept a single number
+        as a variable value.  Allows the 'priority' to be set to a number.
+        (wisent-srecode-template-lexer): Move number up so it can be
+        created.
+
+2013-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-cus-load-groups): New function.
+        (cus-test-get-options): Add option to return groups.
+        (cus-test-noloads): Also check custom groups.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * quick-install-emacs: Don't prune DOC-* files a any more.
+
+2013-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
+        (cus-test-libs): Fix let-binding of default-directory.
+        (cus-test-noloads): Load all libs for the comparison.
+
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add a few more files.
+        (cus-test-load-libs, cus-test-opts):
+        Add option to load more/all Lisp files.
+        (cus-test-get-lisp-files): Ignore .*.el files.
+
+2013-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add some files.
+        (cus-test-get-lisp-files): New function.
+        (cus-test-libs): Add option to load more/all Lisp files.
+
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el: No need to provide bbdb, bbdb-com any more.
+        (cus-test-libs-noloads): Add dunnet in the defvar.
+        (dunnet): Don't always load it.
+        (viper-mode): Only set if interactive.
+        (cus-test-load-custom-loads): Load dunnet if necessary.
+        (cus-test-load-1): New macro, with common code from cus-test-load-libs
+        and cus-test-libs.
+        (cus-test-load-libs, cus-test-libs): Use cus-test-load-1 macro.
+        Update for cus-test-get-autoload-deps changed result.
+        (cus-test-get-autoload-deps): Simplify.  Return file names as they
+        appear in loaddefs.el (directory parts are needed now that not all
+        lisp subdirs are in load-path).
+        (cus-test-deps): Explicitly skip dunnet.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        * merge-gnulib (GNULIB_MODULES): Add qacl.
+        (GNULIB_TOOL_FLAGS): Do not avoid errno.
+
+2013-04-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use UTF-8 for most files with non-ASCII characters (Bug#13936).
+        * notes/unicode (etc/tutorials/TUTORIAL.ko, leim/quail/hanja.el)
+        (leim/quail/hanja3.el, leim/quail/symbol-ksc.el):
+        Now utf-8, not iso-2022-7bit.  Also, files that contain non-UTF-8
+        characters are now encoded in utf-8-emacs, not iso-2022-7bit.
+
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
+
+        Automate the build of ja-dic.el (Bug#13984).
+        * notes/unicode: ja-dic.el is now UTF-8.
+
 2013-03-16  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.