Merge remote-tracking branch 'origin/master' into feature/androidfeature/android

2 files changed, 3 insertions, 4 deletions

diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 9ce31f11d91..5477473ae8c 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -484,7 +484,7 @@ To get complete usage, invoke:
 (defmacro skkdic-set-postfix (&rest entries)
   `(defconst skkdic-postfix
      ',(let ((l entries)
-	     (map '(nil))
+	     (map (list nil))
 	     (longest 1)
 	     len entry)
 	 (while l
@@ -507,7 +507,7 @@ To get complete usage, invoke:
 (defmacro skkdic-set-prefix (&rest entries)
   `(defconst skkdic-prefix
      ',(let ((l entries)
-	     (map '(nil))
+	     (map (list nil))
 	     (longest 1)
 	     len entry)
 	 (while l
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 317ea8495de..894378bda8b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -804,13 +804,12 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
       (setq i (1+ i)))
 
     (let ((pos (point))
-	  (bar "|")
+	  (bar (propertize "|" 'face 'bold))
 	  lower upper row)
       ;; Make table without horizontal lines.  Each column for a key
       ;; has the form "| LU |" where L is for lower key and U is
       ;; for a upper key.  If width of L (U) is greater than 1,
       ;; preceding (following) space is not inserted.
-      (put-text-property 0 1 'face 'bold bar)
       (setq i 0)
       (while (< i quail-keyboard-layout-len)
 	(when (= (% i 30) 0)