Merge from trunk.

5 files changed, 51 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92324036dc5..ec867fee08b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-27  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-internal): Accept cons cell HIST arg.
+
 2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/dbus.el (dbus-unregister-object): Don't release services for
@@ -9,6 +13,13 @@
         function that picks between cfengine 2 and 3 support
         automatically.  Update docs accordingly.
 
+2011-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * language/ind-util.el (indian-tml-base-table): Add TAMIL DIGIT
+        ZERO.
+        (indian-itrans-v5-table-for-tamil): New variable.
+        (indian-tml-itrans-v5-hash): Use the above variable (Bug#9336).
+
 2011-09-22  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el (allout-this-command-hid-stuff): Buffer-local variable
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ab324b7cd8b..c535f4a9549 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
+        documentation.
+
 2011-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-wait-for-response): Message less (bug#9540).
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index ab78e508480..340c7255958 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -80,9 +80,10 @@
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.
-If nil, query user only when `plstore-encrypt-to' is not set.
-If neither t nor nil, doesn't ask user.  In this case, symmetric
-encryption is used."
+If nil, query user only when a file's default recipients are not
+known (i.e. `plstore-encrypt-to' is not locally set in the buffer
+visiting a plstore file).
+If neither t nor nil, doesn't ask user."
   :type '(choice (const :tag "Ask always" t)
                  (const :tag "Ask when recipients are not set" nil)
                  (const :tag "Don't ask" silent))
@@ -90,7 +91,8 @@ encryption is used."
 
 (defvar plstore-encrypt-to nil
   "*Recipient(s) used for encrypting secret entries.
-May either be a string or a list of strings.")
+May either be a string or a list of strings.  If it is nil,
+symmetric encryption will be used.")
 
 (put 'plstore-encrypt-to 'safe-local-variable
      (lambda (val)
diff --git a/lisp/ido.el b/lisp/ido.el
index 4086000e3e9..46ac5784d0e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1826,7 +1826,7 @@ This function also adds a hook to the minibuffer."
 ;;       e.g. the file name may be ignored or joined with ido-current-directory, and
 ;;       the relevant function is called (find-file, write-file, etc).
 
-(defun ido-read-internal (item prompt history &optional default require-match initial)
+(defun ido-read-internal (item prompt hist &optional default require-match initial)
   "Perform the `ido-read-buffer' and `ido-read-file-name' functions.
 Return the name of a buffer or file selected.
 PROMPT is the prompt to give to the user.
@@ -1984,7 +1984,7 @@ If INITIAL is non-nil, it specifies the initial input string."
                 (read-from-minibuffer (ido-make-prompt item prompt)
                                       (prog1 ido-text-init
                                         (setq ido-text-init nil))
-                                      ido-completion-map nil history))))
+                                      ido-completion-map nil hist))))
       (ido-trace "read-from-minibuffer" ido-final-text)
       (if (get-buffer ido-completion-buffer)
           (kill-buffer ido-completion-buffer))
@@ -2155,7 +2155,12 @@ If INITIAL is non-nil, it specifies the initial input string."
 
          (t
           (setq done t))))))
-    (add-to-history (or history 'minibuffer-history) ido-selected)
+    (add-to-history (cond
+                     ((consp hist)
+                      (or (car hist) 'minibuffer-history))
+                     (hist hist)
+                     (t 'minibuffer-history))
+                    ido-selected)
     ido-selected))
 
 (defun ido-edit-input ()
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 56893af1479..0e548420383 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -271,7 +271,7 @@
     (;; Misc Symbols
      nil ?$,1<"(B ?$,1<#(B nil ?$,1<m(B nil nil)
     (;; Digits
-     nil ?$,1='(B ?$,1=((B ?$,1=)(B ?$,1=*(B ?$,1=+(B ?$,1=,(B ?$,1=-(B ?$,1=.(B ?$,1=/(B)
+     ?$,1=&(B ?$,1='(B ?$,1=((B ?$,1=)(B ?$,1=*(B ?$,1=+(B ?$,1=,(B ?$,1=-(B ?$,1=.(B ?$,1=/(B)
     (;; Inscript-extra (4)  (#, $, ^, *, ])
      "$,1<m<P(B" "$,1<P<m(B" "$,1<D<m<P(B" nil nil)))
 
@@ -305,6 +305,25 @@
     (;; misc -- 7
      ".N" (".n" "M") "H" ".a" ".h" ("AUM" "OM") "..")))
 
+(defvar indian-itrans-v5-table-for-tamil
+  '(;; for encode/decode
+    (;; vowels -- 18
+     "a" ("aa" "A") "i" ("ii" "I") "u" ("uu" "U")
+     ("RRi" "R^i") ("LLi" "L^i") (".c" "e.c") "E" "e" "ai"
+     "o.c"  "O"   "o"   "au"  ("RRI" "R^I") ("LLI" "L^I"))
+    (;; consonants -- 40
+     "k"   "kh"  "g"   "gh"  ("~N" "N^")
+     "ch" ("Ch" "chh") "j" "jh" ("~n" "JN")
+     "T"   "Th"  "D"   "Dh"  "N"
+     "t"   "th"  "d"   "dh"  "n"   "nh"
+     "p"   "ph"  "b"   "bh"  "m"
+     "y"   "r"   "rh"  "l"   ("L" "ld") ("J" "z")  ("v" "w")
+     "sh" ("Sh" "shh") "s" "h"
+     "q" "K" "G" nil ".D" ".Dh" "f" ("Y" "yh")
+     ("GY" "dny") "x")
+    (;; misc -- 7
+     ".N" (".n" "M") "H" ".a" ".h" ("AUM" "OM") "..")))
+
 (defvar indian-kyoto-harvard-table
   '(;; for encode/decode
     (;; vowel
@@ -508,7 +527,7 @@
 
 (defvar indian-tml-itrans-v5-hash
   (indian-make-hash indian-tml-base-table
-                          indian-itrans-v5-table))
+                          indian-itrans-v5-table-for-tamil))
 )
 
 (defmacro indian-translate-region (from to hashtable encode-p)