comparison lisp/descr-text.el @ 5470:0af042a0c116

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents 308d34e9f07d 174aed57a32a
children ac37a5f7e5be
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
594 "%s" (truncate 594 "%s" (truncate
595 (* (/ offset-start size) 100)) 595 (* (/ offset-start size) 100))
596 (concat message 596 (concat message
597 (make-string 597 (make-string
598 (mod loop-count 44) ?.))) 598 (mod loop-count 44) ?.)))
599 (block 'dealing-with-chars 599 (block dealing-with-chars
600 (when (= buffer-size (- (point-max) (point-min))) 600 (when (= buffer-size (- (point-max) (point-min)))
601 ;; If we're in the body of the file, we need to delete the 601 ;; If we're in the body of the file, we need to delete the
602 ;; character info for the last character, and set offset-end 602 ;; character info for the last character, and set offset-end
603 ;; appropriately. Otherwise, we may not be able to pick where 603 ;; appropriately. Otherwise, we may not be able to pick where
604 ;; the actual description of a character ends and begins. 604 ;; the actual description of a character ends and begins.
633 (setq offset-end (+ offset-start (- (point) (point-min)))))) 633 (setq offset-end (+ offset-start (- (point) (point-min))))))
634 (goto-char (point-min)) 634 (goto-char (point-min))
635 (while t 635 (while t
636 (when (= (point) (point-max)) 636 (when (= (point) (point-max))
637 ;; We're at the end of this part of the file. 637 ;; We're at the end of this part of the file.
638 (return-from 'dealing-with-chars)) 638 (return-from dealing-with-chars))
639 639
640 (unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t" 640 (unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t"
641 nil t) 641 nil t)
642 ;; We're probably in the comments at the start of the 642 ;; We're probably in the comments at the start of the
643 ;; file. No need to look for character info. 643 ;; file. No need to look for character info.
644 (return-from 'dealing-with-chars)) 644 (return-from dealing-with-chars))
645 645
646 ;; Store where the character started. 646 ;; Store where the character started.
647 (beginning-of-line) 647 (beginning-of-line)
648 (setq character-start (point)) 648 (setq character-start (point))
649 649