Mercurial > emacs
comparison lisp/arc-mode.el @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 17 May 2006 07:46:49 +0000 |
| parents | 146cd8369025 ff708eaf43ab |
| children | a8190f7e546e |
comparison
equal
deleted
inserted
replaced
| 90398:1f8d5cd37cf0 | 90399:a5812696f7bf |
|---|---|
| 1377 (- (length text) (length ifnname)) | 1377 (- (length text) (length ifnname)) |
| 1378 (length text)) | 1378 (length text)) |
| 1379 visual) | 1379 visual) |
| 1380 files (cons (vector efnname ifnname fiddle nil (1- p)) | 1380 files (cons (vector efnname ifnname fiddle nil (1- p)) |
| 1381 files) | 1381 files) |
| 1382 p (+ p 29 csize)))) | 1382 ;; p needs to stay an integer, since we use it in char-after |
| 1383 ;; above. Passing through `round' limits the compressed size | |
| 1384 ;; to most-positive-fixnum, but if the compressed size exceeds | |
| 1385 ;; that, we cannot visit the archive anyway. | |
| 1386 p (+ p 29 (round csize))))) | |
| 1383 (goto-char (point-min)) | 1387 (goto-char (point-min)) |
| 1384 (let ((dash (concat "- -------- ----------- -------- " | 1388 (let ((dash (concat "- -------- ----------- -------- " |
| 1385 (make-string maxlen ?-) | 1389 (make-string maxlen ?-) |
| 1386 "\n"))) | 1390 "\n"))) |
| 1387 (insert "M Length Date Time File\n" | 1391 (insert "M Length Date Time File\n" |
| 1517 (length text)) | 1521 (length text)) |
| 1518 visual) | 1522 visual) |
| 1519 files (cons (vector prname ifnname fiddle mode (1- p)) | 1523 files (cons (vector prname ifnname fiddle mode (1- p)) |
| 1520 files)) | 1524 files)) |
| 1521 (cond ((= hdrlvl 1) | 1525 (cond ((= hdrlvl 1) |
| 1522 (setq p (+ p hsize 2 csize))) | 1526 ;; p needs to stay an integer, since we use it in goto-char |
| 1527 ;; above. Passing through `round' limits the compressed size | |
| 1528 ;; to most-positive-fixnum, but if the compressed size exceeds | |
| 1529 ;; that, we cannot visit the archive anyway. | |
| 1530 (setq p (+ p hsize 2 (round csize)))) | |
| 1523 ((or (= hdrlvl 2) (= hdrlvl 0)) | 1531 ((or (= hdrlvl 2) (= hdrlvl 0)) |
| 1524 (setq p (+ p thsize 2 csize)))) | 1532 (setq p (+ p thsize 2 (round csize))))) |
| 1525 )) | 1533 )) |
| 1526 (goto-char (point-min)) | 1534 (goto-char (point-min)) |
| 1527 (let ((dash (concat (if archive-alternate-display | 1535 (let ((dash (concat (if archive-alternate-display |
| 1528 "- -------- ----- ----- " | 1536 "- -------- ----- ----- " |
| 1529 "- ---------- -------- ----------- -------- ") | 1537 "- ---------- -------- ----------- -------- ") |