*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de61d14..ae3976f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,80 @@
+Mon Jun 10 03:08:10 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-cus.el (()): Changed LemonChiffon to Turquoise.
+
+       * message.el (message-signature-setup-hook): New hook.
+
+       * gnus-xmas.el (gnus-xmas-summary-recenter): `sit-for' for right
+       height. 
+
+Mon Jun 10 00:02:15 1996  Lars Magne Ingebrigtsen  <larsi@eistla.ifi.uio.no>
+
+       * gnus.el (gnus-article-check-hidden-text): New definition.
+       (gnus-hidden-arg): New function.
+       (gnus-article-hide-headers): Don't toggle when called
+       non-interactively. 
+
+       * messagexmas.el (message-xmas-setup-toolbar): Use xbms.
+
+       * gnus-score.el (gnus-score-file-regexp): Regexp-quote suffixes.
+       (gnus-score-load-file): Wouldn't set `adapt-file' right.
+
+       * gnus-xmas.el (gnus-xmas-logo-color-alist): Removed double "##". 
+
+       * gnus-score.el (gnus-score-find-bnews): Deal with "++".
+
+Sun Jun  9 22:18:05 1996  Lars Magne Ingebrigtsen  <larsi@eistla.ifi.uio.no>
+
+       * gnus-score.el (gnus-score-find-trace): Don't error, just beep. 
+
+       * gnus-cite.el (gnus-cite-minimum-match-count): Changed default to
+       2. 
+
+Sun Jun  9 05:48:18 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
+
+       * gnus.el (gnus-message-archive-method): Dox fix.
+
+       * message.el (message-check-news-syntax): Allow + and _ in group
+       names. 
+
+       * gnus.el (gnus-group-fetch-faq): Didn't allow completion.
+
+Sun Jun  9 05:36:16 1996  Hrvoje Niksic  <hniksic@srce.hr>
+
+       * message.el (message-ignored-supersedes-headers): New default. 
+
+Sun Jun  9 05:17:34 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
+
+       * gnus-score.el (gnus-score-score-files-1): Don't match on "/" in
+       file names.
+       * nnml.el (nnml-generate-nov-databases-1): Ditto.
+       * nnmh.el (nnmh-request-list-1): Ditto.
+       * gnus-uu.el (gnus-uu-scan-directory): Ditto.
+
+       * nnheaderems.el: Strip CR on windows-nt.
+
+Sun Jun  9 05:15:13 1996  Dave Disser  <disser@hpsdly.sdd.hp.com>
+
+       * gnus-picon.el (gnus-group-display-picons): Set instead of
+       switching buffer. 
+
+Sun Jun  9 05:08:51 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
+
+       * gnus.el (gnus-article-read-summary-keys): Don't save winconf on
+       "|". 
+
+       * nnmail.el (nnmail-delete-incoming): Changed default.
+
+       * gnus.el (gnus-eval-in-buffer-window): Indent correctly.
+
+Sat Jun  8 19:24:24 1996  Lars Magne Ingebrigtsen  <larsi@eistla.ifi.uio.no>
+
+       * gnus-cite.el (gnus-cite-minimum-match-count): Changed default. 
+
 Fri Jun  7 22:08:53 1996  Lars Magne Ingebrigtsen  <larsi@hler.ifi.uio.no>
 
+       * gnus.el: Gnus v5.2.12 is released.
+
        * gnus.el (gnus-summary-refer-article): Would bug out when
        referring non-sparse articles.
 

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index e726fc4..83b07bb 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -300,7 +300,7 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
 See the documentation for `gnus-article-highlight-citation'.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive (list current-prefix-arg 'force))
+  (interactive (append (gnus-hidden-arg) 'force))
   (setq gnus-cited-text-button-line-format-spec 
        (gnus-parse-format gnus-cited-text-button-line-format 
                           gnus-cited-text-button-line-format-alist t))
@@ -361,7 +361,7 @@ percent and at least `gnus-cite-hide-absolute' lines of the body is
 cited text with attributions.  When called interactively, these two
 variables are ignored.
 See also the documentation for `gnus-article-highlight-citation'."
-  (interactive (list current-prefix-arg 'force))
+  (interactive (append (gnus-hidden-arg) 'force))
   (unless (gnus-article-check-hidden-text 'cite arg)
     (save-excursion
       (set-buffer gnus-article-buffer)

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 9682250..053a281 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -597,13 +597,13 @@ ticked: The number of ticked articles.")
               ((= unread 0) . italic)))
            ((eq gnus-background-mode 'dark)
             `(((and (not mailp) (eq level 1)) .
-               ,(custom-face-lookup "LemonChiffon1" nil nil t))
+               ,(custom-face-lookup "PaleTurquoise" nil nil t))
               ((and (not mailp) (eq level 2)) .
-               ,(custom-face-lookup "LemonChiffon2" nil nil t))
+               ,(custom-face-lookup "turquoise" nil nil t))
               ((and (not mailp) (eq level 3)) .
-               ,(custom-face-lookup "LemonChiffon3" nil nil t))
+               ,(custom-face-lookup "MediumTurquoise" nil nil t))
               ((and (not mailp) (>= level 4)) .
-               ,(custom-face-lookup "LemonChiffon4" nil nil t))
+               ,(custom-face-lookup "DarkTurquoise" nil nil t))
               ((and mailp (eq level 1)) .
                ,(custom-face-lookup "aquamarine1" nil nil t))
               ((and mailp (eq level 2)) .

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index f6025c5..5315470 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -212,7 +212,7 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
                          (replace-in-string from ".*@\\([_a-zA-Z0-9-.]+\\).*" 
                                             "\\1") 
                          "\\." "/")) "/")))
