*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08a7bb7..ddb8dad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,23 @@
+Mon May  6 20:51:43 1996  Lars Magne Ingebrigtsen  <larsi@ylfing.ifi.uio.no>
+
+       * 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  <larsi@ifi.uio.no>
 
+       * gnus.el: 0.81 is released.
+
        * message-xmas.el (message-mode-menu): Moved to this file.
 
        * message.el (message-make-organization): Use env var.

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 182e914..7c710e7 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -264,7 +264,17 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
          (setq omarks (cdr omarks)))
        (when (car omarks)
          (push (car omarks) marks))
-       (nreverse 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,12 +335,14 @@ always hide."
              (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)
+           (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))))))))
+            `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,8 +409,7 @@ See also the documentation for `gnus-article-highlight-citation'."
     (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-displayed-root-p article))
        (gnus-article-hide-citation)))))
 
 ;;; Internal functions:

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 84f619a..5deb8fb 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1715,7 +1715,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version "September Gnus v0.81"
+(defconst gnus-version "September Gnus v0.82"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -3766,7 +3766,7 @@ simple-first is t, first argument is already simplified."
 (defun gnus-parent-id (references)
   "Return the last Message-ID in REFERENCES."
   (when (and references
-            (string-match "\\(<[^<>]+>\\)[ \t\n]*\\'" references))
+            (string-match "\\(<[^\n<>]+>\\)[ \t\n]*\\'" references))
     (substring references (match-beginning 1) (match-end 1))))
 
 (defun gnus-split-references (references)
@@ -8020,7 +8020,8 @@ If NO-DISPLAY, don't generate a summary buffer."
 (defun gnus-id-to-article (id)
   "Return the article number of ID."
   (let ((thread (gnus-id-to-thread id)))
-    (when thread
+    (when (and thread
+              (car thread))
       (mail-header-number (car thread)))))
 
 (defun gnus-id-to-header (id)
@@ -8030,15 +8031,16 @@ If NO-DISPLAY, don't generate a summary buffer."
 (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 
-                                 (mail-header-references 
-                                  (gnus-summary-article-header article))))))
+                                (gnus-parent-id refs))))
           (null (gnus-summary-thread-level particle)))))))
 
 (defun gnus-root-id (id)
@@ -14126,7 +14128,8 @@ how much time has lapsed since DATE."
            (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))
+                       eface (get-text-property (1- (gnus-point-at-eol))
+                                                'face))
                  (message-remove-header date-regexp t)
                  (beginning-of-line))
              (goto-char (point-max)))
@@ -14202,9 +14205,9 @@ how much time has lapsed since DATE."
              (t
               (error "Unknown conversion type: %s" type)))))
          ;; Do highlighting.
-         (beginning-of-line)
-         (when (and highlight (gnus-visual-p 'article-highlight 'highlight)
-                    (looking-at "\\([^:]\\): *\\(.*\\)$"))
+         (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)