Merge from emacs-23 branch

12 files changed, 384 insertions, 113 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01628fcea02..e98ea81ee12 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,63 @@
+2010-03-31  Tomas Abrahamsson  <tab@lysator.liu.se>
+
+        * textmodes/artist.el (artist-mode): Fix typo in docstring.
+        Reported by Alex Schröder <kensanata@gmail.com>.  (Bug#5807)
+
+2010-03-31  Kenichi Handa  <handa@m17n.org>
+
+        * language/sinhala.el (composition-function-table): Fix regexp for
+        the new Unicode specification.
+
+        * language/indian.el (devanagari-composable-pattern)
+        (tamil-composable-pattern, kannada-composable-pattern)
+        (malayalam-composable-pattern): Adjusted for the new Unicode
+        specification.
+        (bengali-composable-pattern, gurmukhi-composable-pattern)
+        (gujarati-composable-pattern, oriya-composable-pattern)
+        (telugu-composable-pattern): New variables to cope with the new
+        Unicode specification.  Use them in composition-function-table.
+
+2010-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Make tmm-menubar work for the Buffers menu again.
+        * tmm.el (tmm-prompt): Also handle keymap entries in the form of
+        vectors rather than cons cells, as used in menu-bar-update-buffers.
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/js.el (js-auto-indent-flag, js-mode-map)
+        (js-insert-and-indent): Revert 2009-08-15 change, restoring
+        electric punctuation for "{}();,:" (Bug#5586).
+
+        * mail/sendmail.el (mail-default-directory): Doc fix.
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/sendmail.el (mail-default-directory): Doc fix.
+
+2010-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (version-regexp-alist, version-to-list)
+        (version-list-<, version-list-=, version-list-<=)
+        (version-list-not-zero, version<, version<=, version=): Doc fix.
+        (Bug#5744).
+
+2010-02-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc.el (vc-root-diff): Doc fix.
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vc.el (vc-print-log, vc-print-root-log): Doc fix.
+
+        * simple.el (append-to-buffer): Fix last change.
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (append-to-buffer): Ensure that point is preserved if
+        BUFFER is the current buffer.  Suggested by YAMAMOTO Mitsuharu.
+        (Bug#5749)
+
 2010-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (auto-mode-case-fold): Change default to t.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 66a358af534..a6c9a1557d6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,6 +1,12 @@
+2010-03-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * message.el (message-default-mail-headers):
+        (message-default-headers): Carry the value mail-default-headers over
+        into message-default-mail-headers, rather than message-default-headers.
+
 2010-03-30  Martin Stjernholm  <mast@lysator.liu.se>
 
-        * mm-decode.el (mm-add-meta-html-tag): Added option to override the
+        * mm-decode.el (mm-add-meta-html-tag): Add option to override the
         charset.
 
         * gnus-art.el (gnus-article-browse-html-parts): Force the correct
@@ -8,8 +14,8 @@
 
 2010-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * gnus-art.el (gnus-article-browse-delete-temp-files): Delete
-        directories as well.
+        * gnus-art.el (gnus-article-browse-delete-temp-files):
+        Delete directories as well.
         (gnus-article-browse-html-parts): Work for images that do not specify
         file names; delete temp directory when quitting; insert header at the
         right place; use file: scheme for image files.
@@ -30,8 +36,8 @@
 
 2010-03-27  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * auth-source.el (auth-sources): Change default to be simpler.  Explain
-        about Secret Service API sources.  Improve Customize options.
+        * auth-source.el (auth-sources): Change default to be simpler.
+        Explain about Secret Service API sources.  Improve Customize options.
         (auth-source-pick): Change to accept any number of search parameters.
         Implement fallbacks iteratively, not recursively.  Add scoring on the
         second pass and sort by score.  Call Secret Service API when needed.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d64a3aa0244..7a96d2480b4 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1167,11 +1167,7 @@ It is a vector of the following headers:
   :valid-regexp "^\\'"
   :error "All header lines must be newline terminated")
 
-(defcustom message-default-headers
-  ;; Default to the value of `mail-default-headers' if available.
-  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
-  ;; unless sendmail.el is loaded.
-  (if (boundp 'mail-default-headers) mail-default-headers "")
+(defcustom message-default-headers ""
   "*A string containing header lines to be inserted in outgoing messages.
 It is inserted before you edit the message, so you can edit or delete
 these lines."
@@ -1184,16 +1180,18 @@ these lines."
   ;; Ease the transition from mail-mode to message-mode.  See bugs#4431, 5555.
   (concat (if (and (boundp 'mail-default-reply-to)
                    (stringp mail-default-reply-to))
-              (format "Reply-to: %s\n" mail-default-reply-to)
-            "")
+              (format "Reply-to: %s\n" mail-default-reply-to))
           (if (and (boundp 'mail-self-blind)
                    mail-self-blind)
-              (format "BCC: %s\n" user-mail-address)
-            "")
+              (format "BCC: %s\n" user-mail-address))
           (if (and (boundp 'mail-archive-file-name)
                    (stringp mail-archive-file-name))
-              (format "FCC: %s\n" mail-archive-file-name)
-            ""))
+              (format "FCC: %s\n" mail-archive-file-name))
+          ;; Use the value of `mail-default-headers' if available.
+          ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is
+          ;; unavailable unless sendmail.el is loaded.
+          (if (boundp 'mail-default-headers)
+              mail-default-headers))
   "*A string of header lines to be inserted in outgoing mails."
   :version "23.2"
   :group 'message-headers
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d8d7d1a6269..dd5bf2960b1 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -140,28 +140,25 @@ South Indian language Malayalam is supported in this language environment."))
 
 (defconst devanagari-composable-pattern
   (let ((table
-         '(("V" . "[\u0904-\u0914\u0960-\u0961\u0972]") ; independent vowel
-           ("C" . "[\u0915-\u0939\u0958-\u095F\u097B-\u097C\u097E-\u097F]") ; consonant
-           ("R" . "\u0930")                      ; RA
-           ("n" . "\u093C")                      ; NUKTA
-           ("H" . "\u094D")                      ; HALANT
-           ("m" . "\u093F")                      ; vowel sign (pre)
-           ("u" . "[\u0945-\u0948\u0955]")       ; vowel sign (above)
-           ("b" . "[\u0941-\u0944\u0962-\u0963]") ; vowel sign (below)
-           ("p" . "[\u093E\u0940\u0949-\u094C]") ; vowel sign (post)
-           ("A" . "[\u0900-\u0902\u0953-\u0954]") ; vowel modifier (above)
-           ("a" . "\u0903")                      ; vowel modifier (post) 
-           ("S" . "\u0951")                      ; stress sign (above)
-           ("s" . "\u0952")                      ; stress sign (below)
-           ("N" . "\u200C")                      ; ZWNJ
-           ("J" . "\u200D")                      ; ZWJ
-           ("X" . "[\u0900-\u097F]"))))          ; all coverage
+         '(("a" . "[\u0900-\u0902]")    ; vowel modifier (above)
+           ("A" . "\u0903")             ; vowel modifier (post) 
+           ("V" . "[\u0904-\u0914\u0960-\u0961\u0972]") ; independent vowel
+           ("C" . "[\u0915-\u0939\u0958-\u095F\u0979-\u097F]") ; consonant
+           ("R" . "\u0930")             ; RA
+           ("n" . "\u093C")             ; NUKTA
+           ("v" . "[\u093E-\u094C\u094E\u0955\u0962-\u0963]") ; vowel sign
+           ("H" . "\u094D")             ; HALANT
+           ("s" . "[\u0951-\u0952]")    ; stress sign
+           ("t" . "[\u0953-\u0954]")    ; accent
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0900-\u097F]")))) ; all coverage
     (indian-compose-regexp
      (concat
       ;; syllables with an independent vowel, or
-      "\\(?:RH\\)?Vn?m?b?u?p?n?A?s?S?a?\\|"
+      "\\(?:RH\\)?Vn?\\(?:J?HR\\)?v*n?a?s?t?A?\\|"
       ;; consonant-based syllables, or
-      "\\(?:Cn?J?HJ?\\)*Cn?\\(?:H[NJ]?\\|m?b?u?p?n?A?s?S?a?\\)\\|"
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*n?a?s?t?A?\\)\\|"
       ;; special consonant form, or
       "JHR\\|"
       ;; any other singleton characters
@@ -169,43 +166,202 @@ South Indian language Malayalam is supported in this language environment."))
      table))
   "Regexp matching a composable sequence of Devanagari characters.")
 
+(defconst bengali-composable-pattern
+  (let ((table
+         '(("a" . "\u0981")             ; SIGN CANDRABINDU
+           ("A" . "[\u0982-\u0983]")    ; SIGN ANUSVARA .. VISARGA
+           ("V" . "[\u0985-\u0994\u09E0-\u09E1]") ; independent vowel
+           ("C" . "[\u0995-\u09B9\u09DC-\u09DF\u09F1]") ; consonant
+           ("B" . "[\u09AC\u09AF-\u09B0\u09F0]")                ; BA, YA, RA
+           ("R" . "[\u09B0\u09F0]")             ; RA
+           ("n" . "\u09BC")             ; NUKTA
+           ("v" . "[\u09BE-\u09CC\u09D7\u09E2-\u09E3]") ; vowel sign
+           ("H" . "\u09CD")             ; HALANT
+           ("T" . "\u09CE")             ; KHANDA TA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0980-\u09FF]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; syllables with an independent vowel, or
+      "\\(?:RH\\)?Vn?\\(?:J?HB\\)?v*n?a?A?\\|"
+      ;; consonant-based syllables, or
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*[NJ]?v?a?A?\\)\\|"
+      ;; another syllables with an independent vowel, or
+      "\\(?:RH\\)?T\\|"
+      ;; special consonant form, or
+      "JHB\\|"
+      ;; any other singleton characters
+      "X")
+     table))
+  "Regexp matching a composable sequence of Bengali characters.")
+
+(defconst gurmukhi-composable-pattern
+  (let ((table
+         '(("a" . "[\u0A01-\u0A02]")    ; SIGN ADAK BINDI .. BINDI
+           ("A" . "\u0A03]")            ; SIGN VISARGA
+           ("V" . "[\u0A05-\u0A14]")    ; independent vowel
+           ("C" . "[\u0A15-\u0A39\u0A59-\u0A5E]")       ; consonant
+           ("Y" . "[\u0A2F\u0A30\u0A35\u0A39]") ; YA, RA, VA, HA
+           ("n" . "\u0A3C")             ; NUKTA
+           ("v" . "[\u0A3E-\u0A4C]")    ; vowel sign
+           ("H" . "\u0A4D")             ; VIRAMA
+           ("a" . "\u0A70")             ; TIPPI
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0A00-\u0A7F]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; consonant-based syllables, or
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?\\|v*n?a?A?\\)\\|"
+      ;; syllables with an independent vowel, or
+      "Vn?\\(?:J?HY\\)?v*n?a?A?\\|"
+      ;; special consonant form, or
+      "JHY\\|"
+      ;; any other singleton characters
+      "X")
+     table))
+  "Regexp matching a composable sequence of Gurmukhi characters.")
+
+(defconst gujarati-composable-pattern
+  (let ((table
+         '(("a" . "[\u0A81-\u0A82]")    ; SIGN CANDRABINDU .. ANUSVARA
+           ("A" . "\u0A83]")            ; SIGN VISARGA
+           ("V" . "[\u0A85-\u0A94\u0AE0-\u0AE1]") ; independent vowel
+           ("C" . "[\u0A95-\u0AB9]")    ; consonant
+           ("R" . "\u0AB0")             ; RA
+           ("n" . "\u0ABC")             ; NUKTA
+           ("v" . "[\u0ABE-\u0ACC\u0AE2-\u0AE3]") ; vowel sign
+           ("H" . "\u0ACD")             ; VIRAMA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0A80-\u0AFF]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; syllables with an independent vowel, or
+      "\\(?:RH\\)?Vn?\\(?:J?HR\\)?v*n?a?A?\\|"
+      ;; consonant-based syllables, or
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?a?A?\\)\\|"
+      ;; special consonant form, or
+      "JHR\\|"
+      ;; any other singleton characters
+      "X")
+     table))
+  "Regexp matching a composable sequence of Gujarati characters.")
+
+(defconst oriya-composable-pattern
+  (let ((table
+         '(("a" . "\u0B01")             ; SIGN CANDRABINDU
+           ("A" . "[\u0B02-\u0B03]")    ; SIGN ANUSVARA .. VISARGA
+           ("V" . "[\u0B05-\u0B14\u0B60-\u0B61]") ; independent vowel
+           ("C" . "[\u0B15-\u0B39\u0B5C-\u0B5D\u0B71]") ; consonant
+           ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form
+           ("n" . "\u0B3C")             ; NUKTA
+           ("v" . "[\u0B3E-\u0B44\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign
+           ("H" . "\u0B4D")             ; VIRAMA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0B00-\u0B7F]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; syllables with an independent vowel, or
+      "\\(?:RH\\)?Vn?\\(?:J?HB\\)?v*n?a?A?\\|"
+      ;; consonant-based syllables, or
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?a?A?\\)\\|"
+      ;; special consonant form, or
+      "JHB\\|"
+      ;; any other singleton characters
+      "X")
+     table))
+  "Regexp matching a composable sequence of Oriya characters.")
+
 (defconst tamil-composable-pattern
-  (concat
-   "\\([அ-ஔ]\\)\\|"
-   "[ஂஃ]\\|" ;; vowel modifier considered independent
-   "\\(\\(?:\\(?:க்ஷ\\)\\|[க-ஹ]\\)[்ா-ௌ]?\\)\\|"
-   "\\(ஷ்ரீ\\)")
+  (let ((table
+         '(("a" . "\u0B82")             ; SIGN ANUSVARA
+           ("V" . "[\u0B85-\u0B94]")    ; independent vowel
+           ("C" . "[\u0B95-\u0BB9]")    ; consonant
+           ("v" . "[\u0BBE-\u0BC8\u0BD7]") ; vowel sign
+           ("H" . "\u0BCD")             ; VIRAMA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0B80-\u0BFF]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; consonant-based syllables, or
+      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?|v*a?\\)\\|"
+      ;; syllables with an independent vowel, or
+      "Vv*a?\\|"
+      ;; any other singleton characters
+      "X")
+     table))
   "Regexp matching a composable sequence of Tamil characters.")
 
