Mercurial > emacs
changeset 109209:19ee224844a2
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Sun, 30 May 2010 11:55:39 +0000 |
| parents | 0d144b53fe59 (current diff) 0d7ed8742a5f (diff) |
| children | 028318d8a060 |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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)