# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1262933934 -3600
# Node ID 832dec78870981568b07a06e5894908ab2c0de0b
# Parent  53e52339f8c2923ad1221118bccd80f3543f04e2# Parent  28260028067c2e9d93af36ddd7ddd6f0b2372ee9
Merge from trunk

diff -r 53e52339f8c2 -r 832dec788709 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 06 20:42:27 2010 +0100
+++ b/lisp/ChangeLog	Fri Jan 08 07:58:54 2010 +0100
@@ -1,3 +1,15 @@
+2010-01-08  Kenichi Handa  <handa@m17n.org>
+
+	* international/fontset.el (build-default-fontset-data): Exclude
+	characters in scripts kana, hangul, han, or cjk-misc.
+
+2010-01-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename
+	to `create-file-buffer' as it expects, not just a buffer name.
+	(vc-dir-mode): Include the buffer name in `list-buffers-directory',
+	to help uniquify.  (Bug#3224)
+
 2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* font-setting.el (font-setting-change-default-font): Use user-spec
diff -r 53e52339f8c2 -r 832dec788709 lisp/international/fontset.el
--- a/lisp/international/fontset.el	Wed Jan 06 20:42:27 2010 +0100
+++ b/lisp/international/fontset.el	Fri Jan 08 07:58:54 2010 +0100
@@ -361,8 +361,10 @@
 	     (let ((from (car range)) (to (cdr range)))
 	       (if (< to #x110000)
 		   (while (<= from to)
-		     (aset cjk-table from
-			   (logior (or (aref cjk-table from) 0) mask))
+		     (or (memq (aref char-script-table from)
+			       '(kana hangul han cjk-misc))
+			 (aset cjk-table from
+			       (logior (or (aref cjk-table from) 0) mask)))
 		     (setq from (1+ from))))))
 	 (nth 1 elt) nil (nth 2 elt) (nth 3 elt)))
       (setq i (1+ i)))
diff -r 53e52339f8c2 -r 832dec788709 lisp/vc-dir.el
--- a/lisp/vc-dir.el	Wed Jan 06 20:42:27 2010 +0100
+++ b/lisp/vc-dir.el	Fri Jan 08 07:58:54 2010 +0100
@@ -101,7 +101,9 @@
                       (return buffer))))))))
     (or buf
         ;; Create a new buffer named BNAME.
-        (with-current-buffer (create-file-buffer bname)
+	;; We pass a filename to create-file-buffer because it is what
+	;; the function expects, and also what uniquify needs (if active)
+        (with-current-buffer (create-file-buffer (expand-file-name bname dir))
           (cd dir)
           (vc-setup-buffer (current-buffer))
           ;; Reset the vc-parent-buffer-name so that it does not appear
@@ -928,7 +930,7 @@
     (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-printer))
     (set (make-local-variable 'revert-buffer-function)
 	 'vc-dir-revert-buffer-function)
-    (setq list-buffers-directory default-directory)
+    (setq list-buffers-directory (expand-file-name "*vc-dir*" default-directory))
     (add-to-list 'vc-dir-buffers (current-buffer))
     ;; Make sure that if the directory buffer is killed, the update
     ;; process running in the background is also killed.