Mercurial > emacs
changeset 91704:bd5e4ff73402
* button.el (button-map):
* wid-edit.el (widget-keymap): Avoid line-end confusion in autoloads.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sat, 09 Feb 2008 22:48:06 +0000 |
| parents | bda1e76bc03b |
| children | e57bdfa3b7aa |
| files | lisp/ChangeLog lisp/button.el lisp/wid-edit.el |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Feb 09 21:59:34 2008 +0000 +++ b/lisp/ChangeLog Sat Feb 09 22:48:06 2008 +0000 @@ -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):
--- a/lisp/button.el Sat Feb 09 21:59:34 2008 +0000 +++ b/lisp/button.el Sat Feb 09 22:48:06 2008 +0000 @@ -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.")
--- a/lisp/wid-edit.el Sat Feb 09 21:59:34 2008 +0000 +++ b/lisp/wid-edit.el Sat Feb 09 22:48:06 2008 +0000 @@ -874,7 +874,9 @@ (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.")