* button.el (button-map):

* wid-edit.el (widget-keymap): Avoid line-end confusion in autoloads.

3 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 248cc4e243a..133261eb14d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-09  Jason Rumney  <jasonr@gnu.org>
+
+        * button.el (button-map):
+        * wid-edit.el (widget-keymap): Avoid line-end confusion in autoloads.
+
 2008-02-09  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * epa.el (epa-faces, epa):
diff --git a/lisp/button.el b/lisp/button.el
index 0b45f2cec41..df954871985 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -64,7 +64,9 @@
 ;;;###autoload
 (defvar button-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "\r" 'push-button)
+    ;; The following definition needs to avoid using escape sequences that
+    ;; might get converted to ^M when building loaddefs.el
+    (define-key map [(control ?m)] 'push-button)
     (define-key map [mouse-2] 'push-button)
     map)
   "Keymap used by buttons.")
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 205f70d32ef..26c77e1a172 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -874,7 +874,9 @@ button end points."
     (define-key map [backtab] 'widget-backward)
     (define-key map [down-mouse-2] 'widget-button-click)
     (define-key map [down-mouse-1] 'widget-button-click)
-    (define-key map "\C-m" 'widget-button-press)
+    ;; The following definition needs to avoid using escape sequences that
+    ;; might get converted to ^M when building loaddefs.el
+    (define-key map [(control ?m)] 'widget-button-press)
     map)
   "Keymap containing useful binding for buffers containing widgets.
 Recommended as a parent keymap for modes using widgets.")