Mercurial > emacs
diff lisp/simple.el @ 90645:7eeafaaa9eab
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 476-489)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 153-160)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 30 Oct 2006 08:54:41 +0000 |
parents | 8dd8c8286063 d443f2b23be1 |
children | 02cf29720f31 |
line wrap: on
line diff
--- a/lisp/simple.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/simple.el Mon Oct 30 08:54:41 2006 +0000 @@ -997,12 +997,11 @@ (single-key-description char)) encoding-msg pos total percent col hscroll)))))) -(defvar read-expression-map - (let ((m (make-sparse-keymap))) - (define-key m "\M-\t" 'lisp-complete-symbol) - (set-keymap-parent m minibuffer-local-map) - m) - "Minibuffer keymap used for reading Lisp expressions.") +;; Initialize read-expression-map. It is defined at C level. +(let ((m (make-sparse-keymap))) + (define-key m "\M-\t" 'lisp-complete-symbol) + (set-keymap-parent m minibuffer-local-map) + (setq read-expression-map m)) (defvar read-expression-history nil) @@ -3625,7 +3624,14 @@ ;; The logic of this is the same as the loop above, ;; it just goes in the other direction. (while (and (< arg 0) (not done)) - (beginning-of-line) + ;; For completely consistency with the forward-motion + ;; case, we should call beginning-of-line here. + ;; However, if point is inside a field and on a + ;; continued line, the call to (vertical-motion -1) + ;; below won't move us back far enough; then we return + ;; to the same column in line-move-finish, and point + ;; gets stuck -- cyd + (forward-line 0) (cond ((bobp) (if (not noerror)