Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

[gnu-emacs] / leim / ChangeLog

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 292097559fab95604b04a7fed18b1946db0f9f6e..7334fa991c9f94907a7fafe1f57d6ba37434d8d2 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,7 +1,34 @@
-2011-02-23  Juanma Barranquero  <lekktu@gmail.com>
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
 
        * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
 
+2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Redo spelling of Makefile variables to conform to POSIX.
+       POSIX does not allow "-" in Makefile variable names.
+       Reported by Bruno Haible in
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+       * Makefile.in (BUILT_EMACS): Renamed from BUILT-EMACS.
+       (TIT_GB): Renamed from TIT-GB.
+       (CHINESE_TIT): Renamed from CHINESE-TIT.
+       (NON_TIT_GB): Renamed from NON-TIT-GB.
+       (NON_TIT_BIG5): Renamed from NON-TIT-BIG5.
+       (CHINESE_NON_TIT): Renamed from CHINESE-NON-TIT.
+       (CHINESE_GB): Renamed from CHINESE-GB.
+       (CHINESE_BIG5): Renamed from CHINESE-BIG5.
+       (TIT_MISC): Renamed from TIT-MISC.
+       (NON_TIT_MISC): Renamed from NON-TIT-MISC.
+       (TIT_SOURCES): Renamed from TIT-SOURCES.
+       (MISC_SOURCES): Renamed from MISC-SOURCES.
+
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+       * makefile.w32-in (RUN_EMACS):
+       * Makefile.in (RUN-EMACS): Add --no-site-lisp.
+
+       * makefile.w32-in (RUN_EMACS):
+       * Makefile.in (RUN-EMACS): -batch implies --no-init-file.
+
 2010-08-28  Kenichi Handa  <handa@m17n.org>
 
        * quail/japanese.el (quail-japanese-update-translation):
@@ -29,6 +56,10 @@
 
        * quail/greek.el ("greek"): Add rules for Greek style quotes.
 
+2010-05-15  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install): Remove references to CVS-related files.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.2 released.
@@ -37,6 +68,24 @@
 
        * quail/vntelex.el: Fix "af" rule (Bug#5836).
 
+2010-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in ($(TIT), $(MISC_DIC), leim-list.el): Enclose the
+       argument of "-l" in $(ARGQUOTE), in case it includes blanks or
+       other special characters.
+
+2010-03-18  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (maintainer-clean): Use bootstrap-clean.
+       (extraclean): Fix deletion patterns.
+
+       * Makefile.in (dot): Remove, since ../ is used throughout the
+       other Makefiles.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
+
 2010-02-16  Kenichi Handa  <handa@m17n.org>
 
        * SKK-DIC/SKK-JISYO.L: Updated to the latest version.
@@ -1198,7 +1247,7 @@
 
 2001-03-31  Kenichi Handa  <handa@etl.go.jp>
 
-       * Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc
+       * Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc.
        (NON-TIT-BIG5): Delete ${srcdir}/quail/quick-b5.elc
        ${srcdir}/quail/tsang-b5.elc.
        (CHINESE-NON-TIT): Delete ${NON-TIT-CNS}.
@@ -2080,11 +2129,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-       2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 1997-1999, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -2100,5 +2147,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 4b364045-a476-4ff7-92ad-dde58dbd45b4