+(defconst telugu-composable-pattern
+  (let ((table
+         '(("a" . "[\u0C01-\u0C03]")    ; SIGN CANDRABINDU .. VISARGA
+           ("V" . "[\u0C05-\u0C14\u0C60-\u0C61]") ; independent vowel
+           ("C" . "[\u0C15-\u0C39\u0C58-\u0C59]") ; consonant
+           ("v" . "[\u0C3E-\u0C4C\u0C55-\u0C56\u0C62-\u0C63]")  ; vowel sign
+           ("H" . "\u0BCD")             ; VIRAMA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0C00-\u0C7F]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; consonant-based syllables, or
+      "C\\(?:J?HJ?C\\)*\\(?:H[NJ]?|v*a?\\)\\|"
+      ;; syllables with an independent vowel, or
+      "V\\(?:J?HC\\)?v*a?\\|"
+      ;; special consonant form, or
+      "JHC\\|"
+      ;; any other singleton characters
+      "X")
+     table))
+  "Regexp matching a composable sequence of Telugu characters.")
+
 (defconst kannada-composable-pattern
-  (concat
-   "\\([ಂ-ಔೠಌ]\\)\\|[ಃ]"
-   "\\|\\("
-   "\\(?:\\(?:[ಕ-ಹ]್\\)?\\(?:[ಕ-ಹ]್\\)?\\(?:[ಕ-ಹ]್\\)?[ಕ-ಹ]್\\)?"
-   "[ಕ-ಹ]\\(?:್\\|[ಾ-್ೕೃ]?\\)?"
-   "\\)")
+  (let ((table
+         '(("A" . "[\u0C82-\u0C83]")    ; SIGN ANUSVARA .. VISARGA
+           ("V" . "[\u0C85-\u0C94\u0CE0-\u0CE1]") ; independent vowel
+           ("C" . "[\u0C95-\u0CB9\u0CDE]")        ; consonant
+           ("B" . "\u0CB0")             ; RA
+           ("n" . "\u0CBC")             ; NUKTA
+           ("v" . "[\u0CBE-\u0CCC\u0CD5-\u0CD6\u0CE2-\u0CE3]") ; vowel sign
+           ("H" . "\u0CCD")             ; VIRAMA
+           ("N" . "\u200C")             ; ZWNJ
+           ("J" . "\u200D")             ; ZWJ
+           ("X" . "[\u0C80-\u0CFF]")))) ; all coverage
+    (indian-compose-regexp
+     (concat
+      ;; syllables with an independent vowel, or
+      "\\(?:RH\\)?Vn?\\(?:J?HC\\)?v?A?\\|"
+      ;; consonant-based syllables, or
+      "Cn?\\(?:J?HJ?Cn?\\)*\\(?:H[NJ]?|v*n?A?\\)\\|"
+      ;; special consonant form, or
+      "JHB\\|"
+      ;; any other singleton characters
+      "X")
+     table))
   "Regexp matching a composable sequence of Kannada characters.")
 
 (defconst malayalam-composable-pattern
   (let ((table
-         '(("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel
+         '(("A" . "[\u0D02-\u0D03]")    ; SIGN ANUSVARA .. VISARGA
+           ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel
            ("C" . "[\u0D15-\u0D39]")              ; consonant 
-           ("m" . "[\u0D46-\u0D48\u0D4A-\u0D4C]") ; prebase matra
-           ("p" . "[\u0D3E-\u0D44\u0D57]")        ; postbase matra
-           ("b" . "[\u0D62-\u0D63]")              ; belowbase matra
-           ("a" . "[\u0D02-\u0D03]")              ; abovebase sign
-           ("H" . "\u0D4D")                       ; virama sign 
+           ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]")  ; YA, RA, LA, VA
+           ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra
            ("N" . "\u200C")                       ; ZWNJ
            ("J" . "\u200D")                       ; ZWJ
            ("X" . "[\u0D00-\u0D7F]"))))           ; all coverage
     (indian-compose-regexp
      (concat
-      ;; syllables with an independent vowel, or
-      "V\\(?:J?HC\\)?m?b?p?a?\\|"
       ;; consonant-based syllables, or
-      "\\(?:CJ?HJ?\\)\\{0,4\\}C\\(?:H[NJ]?\\|m?b?p?a?\\)\\|"
+      "\\(?:CJ?HJ?C\\)*\\(?:H[NJ]?\\|v?A?\\)\\|"
+      ;; syllables with an independent vowel, or
+      "V\\(?:J?HY\\)?v*?A?\\|"
       ;; special consonant form, or
-      "JHC\\|"
+      "JHY\\|"
       ;; any other singleton characters
       "X")
      table))
