Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

*** empty log message ***

  • Loading branch information...
commit d508f910bc721c76f1461d39bec537a6b782d83e 1 parent f4baee2
@larsmagne larsmagne authored
Showing with 91 additions and 29 deletions.
  1. +20 −0 lisp/ChangeLog
  2. +27 −20 lisp/gnus.el
  3. +36 −3 lisp/message.el
  4. +8 −6 lisp/nnmail.el
View
20 lisp/ChangeLog
@@ -1,5 +1,25 @@
+Thu Jun 6 18:22:04 1996 Lars Magne Ingebrigtsen <larsi@hler.ifi.uio.no>
+
+ * message.el (message-header-format-alist): Use
+ `message-fill-address' for To and Cc.
+ (message-fill-address): New function.
+
+ * gnus.el (gnus-article-check-hidden-text): Respect a postive
+ arg.
+ (gnus-summary-save-article): Remove headers from the original
+ article buffer.
+ (gnus-article-hide-headers): Delete "From " if wanted.
+
+ * nnmail.el (nnmail-load-hook): Run hooks.
+
+Thu Jun 6 14:41:20 1996 Lars Magne Ingebrigtsen <lars@eyesore.no>
+
+ * message.el (message-check-news-syntax): Don't warn on "poster".
+
Wed Jun 5 20:22:48 1996 Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+ * gnus.el: Gnus v5.2.9 is released.
+
* message.el (message-setup): Add Mailcrypt magic.
Wed Jun 5 18:01:58 1996 Lars Magne Ingebrigtsen <larsi@aegir.ifi.uio.no>
View
47 lisp/gnus.el
@@ -1728,7 +1728,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.9"
+(defconst gnus-version-number "5.2.10"
"Version number for this version of Gnus.")
(defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -12914,6 +12914,8 @@ The variable `gnus-default-article-saver' specifies the saver function."
(interactive "P")
(gnus-set-global-variables)
(let ((articles (gnus-summary-work-articles n))
+ (save-buffer (save-excursion
+ (nnheader-set-temp-buffer " *Gnus Save*")))
file header article)
(while articles
(setq header (gnus-summary-article-header
@@ -12926,33 +12928,34 @@ The variable `gnus-default-article-saver' specifies the saver function."
;; This is a real article.
(save-window-excursion
(gnus-summary-select-article t nil nil article))
+ (save-excursion
+ (set-buffer save-buffer)
+ (insert-buffer-substring gnus-original-article-buffer))
(unless gnus-save-all-headers
;; Remove headers accoring to `gnus-saved-headers'.
(let ((gnus-visible-headers
- (or gnus-saved-headers gnus-visible-headers)))
+ (or gnus-saved-headers gnus-visible-headers))
+ (gnus-article-buffer save-buffer))
(gnus-article-hide-headers 1 t)))
- ;; Remove any X-Gnus lines.
- (save-excursion
- (set-buffer gnus-article-buffer)
- (save-restriction
- (let ((buffer-read-only nil))
- (nnheader-narrow-to-headers)
- (while (re-search-forward "^X-Gnus" nil t)
- (gnus-delete-line)))))
(save-window-excursion
(if (not gnus-default-article-saver)
(error "No default saver is defined.")
- (setq file (funcall
- gnus-default-article-saver
- (cond
- ((not gnus-prompt-before-saving)
- 'default)
- ((eq gnus-prompt-before-saving 'always)
- nil)
- (t file))))))
+ ;; !!! Magic! The saving functions all save
+ ;; `gnus-original-article-buffer' (or so they think),
+ ;; but we bind that variable to out save-buffer.
+ (let ((gnus-original-article-buffer save-buffer))
+ (setq file (funcall
+ gnus-default-article-saver
+ (cond
+ ((not gnus-prompt-before-saving)
+ 'default)
+ ((eq gnus-prompt-before-saving 'always)
+ nil)
+ (t file)))))))
(gnus-summary-remove-process-mark article)
(unless not-saved
(gnus-summary-set-saved-mark article))))
+ (gnus-kill-buffer save-buffer)
(gnus-summary-position-point)
n))
@@ -13901,7 +13904,9 @@ always hide."
(while (looking-at "From ")
(forward-line 1))
(unless (bobp)
- (gnus-hide-text (point-min) (point) props))
+ (if delete
+ (delete-region (point-min) (point))
+ (gnus-hide-text (point-min) (point) props)))
;; Then treat the rest of the header lines.
(narrow-to-region
(point)
@@ -14263,8 +14268,10 @@ always hide."
(set-buffer gnus-article-buffer)
(let ((hide (gnus-article-hidden-text-p type)))
(cond ((or (and (null arg) (eq hide 'hidden))
- (and arg (< 0 (prefix-numeric-value arg))))
+ (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)))))
View
39 lisp/message.el
@@ -455,8 +455,8 @@ The cdr of ech entry is a function for applying the face to a region.")
(defvar message-header-format-alist
`((Newsgroups)
- (To . message-fill-header)
- (Cc . message-fill-header)
+ (To . message-fill-address)
+ (Cc . message-fill-address)
(Subject)
(In-Reply-To)
(Fcc)
@@ -1540,7 +1540,8 @@ the user from the mailer."
(if (not hashtb)
t
(while groups
- (unless (boundp (intern (car groups) hashtb))
+ (when (and (not (boundp (intern (car groups) hashtb)))
+ (not (equal (car groups) "poster")))
(push (car groups) errors))
(pop groups))
(if (not errors)
@@ -2127,6 +2128,36 @@ Headers already prepared in the buffer are not modified."
;;; Setting up a message buffer
;;;
+(defun message-fill-address (header value)
+ (save-restriction
+ (narrow-to-region (point) (point))
+ (insert (capitalize (symbol-name header))
+ ": "
+ (if (consp value) (car value) value)
+ "\n")
+ (narrow-to-region (point-min) (1- (point-max)))
+ (let (quoted last)
+ (goto-char (point-min))
+ (while (not (eobp))
+ (skip-chars-forward "^,\"" (point-max))
+ (if (or (= (following-char) ?,)
+ (eobp))
+ (when (not quoted)
+ (if (and (> (current-column) 78)
+ last)
+ (progn
+ (save-excursion
+ (goto-char last)
+ (insert "\n\t"))
+ (setq last (1+ (point))))
+ (setq last (1+ (point)))))
+ (setq quoted (not quoted)))
+ (unless (eobp)
+ (forward-char 1))))
+ (goto-char (point-max))
+ (widen)
+ (forward-line 1)))
+
(defun message-fill-header (header value)
(let ((begin (point))
(fill-column 78)
@@ -2895,6 +2926,8 @@ The following arguments may contain lists of values."
(list
(list list))))
+(run-hooks 'message-load-hook)
+
(provide 'message)
;;; message.el ends here
View
14 lisp/nnmail.el
@@ -381,12 +381,12 @@ parameter. It should return nil, `warn' or `delete'.")
((and (not movemail) (not popmail))
;; Try copying. If that fails (perhaps no space),
;; rename instead.
- (when (condition-case nil
- (copy-file inbox tofile nil)
- (error
- ;; Third arg is t so we can replace existing file TOFILE.
- (rename-file inbox tofile t)))
- (push inbox nnmail-moved-inboxes))
+ (condition-case nil
+ (copy-file inbox tofile nil)
+ (error
+ ;; Third arg is t so we can replace existing file TOFILE.
+ (rename-file inbox tofile t)))
+ (push inbox nnmail-moved-inboxes)
;; Make the real inbox file empty.
;; Leaving it deleted could cause lossage
;; because mailers often won't create the file.
@@ -1149,6 +1149,8 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
(setq days (nnmail-days-to-time days))
;; Compare the time with the current time.
(nnmail-time-less days (nnmail-time-since time)))))))
+
+(run-hooks 'nnmail-load-hook)
(provide 'nnmail)
Please sign in to comment.
Something went wrong with that request. Please try again.