upstream

3 files changed, 20 insertions, 4 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index e5900eb7410..ed9ff6f9270 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
+        of same-dir.tst, to avoid stepping on other (parallel) Make job's
+        toes.
+
+2012-03-21  Kenichi Handa  <handa@m17n.org>
+
+        * quail/indian.el ("devanagari-itrans"): Add a few more useful
+        keys (Bug#10935).
+
 2012-03-16  Kenichi Handa  <handa@m17n.org>
 
         * quail/indian.el (telugu-inscript): Fix typo.  (Bug#10936)
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 19ccaf4f62b..e9a56e79f73 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -201,13 +201,13 @@ leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
 
 install: all
         - mkdir "$(INSTALLDIR)"
-        - $(DEL) same-dir.tst
-        - $(DEL) $(INSTALL_DIR)/same-dir.tst
-        echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(DIRNAME)_same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
+        echo SameDirTest > $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
         $(IFNOTSAMEDIR) $(CP) leim-list.el $(INSTALLDIR) $(ENDIF)
         $(IFNOTSAMEDIR) $(CP_DIR) quail $(INSTALLDIR) $(ENDIF)
         $(IFNOTSAMEDIR) $(CP_DIR) ja-dic $(INSTALLDIR) $(ENDIF)
-        - $(DEL) $(INSTALL_DIR)/same-dir.tst
+        - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
 
 clean mostlyclean:
         - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index 7ffb20f6411..1c01693478b 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -56,6 +56,11 @@
 (quail-define-indian-trans-package
  indian-dev-itrans-v5-hash "devanagari-itrans" "Devanagari" "DevIT"
  "Devanagari transliteration by ITRANS method.")
+(quail-defrule "..." ?॥)
+(quail-defrule "\\'" ?॑)
+(quail-defrule "\\_" ?॒)
+(quail-defrule "\\__" ?_)
+(quail-defrule "\\''" ?')
 
 (if nil
     (quail-define-package "devanagari-kyoto-harvard" "Devanagari" "DevKH" t "Devanagari Kyoto-Harvard"))