*** pub/sgnus/lisp/gnus.el Wed Jun 5 20:28:00 1996 --- sgnus/lisp/gnus.el Thu Jun 6 20:53:03 1996 *************** *** 1728,1734 **** "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (defconst gnus-version-number "5.2.9" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) --- 1728,1734 ---- "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (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,12919 **** --- 12914,12921 ---- (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,12958 **** ;; This is a real article. (save-window-excursion (gnus-summary-select-article t nil nil article)) (unless gnus-save-all-headers ;; Remove headers accoring to `gnus-saved-headers'. (let ((gnus-visible-headers ! (or gnus-saved-headers gnus-visible-headers))) (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)))))) (gnus-summary-remove-process-mark article) (unless not-saved (gnus-summary-set-saved-mark article)))) (gnus-summary-position-point) n)) --- 12928,12961 ---- ;; 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)) ! (gnus-article-buffer save-buffer)) (gnus-article-hide-headers 1 t))) (save-window-excursion (if (not gnus-default-article-saver) (error "No default saver is defined.") ! ;; !!! 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,13907 **** (while (looking-at "From ") (forward-line 1)) (unless (bobp) ! (gnus-hide-text (point-min) (point) props)) ;; Then treat the rest of the header lines. (narrow-to-region (point) --- 13904,13912 ---- (while (looking-at "From ") (forward-line 1)) (unless (bobp) ! (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,14270 **** (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)))) (gnus-article-show-hidden-text type)) ((eq hide 'shown) (gnus-article-show-hidden-text type t)) (t nil))))) --- 14268,14277 ---- (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))))) *** pub/sgnus/lisp/message.el Wed Jun 5 20:28:02 1996 --- sgnus/lisp/message.el Thu Jun 6 21:54:54 1996 *************** *** 455,462 **** (defvar message-header-format-alist `((Newsgroups) ! (To . message-fill-header) ! (Cc . message-fill-header) (Subject) (In-Reply-To) (Fcc) --- 455,462 ---- (defvar message-header-format-alist `((Newsgroups) ! (To . message-fill-address) ! (Cc . message-fill-address) (Subject) (In-Reply-To) (Fcc) *************** *** 1540,1546 **** (if (not hashtb) t (while groups ! (unless (boundp (intern (car groups) hashtb)) (push (car groups) errors)) (pop groups)) (if (not errors) --- 1540,1547 ---- (if (not hashtb) t (while groups ! (when (and (not (boundp (intern (car groups) hashtb))) ! (not (equal (car groups) "poster"))) (push (car groups) errors)) (pop groups)) (if (not errors) *************** *** 2127,2132 **** --- 2128,2163 ---- ;;; 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) *************** *** 2894,2899 **** --- 2925,2932 ---- (apply 'append (mapcar 'message-flatten-list-1 list))) (list (list list)))) + + (run-hooks 'message-load-hook) (provide 'message) *** pub/sgnus/lisp/nnmail.el Wed Jun 5 20:28:02 1996 --- sgnus/lisp/nnmail.el Thu Jun 6 20:53:05 1996 *************** *** 381,392 **** ((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)) ;; Make the real inbox file empty. ;; Leaving it deleted could cause lossage ;; because mailers often won't create the file. --- 381,392 ---- ((and (not movemail) (not popmail)) ;; Try copying. If that fails (perhaps no space), ;; rename instead. ! (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,1154 **** --- 1149,1156 ---- (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) *** pub/sgnus/lisp/ChangeLog Wed Jun 5 20:28:11 1996 --- sgnus/lisp/ChangeLog Thu Jun 6 21:20:21 1996 *************** *** 1,4 **** --- 1,24 ---- + Thu Jun 6 18:22:04 1996 Lars Magne Ingebrigtsen + + * 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 + + * message.el (message-check-news-syntax): Don't warn on "poster". + Wed Jun 5 20:22:48 1996 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.2.9 is released. * message.el (message-setup): Add Mailcrypt magic.