Mercurial > emacs
comparison lisp/compare-w.el @ 90596:6823a91487f2
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 399-413)
- Update from CVS
- Rcirc update from Ryan Yeske
- Merge from gnus--rel--5.10
- Miscellaneous tq-related fixes.
* gnus--rel--5.10 (patch 126-127)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 28 Aug 2006 04:33:45 +0000 |
| parents | 7f3f771c85fa ceec9309d859 |
| children | f1d13e615070 |
comparison
equal
deleted
inserted
replaced
| 90595:fd59c4164a14 | 90596:6823a91487f2 |
|---|---|
| 189 (setq opoint2 p2) | 189 (setq opoint2 p2) |
| 190 (setq maxp1 (point-max)) | 190 (setq maxp1 (point-max)) |
| 191 | 191 |
| 192 (setq skip-func-1 (if ignore-whitespace | 192 (setq skip-func-1 (if ignore-whitespace |
| 193 (if (stringp compare-windows-whitespace) | 193 (if (stringp compare-windows-whitespace) |
| 194 (lambda () (compare-windows-skip-whitespace) | 194 (lambda (pos) |
| 195 (compare-windows-skip-whitespace pos) | |
| 195 t) | 196 t) |
| 196 compare-windows-whitespace))) | 197 compare-windows-whitespace))) |
| 197 | 198 |
| 198 (with-current-buffer b2 | 199 (with-current-buffer b2 |
| 199 (setq skip-func-2 (if ignore-whitespace | 200 (setq skip-func-2 (if ignore-whitespace |
| 200 (if (stringp compare-windows-whitespace) | 201 (if (stringp compare-windows-whitespace) |
| 201 (lambda () (compare-windows-skip-whitespace) | 202 (lambda (pos) |
| 203 (compare-windows-skip-whitespace pos) | |
| 202 t) | 204 t) |
| 203 compare-windows-whitespace))) | 205 compare-windows-whitespace))) |
| 204 (push-mark p2 t) | 206 (push-mark p2 t) |
| 205 (setq maxp2 (point-max))) | 207 (setq maxp2 (point-max))) |
| 206 (push-mark) | 208 (push-mark) |