-          (switch-to-buffer (gnus-get-buffer-name gnus-picons-display-where))
+          (set-to-buffer (gnus-get-buffer-name gnus-picons-display-where))
           (gnus-add-current-to-buffer-list)
           (beginning-of-buffer)
           (setq iconpoint (point))
@@ -264,7 +264,7 @@ To use:  (setq gnus-article-x-face-command 'gnus-picons-display-x-face)"
       (save-excursion
        (let
            ((iconpoint (point)))
-         (switch-to-buffer (gnus-get-buffer-name gnus-picons-display-where))
+         (set-to-buffer (gnus-get-buffer-name gnus-picons-display-where))
          (gnus-add-current-to-buffer-list)
          (beginning-of-buffer)
          (cond 

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 622ad98..61954d3 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -865,7 +865,7 @@ SCORE is the score to add."
          (adapt (gnus-score-get 'adapt alist))
          (thread-mark-and-expunge
           (car (gnus-score-get 'thread-mark-and-expunge alist)))
-         (adapt-file (car (gnus-score-get 'adapt-file)))
+         (adapt-file (car (gnus-score-get 'adapt-file alist)))
          (local (gnus-score-get 'local alist))
          (eval (car (gnus-score-get 'eval alist))))
       ;; We do not respect eval and files atoms from global score
@@ -1057,7 +1057,9 @@ SCORE is the score to add."
            (setq score (setcdr entry (delq (assq 'touched score) score)))
            (erase-buffer)
            (let (emacs-lisp-mode-hook)
-             (if (string-match (concat gnus-adaptive-file-suffix "$") file)
+             (if (string-match 
+                  (concat (regexp-quote gnus-adaptive-file-suffix)
+                          "$") file)
                  ;; This is an adaptive score file, so we do not run
                  ;; it through `pp'.  These files can get huge, and
                  ;; are not meant to be edited by human hands.
@@ -1859,17 +1861,17 @@ SCORE is the score to add."
        trace)
     (setq gnus-score-trace nil)
     (gnus-possibly-score-headers 'trace)
-    (or (setq trace gnus-score-trace)
-       (error "No score rules apply to the current article."))
-    (pop-to-buffer "*Gnus Scores*")
-    (gnus-add-current-to-buffer-list)
-    (erase-buffer)
-    (while trace
-      (insert (format "%S  ->  %s\n" (cdar trace)
-                     (file-name-nondirectory (caar trace))))
-      (setq trace (cdr trace)))
-    (goto-char (point-min))
-    (pop-to-buffer buf)))
+    (if (not (setq trace gnus-score-trace))
+       (gnus-error 1 "No score rules apply to the current article.")
+      (pop-to-buffer "*Gnus Scores*")
+      (gnus-add-current-to-buffer-list)
+      (erase-buffer)
+      (while trace
+       (insert (format "%S  ->  %s\n" (cdar trace)
+                       (file-name-nondirectory (caar trace))))
+       (setq trace (cdr trace)))
+      (goto-char (point-min))
+      (pop-to-buffer buf))))
 
 (defun gnus-summary-rescore ()
   "Redo the entire scoring process in the current summary."
@@ -2005,7 +2007,7 @@ SCORE is the score to add."
     (while (setq file (pop files))
       (cond 
        ;; Ignore "." and "..".
-       ((string-match "/\\.\\.?\\'" file)
+       ((member (file-name-nondirectory file) '("." ".."))
        nil)
        ;; Recurse down directories.
        ((file-directory-p file)
@@ -2019,8 +2021,8 @@ SCORE is the score to add."
        
 (defun gnus-score-file-regexp ()
   "Return a regexp that match all score files."
-  (concat "\\(" gnus-score-file-suffix 
-         "\\|" gnus-adaptive-file-suffix "\\)\\'"))
+  (concat "\\(" (regexp-quote gnus-score-file-suffix )
+         "\\|" (regexp-quote gnus-adaptive-file-suffix) "\\)\\'"))
        
 (defun gnus-score-find-bnews (group)
   "Return a list of score files for GROUP.
@@ -2067,7 +2069,12 @@ GROUP using BNews sys file syntax."
                 (search-forward "+")
                 (forward-char -1)
                 (insert "\\")))
+         ;; Kludge to deal with "++".
+         (goto-char (point-min))
+         (while (search-forward "++" nil t)
+           (replace-match "\\+\\+" t t))
          ;; Translate "all" to ".*".
+         (goto-char (point-min))
          (while (search-forward "all" nil t)
            (replace-match ".*" t t))
          (goto-char (point-min))

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index f93a869..6d10a5e 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -679,7 +679,7 @@ The headers will be included in the sequence they are matched.")
   (let ((files (directory-files dir t))
        out file)
     (while (setq file (pop files))
-      (unless (string-match "/\\.\\.?$" file)
+      (unless (member (file-name-nondirectory file) '("." ".."))
        (push (list (cons 'name file)
                    (cons 'article gnus-current-article))
              out)
@@ -1520,7 +1520,7 @@ The headers will be included in the sequence they are matched.")
     (while files
       (setq file (car files))
       (setq files (cdr files))
-      (or (string-match "/\\.\\.?$" file)
+      (or (member (file-name-nondirectory file) '("." ".."))
          (setq out (cons file out))))
     (setq out (nreverse out))
     out))
@@ -1622,7 +1622,7 @@ The headers will be included in the sequence they are matched.")
     (let ((files (directory-files dir t nil t))
          file)
       (while (setq file (pop files))
-       (unless (string-match "/\\.\\.?$" file)
+       (unless (member (file-name-nondirectory file) '("." ".."))
          (if (file-directory-p file)
              (gnus-uu-delete-work-dir file)
            (gnus-message 9 "Deleting file %s..." file)

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 3ef91e2..e040831 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -36,25 +36,25 @@ If this variable is nil, Gnus will try to locate the directory
 automatically.")
 
 (defvar gnus-xmas-logo-color-alist
-  '((flame "##cc3300" "##ff2200") 
-    (pine "##c0cc93" "##f8ffb8") 
-    (moss "##a1cc93" "##d2ffb8")
-    (irish "##04cc90" "##05ff97")
-    (sky "##049acc" "##05deff")
-    (tin "##6886cc" "##82b6ff")
-    (velvet "##7c68cc" "##8c82ff")
-    (grape "##b264cc" "##cf7df")
-    (labia "##cc64c2" "##fd7dff")
-    (berry "##cc6485" "##ff7db5")
-    (neutral "##b4b4b4" "##878787")
+  '((flame "#cc3300" "#ff2200") 
+    (pine "#c0cc93" "#f8ffb8") 
+    (moss "#a1cc93" "#d2ffb8")
+    (irish "#04cc90" "#05ff97")
+    (sky "#049acc" "#05deff")
+    (tin "#6886cc" "#82b6ff")
+    (velvet "#7c68cc" "#8c82ff")
+    (grape "#b264cc" "#cf7df")
+    (labia "#cc64c2" "#fd7dff")
+    (berry "#cc6485" "#ff7db5")
+    (neutral "#b4b4b4" "#878787")
     (september "#bf9900" "#ffcc00"))
   "Color alist used for the Gnus logo.")
 
 (defvar gnus-xmas-logo-color-style 'september
   "Color styles used for the Gnus logo.")
 
-(defvar gnus-xmas-logo-colors (cdr (assq gnus-xmas-logo-color-style 
-                                        gnus-xmas-logo-color-alist))
+(defvar gnus-xmas-logo-colors
+  (cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
   "Colors used for the Gnus logo.")
 
 ;;; Internal variables.
@@ -137,6 +137,7 @@ displayed, no centering will be performed."
   ;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).
   ;; Recenter only when requested.  Suggested by popovich@park.cs.columbia.edu.
   (when gnus-auto-center-summary
+    (sit-for 0)
     (let* ((height (if (fboundp 'window-displayed-height)
                       (window-displayed-height)
                     (- (window-height) 2)))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 9a7c24d..20840d1 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -144,7 +144,11 @@ see the manual for details.")
     (nnfolder-get-new-mail nil)
     (nnfolder-inhibit-expiry t))
   "*Method used for archiving messages you've sent.
-This should be a mail method.")
+This should be a mail method.
+
+It's probably not a very effective to change this variable once you've
+run Gnus once.  After doing that, you must edit this server from the
+server buffer.")
 
 (defvar gnus-refer-article-method nil
   "*Preferred method for fetching an article by Message-ID.
@@ -1728,7 +1732,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-number "5.2.12"
+(defconst gnus-version-number "5.2.13"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -2127,6 +2131,10 @@ Thank you for your help in stamping out bugs.
             ,@forms)
         (select-window ,tempvar)))))
 
+(put 'gnus-eval-in-buffer-window 'lisp-indent-function 1)
+(put 'gnus-eval-in-buffer-window 'lisp-indent-hook 1)
+(put 'gnus-eval-in-buffer-window 'edebug-form-spec '(form body))
+
 (defmacro gnus-gethash (string hashtable)
   "Get hash value of STRING in HASHTABLE."
   `(symbol-value (intern-soft ,string ,hashtable)))
@@ -6513,7 +6521,8 @@ If N is negative, this group and the N-1 previous groups will be checked."
     (cond (current-prefix-arg
           (completing-read
            "Faq dir: " (and (listp gnus-group-faq-directory)
-                            gnus-group-faq-directory))))))
+                            (mapcar (lambda (file) (list file))
+                                    gnus-group-faq-directory)))))))
   (or faq-dir
       (setq faq-dir (if (listp gnus-group-faq-directory)
                        (car gnus-group-faq-directory)
@@ -10500,9 +10509,8 @@ article."
              (not (equal (car gnus-article-current) gnus-newsgroup-name)))
          ;; Selected subject is different from current article's.
          (gnus-summary-display-article article)
-       (gnus-eval-in-buffer-window
-        gnus-article-buffer
-        (setq endp (gnus-article-next-page lines)))
+       (gnus-eval-in-buffer-window gnus-article-buffer
+         (setq endp (gnus-article-next-page lines)))
        (if endp
            (cond (circular
                   (gnus-summary-beginning-of-article))
@@ -10531,7 +10539,7 @@ Argument LINES specifies lines to be scrolled down."
        (gnus-summary-display-article article)
       (gnus-summary-recenter)
       (gnus-eval-in-buffer-window gnus-article-buffer
-                                 (gnus-article-prev-page lines))))
+       (gnus-article-prev-page lines))))
   (gnus-summary-position-point))
 
 (defun gnus-summary-scroll-up (lines)
@@ -10542,13 +10550,12 @@ Argument LINES specifies lines to be scrolled up (or down if negative)."
   (gnus-configure-windows 'article)
   (gnus-summary-show-thread)
   (when (eq (gnus-summary-select-article nil nil 'pseudo) 'old)
-    (gnus-eval-in-buffer-window
-     gnus-article-buffer
-     (cond ((> lines 0)
-           (if (gnus-article-next-page lines)
-               (gnus-message 3 "End of message")))
-          ((< lines 0)
-           (gnus-article-prev-page (- lines))))))
+    (gnus-eval-in-buffer-window gnus-article-buffer
+      (cond ((> lines 0)
+            (if (gnus-article-next-page lines)
+                (gnus-message 3 "End of message")))
+           ((< lines 0)
+            (gnus-article-prev-page (- lines))))))
   (gnus-summary-recenter)
   (gnus-summary-position-point))
 
@@ -11152,10 +11159,9 @@ If REGEXP-P (the prefix) is non-nil, do regexp isearch."
   (gnus-set-global-variables)
   (gnus-summary-select-article)
   (gnus-configure-windows 'article)
-  (gnus-eval-in-buffer-window
-   gnus-article-buffer
-   (goto-char (point-min))
-   (isearch-forward regexp-p)))
+  (gnus-eval-in-buffer-window gnus-article-buffer
+    (goto-char (point-min))
+    (isearch-forward regexp-p)))
 
 (defun gnus-summary-search-article-forward (regexp &optional backward)
   "Search for an article containing REGEXP forward.
@@ -11295,11 +11301,10 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
   (gnus-set-global-variables)
   (gnus-summary-select-article)
   (gnus-configure-windows 'article)
-  (gnus-eval-in-buffer-window
-   gnus-article-buffer
-   (widen)
-   (goto-char (point-min))
-   (and gnus-break-pages (gnus-narrow-to-page))))
+  (gnus-eval-in-buffer-window gnus-article-buffer
+    (widen)
+    (goto-char (point-min))
+    (and gnus-break-pages (gnus-narrow-to-page))))
 
 (defun gnus-summary-end-of-article ()
   "Scroll to the end of the article."
@@ -11307,12 +11312,11 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
   (gnus-set-global-variables)
   (gnus-summary-select-article)
   (gnus-configure-windows 'article)
-  (gnus-eval-in-buffer-window
-   gnus-article-buffer
-   (widen)
-   (goto-char (point-max))
-   (recenter -3)
-   (and gnus-break-pages (gnus-narrow-to-page))))
+  (gnus-eval-in-buffer-window gnus-article-buffer
+    (widen)
+    (goto-char (point-max))
+    (recenter -3)
+    (and gnus-break-pages (gnus-narrow-to-page))))
 
 (defun gnus-summary-show-article (&optional arg)
   "Force re-fetching of the current article.
@@ -11400,21 +11404,21 @@ forward."
   (gnus-set-global-variables)
   (gnus-summary-select-article)
   (let ((mail-header-separator ""))
-    (gnus-eval-in-buffer-window
-     gnus-article-buffer
-     (save-restriction
-       (widen)
-       (let ((start (window-start))
-            buffer-read-only)
-        (message-caesar-buffer-body arg)
-        (set-window-start (get-buffer-window (current-buffer)) start))))))
+    (gnus-eval-in-buffer-window gnus-article-buffer
+      (save-restriction
+       (widen)
+       (let ((start (window-start))
+             buffer-read-only)
+         (message-caesar-buffer-body arg)
+         (set-window-start (get-buffer-window (current-buffer)) start))))))
 
 (defun gnus-summary-stop-page-breaking ()
   "Stop page breaking in the current article."
   (interactive)
   (gnus-set-global-variables)
   (gnus-summary-select-article)
-  (gnus-eval-in-buffer-window gnus-article-buffer (widen)))
+  (gnus-eval-in-buffer-window gnus-article-buffer
+    (widen)))
 
 (defun gnus-summary-move-article (&optional n to-newsgroup select-method action)
   "Move the current article to a different newsgroup.
@@ -13178,12 +13182,11 @@ Directory to save to is default to `gnus-article-save-directory'."
                (t (gnus-read-save-file-name
                    "Save in rmail file:" default-name))))
     (gnus-make-directory (file-name-directory filename))
-    (gnus-eval-in-buffer-window
-     gnus-original-article-buffer
-     (save-excursion
-       (save-restriction
-        (widen)
-        (gnus-output-to-rmail filename))))
+    (gnus-eval-in-buffer-window gnus-original-article-buffer
+      (save-excursion
+       (save-restriction
+         (widen)
+         (gnus-output-to-rmail filename))))
     ;; Remember the directory name to save articles
     (setq gnus-newsgroup-last-rmail filename)))
 
@@ -13207,15 +13210,14 @@ Directory to save to is default to `gnus-article-save-directory'."
                            (and default-name
                                 (file-name-directory default-name))))
     (gnus-make-directory (file-name-directory filename))
-    (gnus-eval-in-buffer-window
-     gnus-original-article-buffer
-     (save-excursion
-       (save-restriction
-        (widen)
-        (if (and (file-readable-p filename) (mail-file-babyl-p filename))
-            (gnus-output-to-rmail filename)
-          (let ((mail-use-rfc822 t))
-            (rmail-output filename 1 t t))))))
+    (gnus-eval-in-buffer-window gnus-original-article-buffer
+      (save-excursion
+       (save-restriction
+         (widen)
+         (if (and (file-readable-p filename) (mail-file-babyl-p filename))
+             (gnus-output-to-rmail filename)
+           (let ((mail-use-rfc822 t))
+             (rmail-output filename 1 t t))))))
     ;; Remember the directory name to save articles.
     (setq gnus-newsgroup-last-mail filename)))
 
@@ -13235,12 +13237,11 @@ Directory to save to is default to `gnus-article-save-directory'."
                (t (gnus-read-save-file-name
                    "Save in file:" default-name))))
     (gnus-make-directory (file-name-directory filename))
-    (gnus-eval-in-buffer-window
-     gnus-original-article-buffer
-     (save-excursion
-       (save-restriction
-        (widen)
-        (gnus-output-to-file filename))))
+    (gnus-eval-in-buffer-window gnus-original-article-buffer
+      (save-excursion
+       (save-restriction
+         (widen)
+         (gnus-output-to-file filename))))
     ;; Remember the directory name to save articles.
     (setq gnus-newsgroup-last-file filename)))
 
@@ -13260,15 +13261,14 @@ The directory to save in defaults to `gnus-article-save-directory'."
                (t (gnus-read-save-file-name
                    "Save body in file:" default-name))))
     (gnus-make-directory (file-name-directory filename))
-    (gnus-eval-in-buffer-window
-     gnus-article-buffer
-     (save-excursion
-       (save-restriction
-        (widen)
-        (goto-char (point-min))
-        (and (search-forward "\n\n" nil t)
-             (narrow-to-region (point) (point-max)))
-        (gnus-output-to-file filename))))
+    (gnus-eval-in-buffer-window gnus-article-buffer
+      (save-excursion
+       (save-restriction
+         (widen)
+         (goto-char (point-min))
+         (and (search-forward "\n\n" nil t)
+              (narrow-to-region (point) (point-max)))
+         (gnus-output-to-file filename))))
     ;; Remember the directory name to save articles.
     (setq gnus-newsgroup-last-file filename)))
 
@@ -13284,11 +13284,10 @@ The directory to save in defaults to `gnus-article-save-directory'."
                              gnus-last-shell-command))))
   (if (string-equal command "")
       (setq command gnus-last-shell-command))
-  (gnus-eval-in-buffer-window
-   gnus-article-buffer
-   (save-restriction
-     (widen)
-     (shell-command-on-region (point-min) (point-max) command nil)))
+  (gnus-eval-in-buffer-window gnus-article-buffer
+    (save-restriction
+      (widen)
+      (shell-command-on-region (point-min) (point-max) command nil)))
   (setq gnus-last-shell-command command))
 
 ;; Summary extract commands
@@ -13894,7 +13893,7 @@ Provided for backwards compatibility."
   "Toggle whether to hide unwanted headers and possibly sort them as well.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive "P")
+  (interactive (gnus-hidden-arg))
   (if (gnus-article-check-hidden-text 'headers arg)
       ;; Show boring headers as well.
       (gnus-article-show-hidden-text 'boring-headers)
@@ -13966,7 +13965,7 @@ always hide."
   "Toggle hiding of headers that aren't very interesting.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive "P")
+  (interactive (gnus-hidden-arg))
   (unless (gnus-article-check-hidden-text 'boring-headers arg)
     (save-excursion
       (set-buffer gnus-article-buffer)
@@ -14205,7 +14204,7 @@ or not."
   "Toggle hiding of any PGP headers and signatures in the current article.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive "P")
+  (interactive (gnus-hidden-arg))
   (unless (gnus-article-check-hidden-text 'pgp arg)
     (save-excursion
       (set-buffer gnus-article-buffer)
@@ -14240,7 +14239,7 @@ always hide."
   "Hide the signature in the current article.
 If given a negative prefix, always show; if given a positive prefix,
 always hide."
-  (interactive "P")
+  (interactive (gnus-hidden-arg))
   (unless (gnus-article-check-hidden-text 'signature arg)
     (save-excursion
       (set-buffer gnus-article-buffer)
@@ -14285,19 +14284,29 @@ always hide."
       (narrow-to-region (point) (point-max))
       t)))
 
+(defun gnus-hidden-arg ()
+  "Return the current prefix arg as a number, or 0 if no prefix."
+  (list (if current-prefix-arg
+           (prefix-numeric-value current-prefix-arg)
+         0)))
+
 (defun gnus-article-check-hidden-text (type arg)
-  "Return nil if hiding is necessary."
+  "Return nil if hiding is necessary.
+Arg can be nil or a number.  Nil and positive means hide, negative
+means show, 0 means toggle."
   (save-excursion
     (set-buffer gnus-article-buffer)
     (let ((hide (gnus-article-hidden-text-p type)))
-      (cond ((or (and (null arg) (eq hide 'hidden))
-                (and arg (< (prefix-numeric-value arg) 1)))
-            (gnus-article-show-hidden-text type))
-           ((and (numberp arg) (> (prefix-numeric-value arg) 0))
-            nil)
-           ((eq hide 'shown)
-            (gnus-article-show-hidden-text type t))
-           (t nil)))))
+      (cond
+       ((or (null arg)
+           (> arg 0))
+       nil)
+       ((< arg 0)
+       (gnus-article-show-hidden-text type))
+       (t
+       (if (eq hide 'hidden)
+           (gnus-article-show-hidden-text type)
+         nil))))))
 
 (defun gnus-article-hidden-text-p (type)
   "Say whether the current buffer contains hidden text of type TYPE."
@@ -14711,7 +14720,7 @@ Argument LINES specifies lines to be scrolled down."
   (let ((nosaves
         '("q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
           "Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP"
-          "=" "^" "\M-^"))
+          "=" "^" "\M-^" "|"))
        keys)
     (save-excursion
       (set-buffer gnus-summary-buffer)

diff --git a/lisp/message.el b/lisp/message.el
index ddc9d8f..a399e16 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -123,8 +123,7 @@ included.  Organization, Lines and X-Mailer are optional.")
   "*Regexp of headers to be removed unconditionally before mailing.")
 
 ;;;###autoload
-(defvar message-ignored-supersedes-headers
-  "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|Return-Path:"
+(defvar message-ignored-supersedes-headers "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|Return-Path:\\|^Supersedes:"
   "*Header lines matching this regexp will be deleted before posting.
 It's best to delete old Path and Date headers before posting to avoid
 any confusion.")
@@ -253,6 +252,11 @@ always use the value.")
   "Normal hook, run each time a new outgoing message is initialized.
 The function `message-setup' runs this hook.")
 
+(defvar message-signature-setup-hook nil
+  "Normal hook, run each time a new outgoing message is initialized.
+It is run after the headers have been inserted and before 
+the signature is inserted.")
+
 (defvar message-mode-hook nil
   "Hook run in message mode buffers.")
 
@@ -1561,9 +1565,10 @@ the user from the mailer."
           (while (and headers (not error))
             (when (setq header (mail-fetch-field (car headers)))
               (if (or
-                   (not (string-match
-                         "\\`\\([-.a-zA-Z0-9]+\\)?\\(,[-.a-zA-Z0-9]+\\)*\\'"
-                         header))
+                   (not 
+                    (string-match
+                     "\\`\\([-+_&.a-zA-Z0-9]+\\)?\\(,[-.a-zA-Z0-9]+\\)*\\'"
+                     header))
                    (memq 
                     nil (mapcar 
                          (lambda (g)
@@ -2294,6 +2299,7 @@ Headers already prepared in the buffer are not modified."
        (delq 'Lines
             (delq 'Subject
                   (copy-sequence message-required-mail-headers))))))
+  (run-hooks 'message-signature-setup-hook)
   (message-insert-signature)
   (message-set-auto-save-file-name)
   (save-restriction

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 426700c..851cd1c 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -66,6 +66,7 @@ If it is non-nil, it must be a toolbar.  The five legal values are
 
 (defun message-xmas-setup-toolbar (bar &optional force package)
   (let ((dir (message-xmas-find-glyph-directory package))
+       (xpm (if (featurep 'xpm) "xpm" "xbm"))
        icon up down disabled name)
     (unless package
       (setq message-xmas-glyph-directory dir))
@@ -77,9 +78,9 @@ If it is non-nil, it must be a toolbar.  The five legal values are
          (setq icon (aref (car bar) 0)
                name (symbol-name icon)
                bar (cdr bar))
-         (setq up (concat dir name "-up.xpm"))
-         (setq down (concat dir name "-down.xpm"))
-         (setq disabled (concat dir name "-disabled.xpm"))
+         (setq up (concat dir name "-up." xpm))
+         (setq down (concat dir name "-down." xpm))
+         (setq disabled (concat dir name "-disabled." xpm))
          (if (not (file-exists-p up))
              (set icon nil)
            (set icon (toolbar-make-button-list

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 966c403..f66a486 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -389,7 +389,7 @@ on your system, you could say something like:
 
 (put 'nnheader-temp-write 'lisp-indent-function 1)
 (put 'nnheader-temp-write 'lisp-indent-hook 1)
-(put 'nnheader-temp-write 'edebug-form-spec '(file &rest form))
+(put 'nnheader-temp-write 'edebug-form-spec '(form body))
 
 (defvar jka-compr-compression-info-list)
 (defvar nnheader-numerical-files

diff --git a/lisp/nnheaderems.el b/lisp/nnheaderems.el
index 18c50b1..14ce490 100644 (file)
--- a/lisp/nnheaderems.el
+++ b/lisp/nnheaderems.el
@@ -193,7 +193,7 @@ The buffer is not selected, just returned to the caller."
     (fset 'nnheader-insert-file-contents-literally
          'insert-file-contents-literally)
     ))
-  (when (memq system-type '())
+  (when (memq system-type '(windows-nt))
     (add-hook 'nnmail-prepare-incoming-hook 'nnheader-ms-strip-cr)))
 
 (provide 'nnheaderems)

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 3869a48..53a387e 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -236,7 +236,7 @@ Example:
     (mail . "mailer-daemon\\|postmaster"))
   "*Alist of abbreviations allowed in `nnmail-split-fancy'.")
 
-(defvar nnmail-delete-incoming nil
+(defvar nnmail-delete-incoming t
   "*If non-nil, the mail backends will delete incoming files after splitting.")
 
 (defvar nnmail-message-id-cache-length 1000

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 798c79f..009f940 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -195,7 +195,7 @@
        dir)
     ;; Recurse down directories.
     (while (setq dir (pop dirs))
-      (when (and (not (string-match "/\\.\\.?$" dir))
+      (when (and (not (member (file-name-nondirectory file) '("." "..")))
                 (file-directory-p dir)
                 (file-readable-p dir))
        (nnmh-request-list-1 dir))))

diff --git a/lisp/nnml.el b/lisp/nnml.el
index f9e0ac3..8f2c494 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -681,7 +681,7 @@ all. This may very well take some time.")
        dir)
     (while dirs 
       (setq dir (pop dirs))
-      (when (and (not (string-match "/\\.\\.?$" dir))
+      (when (and (not (member (file-name-nondirectory file) '("." "..")))
                 (file-directory-p dir))
        (nnml-generate-nov-databases-1 dir))))
   ;; Do this directory.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index effebfb..d40a3ad 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jun 10 03:21:04 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * message.texi (Various Message Variables): Addition.
+
+Sun Jun  9 23:36:12 1996  Lars Magne Ingebrigtsen  <larsi@eistla.ifi.uio.no>
+
+       * gnus.texi (Composing Messages): Reference Message.
+
+Sun Jun  9 05:43:26 1996  Lars Magne Ingebrigtsen  <lars@eyesore.no>
+
+       * Makefile (all): Don't make refcard by default.
+
+       * gnus.texi (Canceling and Superseding): Delatia.
+
 Wed Jun  5 20:25:17 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
        * message.texi (Message Buffers): Add menu entry.

diff --git a/texi/Makefile b/texi/Makefile
index 311ba3d..f401c2a 100644 (file)
--- a/texi/Makefile
+++ b/texi/Makefile
@@ -6,7 +6,7 @@ LATEX=latex
 DVIPS=dvips
 PERL=perl
 
-all: gnus.info message.info refcard.dvi 
+all: gnus.info message.info 
 
 most: texi2latexi.elc latex latexps
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index a51ef14..2abda77 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -3155,13 +3155,6 @@ Go to the original article and press @kbd{S s}
 where you can edit the article all you want before sending it off the
 usual way.
 
-@vindex gnus-delete-supersedes-headers
-You probably want to delete some of the old headers before sending the
-superseding article---@code{Path} and @code{Date} are probably
-incorrect.  Set @code{gnus-delete-supersedes-headers} to a regexp to
-match the lines you want removed.  The default is
-@samp{^Path:\\|^Date}. 
-
 The same goes for superseding as for canceling, only more so: Some
 sites do not honor superseding.  On those sites, it will appear that you
 have posted almost the same article twice.
@@ -6380,9 +6373,10 @@ This is the delimiter mentioned above.  By default, it is @samp{^L}
 @kindex C-c C-c (Post)
 All commands for posting and mailing will put you in a message buffer
 where you can edit the article all you like, before you send the article
-by pressing @kbd{C-c C-c}.  If you are in a foreign news group, and you
-wish to post the article using the foreign server, you can give a prefix
-to @kbd{C-c C-c} to make Gnus try to post using the foreign server.
+by pressing @kbd{C-c C-c}.  (@pxref{(message)Top}).  If you are in a
+foreign news group, and you wish to post the article using the foreign
+server, you can give a prefix to @kbd{C-c C-c} to make Gnus try to post
+using the foreign server.
 
 @menu 
 * Mail::                 Mailing and replying.

diff --git a/texi/message.texi b/texi/message.texi
index 7763da9..e70a7b0 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -251,8 +251,8 @@ If this variable is @code{t}, which it is by default, your personal
 signature will be inserted before the forwarded message.  If not, the
 forwarded message will be inserted first in the new mail.
 
-@item message-forward-included-headers
-@vindex message-forward-included-headers
+@item message-included-forward-headers
+@vindex message-included-forward-headers
 Regexp matching header lines to be included in forwarded messages.  
 
 @end table
@@ -862,9 +862,14 @@ Directory used by many mailey things.  The default is @file{~/Mail/}.
 @vindex message-autosave-directory
 Directory where message buffers will be autosaved to.
 
+@item message-signature-setup-hook
+@vindex message-signature-setup-hook
+Hook run when initializing the message buffer.  It is run after the
+headers have been inserted but before the signature has been inserted. 
+
 @item message-setup-hook
 @vindex message-setup-hook
-Hook run when the message buffer has been initialized.
+Hook run as the last thing when the message buffer has been initialized.
 
 @item message-header-setup-hook
 @vindex message-header-setup-hook