Mercurial > emacs
comparison lisp/simple.el @ 110357:41bf9b6f3b91
Merge changes from emacs-23 branch.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 14 Sep 2010 16:41:53 +0200 |
parents | 39d3e1ba1931 061976c19319 |
children | 0e1478bb5f00 |
comparison
equal
deleted
inserted
replaced
110333:c2883613e1b5 | 110357:41bf9b6f3b91 |
---|---|
4341 (if target-hscroll | 4341 (if target-hscroll |
4342 (set-window-hscroll (selected-window) target-hscroll)) | 4342 (set-window-hscroll (selected-window) target-hscroll)) |
4343 (or (and (= (vertical-motion | 4343 (or (and (= (vertical-motion |
4344 (cons (or goal-column | 4344 (cons (or goal-column |
4345 (if (consp temporary-goal-column) | 4345 (if (consp temporary-goal-column) |
4346 (truncate (car temporary-goal-column)) | 4346 (car temporary-goal-column) |
4347 temporary-goal-column)) | 4347 temporary-goal-column)) |
4348 arg)) | 4348 arg)) |
4349 arg) | 4349 arg) |
4350 (or (>= arg 0) | 4350 (or (>= arg 0) |
4351 (/= (point) opoint) | 4351 (/= (point) opoint) |