# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1108991442 0
# Node ID 73700d0046905517fd2db138628230a0845ea521
# Parent  bcf610fb9517bfe16a590d2ce5ea7952567e0ccf# Parent  8c0319c7efca8346b3d44d254e367473cf4c8674
Merged from miles@gnu.org--gnu-2005 (patch 117-118)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-117
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-118
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-298

diff -r bcf610fb9517 -r 73700d004690 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 20 20:15:41 2005 +0000
+++ b/lisp/ChangeLog	Mon Feb 21 13:10:42 2005 +0000
@@ -1,3 +1,11 @@
+2005-02-21  Kenichi Handa  <handa@m17n.org>
+
+	* textmodes/ispell.el (ispell-dictionary-alist): Fix docstring.
+
+2005-02-20  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* progmodes/scheme.el (scheme-font-lock-keywords-2): Handle named-let.
+
 2005-02-20  Jonathan Yavner  <jyavner@member.fsf.org>
 
 	* ses.el (undo-more): restore defadvice, but only the part that
diff -r bcf610fb9517 -r 73700d004690 lisp/progmodes/scheme.el
--- a/lisp/progmodes/scheme.el	Sun Feb 20 20:15:41 2005 +0000
+++ b/lisp/progmodes/scheme.el	Mon Feb 21 13:10:42 2005 +0000
@@ -330,6 +330,10 @@
 	       "map" "syntax" "syntax-rules") t)
 	"\\>") 1)
       ;;
+      ;; It wouldn't be Scheme w/o named-let.
+      '("(let\\s-+\\(\\sw+\\)"
+        (1 font-lock-function-name-face))
+      ;;
       ;; David Fox <fox@graphics.cs.nyu.edu> for SOS/STklos class specifiers.
       '("\\<<\\sw+>\\>" . font-lock-type-face)
       ;;
diff -r bcf610fb9517 -r 73700d004690 lisp/textmodes/ispell.el
--- a/lisp/textmodes/ispell.el	Sun Feb 20 20:15:41 2005 +0000
+++ b/lisp/textmodes/ispell.el	Mon Feb 21 13:10:42 2005 +0000
@@ -671,6 +671,12 @@
 If you want OTHERCHARS to be empty, use the empty string.
 Hint: regexp syntax requires the hyphen to be declared first here.
 
+CASECHAS, NOT-CASECHARS, and OTHERCHARS must be a unibyte string
+containing bytes of CHARACTER-SET.  In addition, if they contain
+a non-ASCII byte, the regular expression must be a single
+`character set' construct that doesn't specify a character range
+for non-ASCII bytes.
+
 MANY-OTHERCHARS-P is non-nil when multiple OTHERCHARS are allowed in a word.
 Otherwise only a single OTHERCHARS character is allowed to be part of any
 single word.