Mercurial > emacs
diff lisp/simple.el @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 06 Jul 2006 08:59:39 +0000 |
| parents | a8190f7e546e 22433275348d |
| children | 8a8e69664178 |
line wrap: on
line diff
--- a/lisp/simple.el Wed Jul 05 17:38:31 2006 +0000 +++ b/lisp/simple.el Thu Jul 06 08:59:39 2006 +0000 @@ -1043,7 +1043,7 @@ (format " (#o%o, #x%x)" value value))))) ;; We define this, rather than making `eval' interactive, -;; for the sake of completion of names like eval-region, eval-current-buffer. +;; for the sake of completion of names like eval-region, eval-buffer. (defun eval-expression (eval-expression-arg &optional eval-expression-insert-value) "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. @@ -3529,7 +3529,7 @@ (if (and track-eol (eolp) ;; Don't count beg of empty line as end of line ;; unless we just did explicit end-of-line. - (or (not (bolp)) (eq last-command 'end-of-line))) + (or (not (bolp)) (eq last-command 'move-end-of-line))) 9999 (current-column))))