# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1275220539 0
# Node ID 19ee224844a2db23c2bf28b164729467fe88bfe2
# Parent  0d144b53fe594f0611201b315f4b0c3ae6fc72b3# Parent  0d7ed8742a5f3b9c290fd67395c634de49a50fe6
Merge from mainline.

diff -r 0d144b53fe59 -r 19ee224844a2 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun May 30 00:32:06 2010 +0000
+++ b/lisp/ChangeLog	Sun May 30 11:55:39 2010 +0000
@@ -1,3 +1,11 @@
+2010-05-30  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emulation/cua-base.el: Recognize `right-char' and `left-char' as
+	movement commands.
+
+	* progmodes/ada-xref.el (ada-prj-ada-project-path-sep): Set from
+	`path-separator', but maintain compatibility with Emacs 20.2.
+
 2010-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* server.el (server-process-filter): Receive parent-id argument
diff -r 0d144b53fe59 -r 19ee224844a2 lisp/emulation/cua-base.el
--- a/lisp/emulation/cua-base.el	Sun May 30 00:32:06 2010 +0000
+++ b/lisp/emulation/cua-base.el	Sun May 30 11:55:39 2010 +0000
@@ -1497,6 +1497,7 @@
 
 (dolist (cmd
  '(forward-char backward-char
+   right-char left-char
    next-line previous-line
    forward-word backward-word
    end-of-line beginning-of-line
diff -r 0d144b53fe59 -r 19ee224844a2 lisp/progmodes/ada-xref.el
--- a/lisp/progmodes/ada-xref.el	Sun May 30 00:32:06 2010 +0000
+++ b/lisp/progmodes/ada-xref.el	Sun May 30 11:55:39 2010 +0000
@@ -108,10 +108,9 @@
   :type 'string :group 'ada)
 
 (defcustom ada-prj-ada-project-path-sep
-  (if (or (equal system-type 'windows-nt)
-	  (equal system-type 'ms-dos))
-      ";"
-    ":")
+  (cond ((boundp 'path-separator) path-separator) ; 20.3+
+	((memq system-type '(windows-nt ms-dos)) ";")
+	(t ":"))
   "Default separator for ada_project_path project variable."
   :type 'string :group 'ada)