[Emacs-diffs] master b76885f 01/15: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit b76885f1dadf419fc9eb3f5f10ea5550b6e06a1a
Merge: 92e5b41 26d4da0
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    26d4da0 New input method "probhat" for Bengali
    4f445bf ; Spelling fix
    f403f03 ; Fix typo
---
 etc/AUTHORS               |    2 +-
 etc/NEWS                  |    4 +-
 lisp/leim/quail/indian.el |  101 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/etc/AUTHORS b/etc/AUTHORS
index dc5a28e..721f0d5 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -533,7 +533,7 @@ Brian Jenkins: changed frame.c frames.texi hooks.texi
 
 Brian Marick: co-wrote hideif.el
 
-Brian Mckenna: changed eww.el
+Brian McKenna: changed eww.el
 
 Brian Palmer: changed erc.el erc-list.el
 
diff --git a/etc/NEWS b/etc/NEWS
index fadf4c2..f845c1d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -808,7 +808,7 @@ random values; in particular, the Emacs server now uses 
this facility
 to produce its authentication key.
 
 ---
-** New input methods: 'tamil-dvorak' and 'programmer-dvorak'.
+** New input methods: 'tamil-dvorak', 'programmer-dvorak' and 'probhat'.
 
 
 * Editing Changes in Emacs 25.1
@@ -928,7 +928,7 @@ recommended to do this as soon as you have firmly upgraded 
to Emacs
 to version 206, you can do this with 'C-u C-u M-x desktop-save'.
 
 ---
-*** desktop-restore-in-current-display now defaults to t, not nil.
+*** 'desktop-restore-in-current-display' now defaults to t, not nil.
 That is, Emacs by default now restores frames into the current display.
 
 +++
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index 1c92f6b..d9438a2 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -470,4 +470,105 @@ Full key sequences are listed below:")
  "tamil-inscript" "Tamil" "TmlIS"
  "Tamil keyboard Inscript.")
 
+;; Probhat Input Method
+(quail-define-package
+ "probhat" "Bengali-probhat" "probhat" t
+ "Porbhat for Bangla" nil t nil nil nil nil nil nil nil nil t)
+
+(quail-define-rules
+  ("!" ?!)
+  ("1" ?১)
+  ("@" ?@)
+  ("2" ?২)
+  ("#" ?#)
+  ("3" ?৩)
+  ("$" ?৳)
+  ("4" ?৪)
+  ("%" ?%)
+  ("5" ?৫)
+  ("^" ?^)
+  ("6" ?৬)
+  ("&" ?ঞ)
+  ("7" ?৭)
+  ("*" ?ৎ)
+  ("8" ?৮)
+  ("(" ?\()
+  ("9" ?৯)
+  (")" ?\))
+  ("0" ?০)
+  ("_" ?_)
+  ("-" ?-)
+  ("+" ?+)
+  ("=" ?=)
+  ("Q" ?ধ)
+  ("q" ?দ)
+  ("W" ?ঊ)
+  ("w" ?ূ)
+  ("E" ?ঈ)
+  ("e" ?ী)
+  ("R" ?ড়)
+  ("r" ?র)
+  ("T" ?ঠ)
+  ("t" ?ট)
+  ("Y" ?ঐ)
+  ("y" ?এ)
+  ("U" ?উ)
+  ("u" ?ু)
+  ("I" ?ই)
+  ("i" ?ি)
+  ("O" ?ঔ)
+  ("o" ?ও)
+  ("P" ?ফ)
+  ("p" ?প)
+  ("{" ?ৈ)
+  ("[" ?ে)
+  ("}" ?ৌ)
+  ("]" ?ো)
+  ("A" ?অ)
+  ("a" ?া)
+  ("S" ?ষ)
+  ("s" ?স)
+  ("D" ?ঢ)
+  ("d" ?ড)
+  ("F" ?থ)
+  ("f" ?ত)
+  ("G" ?ঘ)
+  ("g" ?গ)
+  ("H" ?ঃ)
+  ("h" ?হ)
+  ("J" ?ঝ)
+  ("j" ?জ)
+  ("K" ?খ)
+  ("k" ?ক)
+  ("L" ?ং)
+  ("l" ?ল)
+  (":" ?:)
+  (";" ?\;)
+  ("\"" ?\")
+  ("'" ?')
+  ("|" ?॥)
+  ("" ?‌)
+  ("~" ?~)
+  ("`" ?‍)
+  ("Z" ?য)
+  ("z" ?য়)
+  ("X" ?ঢ়)
+  ("x" ?শ)
+  ("C" ?ছ)
+  ("c" ?চ)
+  ("V" ?ঋ)
+  ("v" ?আ)
+  ("B" ?ভ)
+  ("b" ?ব)
+  ("N" ?ণ)
+  ("n" ?ন)
+  ("M" ?ঙ)
+  ("m" ?ম)
+  ("<" ?ৃ)
+  ("," ?,)
+  (">" ?ঁ)
+  ("." ?।)
+  ("?" ?\?)
+  ("/" ?্))
+
 ;;; indian.el ends here