*** pub/sgnus/lisp/gnus-cite.el Mon May 6 01:44:04 1996 --- sgnus/lisp/gnus-cite.el Mon May 6 23:53:22 1996 *************** *** 264,270 **** (setq omarks (cdr omarks))) (when (car omarks) (push (car omarks) marks)) ! (nreverse marks))))) (defun gnus-article-fill-cited-article (&optional force) "Do word wrapping in the current article." --- 264,280 ---- (setq omarks (cdr omarks))) (when (car omarks) (push (car omarks) marks)) ! (setq marks (setq m (nreverse marks))) ! (while (cddr m) ! (if (and (equal (cdadr m) "") ! (equal (cdar m) (cdaddr m)) ! (goto-char (caadr m)) ! (forward-line 1) ! (= (point) (caaddr m))) ! (setcdr m (cdddr m)) ! (setq m (cdr m)))) ! marks)))) ! (defun gnus-article-fill-cited-article (&optional force) "Do word wrapping in the current article." *************** *** 325,336 **** (setq beg (point)))) (when (and beg end) (add-text-properties beg end props) ! (goto-char (1- beg)) ! (put-text-property beg end 'gnus-type 'cite) (gnus-article-add-button (point) (progn (eval gnus-cited-text-button-line-format-spec) (point)) ! `gnus-article-toggle-cited-text (cons beg end)))))))) (defun gnus-article-toggle-cited-text (region) "Toggle hiding the text in REGION." --- 335,348 ---- (setq beg (point)))) (when (and beg end) (add-text-properties beg end props) ! (goto-char beg) ! (unless (save-excursion (search-backward "\n\n" nil t)) ! (insert "\n")) (gnus-article-add-button (point) (progn (eval gnus-cited-text-button-line-format-spec) (point)) ! `gnus-article-toggle-cited-text (cons beg end)) ! (set-marker beg (point)))))))) (defun gnus-article-toggle-cited-text (region) "Toggle hiding the text in REGION." *************** *** 397,404 **** (let ((article (cdr gnus-article-current))) (unless (save-excursion (set-buffer gnus-summary-buffer) ! (gnus-root-id (mail-header-references ! (gnus-summary-article-header article)))) (gnus-article-hide-citation))))) ;;; Internal functions: --- 409,415 ---- (let ((article (cdr gnus-article-current))) (unless (save-excursion (set-buffer gnus-summary-buffer) ! (gnus-article-displayed-root-p article)) (gnus-article-hide-citation))))) ;;; Internal functions: *** pub/sgnus/lisp/gnus.el Mon May 6 01:44:10 1996 --- sgnus/lisp/gnus.el Tue May 7 00:22:52 1996 *************** *** 1715,1721 **** "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (defconst gnus-version "September Gnus v0.81" "Version number for this version of Gnus.") (defvar gnus-info-nodes --- 1715,1721 ---- "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (defconst gnus-version "September Gnus v0.82" "Version number for this version of Gnus.") (defvar gnus-info-nodes *************** *** 3766,3772 **** (defun gnus-parent-id (references) "Return the last Message-ID in REFERENCES." (when (and references ! (string-match "\\(<[^<>]+>\\)[ \t\n]*\\'" references)) (substring references (match-beginning 1) (match-end 1)))) (defun gnus-split-references (references) --- 3766,3772 ---- (defun gnus-parent-id (references) "Return the last Message-ID in REFERENCES." (when (and references ! (string-match "\\(<[^\n<>]+>\\)[ \t\n]*\\'" references)) (substring references (match-beginning 1) (match-end 1)))) (defun gnus-split-references (references) *************** *** 8020,8026 **** (defun gnus-id-to-article (id) "Return the article number of ID." (let ((thread (gnus-id-to-thread id))) ! (when thread (mail-header-number (car thread))))) (defun gnus-id-to-header (id) --- 8020,8027 ---- (defun gnus-id-to-article (id) "Return the article number of ID." (let ((thread (gnus-id-to-thread id))) ! (when (and thread ! (car thread)) (mail-header-number (car thread))))) (defun gnus-id-to-header (id) *************** *** 8030,8044 **** (defun gnus-article-displayed-root-p (article) "Say whether ARTICLE is a root(ish) article." (let ((level (gnus-summary-thread-level article)) particle) (cond ((null level) nil) ((zerop level) t) ((and (= 1 level) (null (setq particle (gnus-id-to-article ! (gnus-parent-id ! (mail-header-references ! (gnus-summary-article-header article)))))) (null (gnus-summary-thread-level particle))))))) (defun gnus-root-id (id) --- 8031,8046 ---- (defun gnus-article-displayed-root-p (article) "Say whether ARTICLE is a root(ish) article." (let ((level (gnus-summary-thread-level article)) + (refs (mail-header-references (gnus-summary-article-header article))) particle) (cond ((null level) nil) ((zerop level) t) + ((null refs) t) + ((null(gnus-parent-id refs)) t) ((and (= 1 level) (null (setq particle (gnus-id-to-article ! (gnus-parent-id refs)))) (null (gnus-summary-thread-level particle))))))) (defun gnus-root-id (id) *************** *** 14126,14132 **** (if (re-search-forward date-regexp nil t) (progn (setq bface (get-text-property (gnus-point-at-bol) 'face) ! eface (get-text-property (gnus-point-at-eol) 'face)) (message-remove-header date-regexp t) (beginning-of-line)) (goto-char (point-max))) --- 14128,14135 ---- (if (re-search-forward date-regexp nil t) (progn (setq bface (get-text-property (gnus-point-at-bol) 'face) ! eface (get-text-property (1- (gnus-point-at-eol)) ! 'face)) (message-remove-header date-regexp t) (beginning-of-line)) (goto-char (point-max))) *************** *** 14202,14210 **** (t (error "Unknown conversion type: %s" type))))) ;; Do highlighting. ! (beginning-of-line) ! (when (and highlight (gnus-visual-p 'article-highlight 'highlight) ! (looking-at "\\([^:]\\): *\\(.*\\)$")) (put-text-property (match-beginning 1) (match-end 1) 'face bface) (put-text-property (match-beginning 2) (match-end 2) --- 14205,14213 ---- (t (error "Unknown conversion type: %s" type))))) ;; Do highlighting. ! (forward-line -1) ! (when (and (gnus-visual-p 'article-highlight 'highlight) ! (looking-at "\\([^:]+\\): *\\(.*\\)$")) (put-text-property (match-beginning 1) (match-end 1) 'face bface) (put-text-property (match-beginning 2) (match-end 2) *** pub/sgnus/lisp/ChangeLog Mon May 6 01:44:20 1996 --- sgnus/lisp/ChangeLog Mon May 6 23:53:22 1996 *************** *** 1,4 **** --- 1,22 ---- + Mon May 6 20:51:43 1996 Lars Magne Ingebrigtsen + + * gnus-cite.el (gnus-dissect-cited-text): Sift single empty + lines. + + * gnus.el (gnus-id-to-article): Would bug out once in a while. + + * gnus-cite.el (gnus-article-hide-citation-in-followups): Really + hide citations in un-root articles. + (gnus-article-hide-citation): Place [...] consistently. + + * gnus.el (gnus-article-date-ut): Preserve faces. + + * gnus-cite.el (gnus-article-hide-citation): Would mess up + headers. + Mon May 6 00:23:09 1996 Lars Magne Ingebrigtsen + + * gnus.el: 0.81 is released. * message-xmas.el (message-mode-menu): Moved to this file.