@@ -213,13 +369,13 @@ South Indian language Malayalam is supported in this language environment."))
 
 (let ((script-regexp-alist
        `((devanagari . ,devanagari-composable-pattern)
-         (bengali . "[\x980-\x9FF\x200C\x200D]+")
-         (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
-         (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
-         (oriya . "[\xB00-\xB7F\x200C\x200D]+")
-         (tamil . "[\xB80-\xBFF\x200C\x200D]+")
-         (telugu . "[\xC00-\xC7F\x200C\x200D]+")
-         (kannada . "[\xC80-\xCFF\x200C\x200D]+")
+         (bengali . ,bengali-composable-pattern)
+         (gurmukhi . ,gurmukhi-composable-pattern)
+         (gujarati . ,gujarati-composable-pattern)
+         (oriya . ,oriya-composable-pattern)
+         (tamil . ,tamil-composable-pattern)
+         (telugu . ,telugu-composable-pattern)
+         (kannada . ,kannada-composable-pattern)
          (malayalam . ,malayalam-composable-pattern))))
   (map-char-table
    #'(lambda (key val)
diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index c726c3fb6bf..37a7bc6b465 100644
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -33,7 +33,17 @@
 (set-char-table-range 
  composition-function-table
  '(#xD80 . #xDFF)
- (list (vector "[\xD80-\xDFF\x200C\x200D]+" 0 'font-shape-gstring)))
+ (list (vector
+        ;; C:consonant, H:HALANT, J:ZWJ, v:vowel sign,
+        ;; V:independent vowel, a:ANUSVARA .. VISARGA
+        (concat
+         ;; C(HJC)*v*H?a?, or
+         "[\u0D9A-\u0DC6]\\(?:\u0DCA\u200D[\u0D9A-\u0DC6]\\)*[\u0DCF-\u0DDF\u0DF2-\u0DF3]*\u0DCA?[\u0D82-\u0D83]?\\|"
+         ;; Va?, or
+         "[\u0D85-\u0D96][\u0D82-\u0D83]?\\|"
+         ;; any other singleton characters
+         "[\u0D80-\u0DFF]")
+        0 'font-shape-gstring)))
 
 ;; arch-tag: 87b9ad3b-5090-422f-b942-eb85b9d52e7c
 ;; sinhala.el ends here
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4cf6cb812bd..3cc1bf5fe19 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -417,9 +417,11 @@ and should insert whatever you want to insert."
 
 ;;;###autoload
 (defcustom mail-default-directory (purecopy "~/")
-  "Directory for mail buffers.
-Value of `default-directory' for mail buffers.
-This directory is used for auto-save files of mail buffers."
+  "Value of `default-directory' for Mail mode buffers.
+This directory is used for auto-save files of Mail mode buffers.
+
+Note that Message mode does not use this variable; it auto-saves
+in `message-auto-save-directory'."
   :type '(directory :tag "Directory")
   :group 'sendmail
   :version "22.1")
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 8c8d0553cfa..6bd22e4e6fa 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -436,6 +436,13 @@ The value must be no less than minus `js-indent-level'."
   :type 'integer
   :group 'js)
 
+(defcustom js-auto-indent-flag t
+  "Whether to automatically indent when typing punctuation characters.
+If non-nil, the characters {}();,: also indent the current line
+in Javascript mode."
+  :type 'boolean
+  :group 'js)
+
 (defcustom js-flat-functions nil
   "Treat nested functions as top-level functions in `js-mode'.
 This applies to function movement, marking, and so on."
@@ -483,6 +490,9 @@ getting timeout messages."
 
 (defvar js-mode-map
   (let ((keymap (make-sparse-keymap)))
+    (mapc (lambda (key)
+            (define-key keymap key #'js-insert-and-indent))
+          '("{" "}" "(" ")" ":" ";" ","))
     (define-key keymap [(control ?c) (meta ?:)] #'js-eval)
     (define-key keymap [(control ?c) (control ?j)] #'js-set-js-context)
     (define-key keymap [(control meta ?x)] #'js-eval-defun)
@@ -498,6 +508,21 @@ getting timeout messages."
     keymap)
   "Keymap for `js-mode'.")
 
+(defun js-insert-and-indent (key)
+  "Run the command bound to KEY, and indent if necessary.
+Indentation does not take place if point is in a string or
+comment."
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (let ((syntax (save-restriction (widen) (syntax-ppss))))
+    (when (or (and (not (nth 8 syntax))
+                   js-auto-indent-flag)
+              (and (nth 4 syntax)
+                   (eq (current-column)
+                       (1+ (current-indentation)))))
+      (indent-according-to-mode))))
+
+
 ;;; Syntax table and parsing
 
 (defvar js-mode-syntax-table
diff --git a/lisp/simple.el b/lisp/simple.el
index 30498ea2704..35001a694df 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3472,13 +3472,14 @@ START and END specify the portion of the current buffer to be copied."
     (let* ((append-to (get-buffer-create buffer))
            (windows (get-buffer-window-list append-to t t))
            point)
-      (with-current-buffer append-to
-        (setq point (point))
-        (barf-if-buffer-read-only)
-        (insert-buffer-substring oldbuf start end)
-        (dolist (window windows)
-          (when (= (window-point window) point)
-            (set-window-point window (point))))))))
+      (save-excursion
+        (with-current-buffer append-to
+          (setq point (point))
+          (barf-if-buffer-read-only)
+          (insert-buffer-substring oldbuf start end)
+          (dolist (window windows)
+            (when (= (window-point window) point)
+              (set-window-point window (point)))))))))
 
 (defun prepend-to-buffer (buffer start end)
   "Prepend to specified buffer the text of the region.
diff --git a/lisp/subr.el b/lisp/subr.el
index d62cb0c704e..6118c49530c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3595,11 +3595,11 @@ Usually the separator is \".\", but it can be any other string.")
     ("^[-_+ ]cvs$"             . -3)    ; treat "1.2.3-CVS" as alpha release
     ("^[-_+ ]?b\\(eta\\)?$"    . -2)
     ("^[-_+ ]?\\(pre\\|rc\\)$" . -1))
-  "*Specify association between non-numeric version part and a priority.
+  "*Specify association between non-numeric version and its priority.
 
 This association is used to handle version string like \"1.0pre2\",
 \"0.9alpha1\", etc.  It's used by `version-to-list' (which see) to convert the
-non-numeric part to an integer.  For example:
+non-numeric part of a version string to an integer.  For example:
 
    String Version    Integer List Version
    \"1.0pre2\"         (1  0 -1 2)
@@ -3617,15 +3617,15 @@ Each element has the following form:
 Where:
 
 REGEXP          regexp used to match non-numeric part of a version string.
-                It should begin with a `^' anchor and end with a `$' to
+                It should begin with the `^' anchor and end with a `$' to
                 prevent false hits.  Letter-case is ignored while matching
                 REGEXP.
 
-PRIORITY        negative integer which indicate the non-numeric priority.")
+PRIORITY        a negative integer specifying non-numeric priority of REGEXP.")
 
 
 (defun version-to-list (ver)
-  "Convert version string VER into an integer list.
+  "Convert version string VER into a list of integers.
 
 The version syntax is given by the following EBNF:
 
@@ -3639,17 +3639,17 @@ The version syntax is given by the following EBNF:
 The NUMBER part is optional if SEPARATOR is a match for an element
 in `version-regexp-alist'.
 
-As an example of valid version syntax:
+Examples of valid version syntax:
 
    1.0pre2   1.0.7.5   22.8beta3   0.9alpha1   6.9.30Beta
 
-As an example of invalid version syntax:
+Examples of invalid version syntax:
 
    1.0prepre2   1.0..7.5   22.8X3   alpha3.2   .5
 
-As an example of version convertion:
+Examples of version conversion:
 
-   String Version    Integer List Version
+   Version String    Version as a List of Integers
    \"1.0.7.5\"         (1  0  7 5)
    \"1.0pre2\"         (1  0 -1 2)
    \"1.0PRE2\"         (1  0 -1 2)
@@ -3695,12 +3695,12 @@ See documentation for `version-separator' and `version-regexp-alist'."
 
 
 (defun version-list-< (l1 l2)
-  "Return t if integer list L1 is lesser than L2.
+  "Return t if L1, a list specification of a version, is lower than L2.
 
-Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0),
-etc.  That is, the trailing zeroes are irrelevant.  Also, integer
-list (1) is greater than (1 -1) which is greater than (1 -2)
-which is greater than (1 -3)."
+Note that a version specified by the list (1) is equal to (1 0),
+\(1 0 0), (1 0 0 0), etc.  That is, the trailing zeros are insignificant.
+Also, a version given by the list (1) is higher than (1 -1), which in
+turn is higher than (1 -2), which is higher than (1 -3)."
   (while (and l1 l2 (= (car l1) (car l2)))
     (setq l1 (cdr l1)
           l2 (cdr l2)))
@@ -3716,12 +3716,12 @@ which is greater than (1 -3)."
 
 
 (defun version-list-= (l1 l2)
-  "Return t if integer list L1 is equal to L2.
+  "Return t if L1, a list specification of a version, is equal to L2.
 
-Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0),
-etc.  That is, the trailing zeroes are irrelevant.  Also, integer
-list (1) is greater than (1 -1) which is greater than (1 -2)
-which is greater than (1 -3)."
+Note that a version specified by the list (1) is equal to (1 0),
+\(1 0 0), (1 0 0 0), etc.  That is, the trailing zeros are insignificant.
+Also, a version given by the list (1) is higher than (1 -1), which in
+turn is higher than (1 -2), which is higher than (1 -3)."
   (while (and l1 l2 (= (car l1) (car l2)))
     (setq l1 (cdr l1)
           l2 (cdr l2)))
@@ -3737,7 +3737,7 @@ which is greater than (1 -3)."
 
 
 (defun version-list-<= (l1 l2)
-  "Return t if integer list L1 is lesser than or equal to L2.
+  "Return t if L1, a list specification of a version, is lower or equal to L2.
 
 Note that integer list (1) is equal to (1 0), (1 0 0), (1 0 0 0),
 etc.  That is, the trailing zeroes are irrelevant.  Also, integer
@@ -3757,9 +3757,9 @@ which is greater than (1 -3)."
    (t  (<= 0 (version-list-not-zero l2)))))
 
 (defun version-list-not-zero (lst)
-  "Return the first non-zero element of integer list LST.
+  "Return the first non-zero element of LST, which is a list of integers.
 
-If all LST elements are zeroes or LST is nil, return zero."
+If all LST elements are zeros or LST is nil, return zero."
   (while (and lst (zerop (car lst)))
     (setq lst (cdr lst)))
   (if lst
@@ -3769,31 +3769,31 @@ If all LST elements are zeroes or LST is nil, return zero."
 
 
 (defun version< (v1 v2)
-  "Return t if version V1 is lesser than V2.
+  "Return t if version V1 is lower (older) than V2.
 
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
-etc.  That is, the trailing \".0\"s are irrelevant.  Also, version string \"1\"
-is greater than \"1pre\" which is greater than \"1beta\" which is greater than
-\"1alpha\"."
+etc.  That is, the trailing \".0\"s are insignificant.  Also, version
+string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
+which is higher than \"1alpha\"."
   (version-list-< (version-to-list v1) (version-to-list v2)))
 
 
 (defun version<= (v1 v2)
-  "Return t if version V1 is lesser than or equal to V2.
+  "Return t if version V1 is lower (older) than or equal to V2.
 
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
-etc.  That is, the trailing \".0\"s are irrelevant.  Also, version string \"1\"
-is greater than \"1pre\" which is greater than \"1beta\" which is greater than
-\"1alpha\"."
+etc.  That is, the trailing \".0\"s are insignificant..  Also, version
+string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
+which is higher than \"1alpha\"."
   (version-list-<= (version-to-list v1) (version-to-list v2)))
 
 (defun version= (v1 v2)
   "Return t if version V1 is equal to V2.
 
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
-etc.  That is, the trailing \".0\"s are irrelevant.  Also, version string \"1\"
-is greater than \"1pre\" which is greater than \"1beta\" which is greater than
-\"1alpha\"."
+etc.  That is, the trailing \".0\"s are insignificant..  Also, version
+string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
+which is higher than \"1alpha\"."
   (version-list-= (version-to-list v1) (version-to-list v2)))
 
 
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index bc5f29482e7..41145afb766 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1319,7 +1319,7 @@ Selecting operation
 
 Variables
 
- This is a brief overview of the different varaibles. For more info,
+ This is a brief overview of the different variables.  For more info,
  see the documentation for the variables (type \\[describe-variable] <variable> RET).
 
  artist-rubber-banding          Interactively do rubber-banding or not
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 946baad59e7..f4ae3c110d5 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -170,7 +170,11 @@ Its value should be an event that has a binding in MENU."
     (mapc (lambda (elt)
             (if (stringp elt)
                 (setq gl-str elt)
-              (and (listp elt) (tmm-get-keymap elt not-menu))))
+              (cond
+               ((listp elt) (tmm-get-keymap elt not-menu))
+               ((vectorp elt)
+                (dotimes (i (length elt))
+                  (tmm-get-keymap (cons i (aref elt i)) not-menu))))))
             menu)
     ;; Choose an element of tmm-km-list; put it in choice.
     (if (and not-menu (= 1 (length tmm-km-list)))
diff --git a/lisp/vc.el b/lisp/vc.el
index 6a48b626136..142a1508162 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1618,9 +1618,10 @@ saving the buffer."
 
 ;;;###autoload
 (defun vc-root-diff (historic &optional not-urgent)
-  "Display diffs between file revisions.
-Normally this compares the currently selected fileset with their
-working revisions.  With a prefix argument HISTORIC, it reads two revision
+  "Display diffs between VC-controlled whole tree revisions.
+Normally, this compares the tree corresponding to the current
+fileset with the working revision.
+With a prefix argument HISTORIC, prompt for two revision
 designators specifying which revisions to compare.
 
 The optional argument NOT-URGENT non-nil means it is ok to say no to
@@ -1941,7 +1942,12 @@ Not all VC backends support short logs!")
 ;;;###autoload
 (defun vc-print-log (&optional working-revision limit)
   "List the change log of the current fileset in a window.
-If WORKING-REVISION is non-nil, leave the point at that revision."
+If WORKING-REVISION is non-nil, leave point at that revision.
+If LIMIT is non-nil, it should be a number specifying the maximum
+number of revisions to show; the default is `vc-log-show-limit'.
+
+When called interactively with a prefix argument, prompt for
+WORKING-REVISION and LIMIT."
   (interactive
    (cond
     (current-prefix-arg
@@ -1965,7 +1971,10 @@ If WORKING-REVISION is non-nil, leave the point at that revision."
 
 ;;;###autoload
 (defun vc-print-root-log (&optional limit)
-  "List the change log of for the current VC controlled tree in a window."
+  "List the change log for the current VC controlled tree in a window.
+If LIMIT is non-nil, it should be a number specifying the maximum
+number of revisions to show; the default is `vc-log-show-limit'.
+When called interactively with a prefix argument, prompt for LIMIT."
   (interactive
    (cond
     (current-prefix-arg