*** pub/sgnus/lisp/gnus-cache.el Tue Jun 25 23:15:45 1996 --- sgnus/lisp/gnus-cache.el Wed Jun 26 23:16:14 1996 *************** *** 66,72 **** (defun gnus-cache-open () "Initialize the cache." ! (gnus-cache-read-active)) (gnus-add-shutdown 'gnus-cache-close 'gnus) --- 66,75 ---- (defun gnus-cache-open () "Initialize the cache." ! (when (or (file-exists-p gnus-cache-directory) ! (and gnus-use-cache ! (not (eq gnus-use-cache 'passive)))) ! (gnus-cache-read-active))) (gnus-add-shutdown 'gnus-cache-close 'gnus) *** pub/sgnus/lisp/gnus-msg.el Tue Jun 25 23:15:46 1996 --- sgnus/lisp/gnus-msg.el Wed Jun 26 19:49:21 1996 *************** *** 55,74 **** current newsgroup name and then returns a suitable group name (or list of names).") - (defvar gnus-message-archive-group - '((if (message-news-p) "misc-news" "misc-mail")) - "*Name of the group in which to save the messages you've written. - This can either be a string, a list of strings; or an alist - of regexps/functions/forms to be evaluated to return a string (or a list - of strings). The functions are called with the name of the current - group (or nil) as a parameter. - - Normally the group names returned by this variable should be - unprefixed -- which implictly means \"store on the archive server\". - However, you may wish to store the message on some other server. In - that case, just return a fully prefixed name of the group -- - \"nnml+private:mail.misc\", for instance.") - (defvar gnus-mailing-list-groups nil "*Regexp matching groups that are really mailing lists. This is useful when you're reading a mailing list that has been --- 55,60 ---- *** pub/sgnus/lisp/gnus.el Tue Jun 25 23:15:52 1996 --- sgnus/lisp/gnus.el Wed Jun 26 23:41:56 1996 *************** *** 34,39 **** --- 34,40 ---- (require 'message) (require 'nnmail) (require 'backquote) + (require 'nnoo) (eval-when-compile (require 'cl)) *************** *** 149,154 **** --- 150,168 ---- run Gnus once. After doing that, you must edit this server from the server buffer.") + (defvar gnus-message-archive-group nil + "*Name of the group in which to save the messages you've written. + This can either be a string, a list of strings; or an alist + of regexps/functions/forms to be evaluated to return a string (or a list + of strings). The functions are called with the name of the current + group (or nil) as a parameter. + + Normally the group names returned by this variable should be + unprefixed -- which implictly means \"store on the archive server\". + However, you may wish to store the message on some other server. In + that case, just return a fully prefixed name of the group -- + \"nnml+private:mail.misc\", for instance.") + (defvar gnus-refer-article-method nil "*Preferred method for fetching an article by Message-ID. If you are reading news from the local spool (with nnspool), fetching *************** *** 1314,1325 **** "^nnml\\|^nnfolder\\|^nnmbox\\|^nnmh\\|^nnbabyl" "*All new groups that match this regexp will be subscribed automatically. Note that this variable only deals with new groups. It has no effect ! whatsoever on old groups.") (defvar gnus-options-subscribe nil "*All new groups matching this regexp will be subscribed unconditionally. Note that this variable deals only with new newsgroups. This variable ! does not affect old newsgroups.") (defvar gnus-options-not-subscribe nil "*All new groups matching this regexp will be ignored. --- 1328,1347 ---- "^nnml\\|^nnfolder\\|^nnmbox\\|^nnmh\\|^nnbabyl" "*All new groups that match this regexp will be subscribed automatically. Note that this variable only deals with new groups. It has no effect ! whatsoever on old groups. ! ! New groups that match this regexp will not be handled by ! `gnus-subscribe-newsgroup-method'. Instead, they will ! be subscribed using `gnus-subscribe-options-newsgroup-method'.") (defvar gnus-options-subscribe nil "*All new groups matching this regexp will be subscribed unconditionally. Note that this variable deals only with new newsgroups. This variable ! does not affect old newsgroups. ! ! New groups that match this regexp will not be handled by ! `gnus-subscribe-newsgroup-method'. Instead, they will ! be subscribed using `gnus-subscribe-options-newsgroup-method'.") (defvar gnus-options-not-subscribe nil "*All new groups matching this regexp will be ignored. *************** *** 1730,1736 **** "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (defconst gnus-version-number "5.3" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) --- 1752,1758 ---- "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") ! (defconst gnus-version-number "5.2.27" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) *************** *** 2096,2102 **** gnus-summary-mail-forward gnus-summary-mail-other-window gnus-bug) ("gnus-picon" :interactive t gnus-article-display-picons ! gnus-group-display-picons gnus-picons-article-display-x-face) ("gnus-gl" bbb-login bbb-logout bbb-grouplens-group-p gnus-grouplens-mode) ("smiley" :interactive t gnus-smiley-display) --- 2118,2125 ---- gnus-summary-mail-forward gnus-summary-mail-other-window gnus-bug) ("gnus-picon" :interactive t gnus-article-display-picons ! gnus-group-display-picons gnus-picons-article-display-x-face ! gnus-picons-display-x-face) ("gnus-gl" bbb-login bbb-logout bbb-grouplens-group-p gnus-grouplens-mode) ("smiley" :interactive t gnus-smiley-display) *************** *** 3215,3220 **** --- 3238,3244 ---- gnus-group-mark-positions nil gnus-newsgroup-data nil gnus-newsgroup-unreads nil + nnoo-state-alist nil gnus-current-select-method nil) (gnus-shutdown 'gnus) ;; Kill the startup file. *************** *** 3804,3810 **** (apply 'format args))) (defun gnus-error (level &rest args) ! "Beep an error if `gnus-verbose' is on LEVEL or less." (when (<= (floor level) gnus-verbose) (apply 'message args) (ding) --- 3828,3834 ---- (apply 'format args))) (defun gnus-error (level &rest args) ! "Beep an error if LEVEL is equal to or less than `gnus-verbose'." (when (<= (floor level) gnus-verbose) (apply 'message args) (ding) *************** *** 4754,4759 **** --- 4778,4796 ---- (pop opened)) out)) + (defun gnus-archive-server-wanted-p () + "Say whether the user wants to use the archive server." + (cond + ((not gnus-message-archive-method) + nil) + ((and gnus-message-archive-method gnus-message-archive-group) + t) + (t + (let ((active (cadr (assq 'nnfolder-active-file + gnus-message-archive-method)))) + (and active + (file-exists-p active)))))) + (defun gnus-group-prefixed-name (group method) "Return the whole name from GROUP and METHOD." (and (stringp method) (setq method (gnus-server-to-method method))) *************** *** 6529,6535 **** (unless (gnus-virtual-group-p group) (gnus-close-group group)) (gnus-group-update-group group)) ! (gnus-error 3 "%s error: %s" group (gnus-status-message group)))) (when beg (goto-char beg)) (when gnus-goto-next-group-when-activating (gnus-group-next-unread-group 1 t)) --- 6566,6575 ---- (unless (gnus-virtual-group-p group) (gnus-close-group group)) (gnus-group-update-group group)) ! (if (eq (gnus-server-status (gnus-find-method-for-group group)) ! 'denied) ! (gnus-error "Server denied access") ! (gnus-error 3 "%s error: %s" group (gnus-status-message group))))) (when beg (goto-char beg)) (when gnus-goto-next-group-when-activating (gnus-group-next-unread-group 1 t)) *************** *** 8429,8439 **** ;; This function find the total score of the thread below ROOT. (setq root (car root)) (apply gnus-thread-score-function ! (or (cdr (assq (mail-header-number root) gnus-newsgroup-scored)) ! gnus-summary-default-score 0) ! (mapcar 'gnus-thread-total-score ! (cdr (gnus-gethash (mail-header-id root) ! gnus-newsgroup-dependencies))))) ;; Added by Per Abrahamsen . (defvar gnus-tmp-prev-subject nil) --- 8469,8484 ---- ;; This function find the total score of the thread below ROOT. (setq root (car root)) (apply gnus-thread-score-function ! (or (append ! (mapcar 'gnus-thread-total-score ! (cdr (gnus-gethash (mail-header-id root) ! gnus-newsgroup-dependencies))) ! (if (> (mail-header-number root) 0) ! (list (or (cdr (assq (mail-header-number root) ! gnus-newsgroup-scored)) ! gnus-summary-default-score 0)))) ! (list gnus-summary-default-score) ! '(0)))) ;; Added by Per Abrahamsen . (defvar gnus-tmp-prev-subject nil) *************** *** 11843,11851 **** (interactive) (if (gnus-group-read-only-p) (progn ! (gnus-summary-edit-article-postpone) ! (gnus-error ! 1 "The current newsgroup does not support article editing.")) (let ((buf (format "%s" (buffer-string)))) (erase-buffer) (insert buf) --- 11888,11898 ---- (interactive) (if (gnus-group-read-only-p) (progn ! (let ((beep (not (eq major-mode 'text-mode)))) ! (gnus-summary-edit-article-postpone) ! (when beep ! (gnus-error ! 3 "The current newsgroup does not support article editing.")))) (let ((buf (format "%s" (buffer-string)))) (erase-buffer) (insert buf) *************** *** 15368,15373 **** --- 15415,15424 ---- (setcar (cdr entry) (concat (nth 1 entry) "+" group)) (nconc entry (cdr method)))) + (defun gnus-server-status (method) + "Return the status of METHOD." + (nth 1 (assoc method gnus-opened-servers))) + (defun gnus-group-name-to-method (group) "Return a select method suitable for GROUP." (if (string-match ":" group) *************** *** 15438,15444 **** (gnus-read-newsrc-file rawfile)) (when (and (not (assoc "archive" gnus-server-alist)) ! gnus-message-archive-method) (push (cons "archive" gnus-message-archive-method) gnus-server-alist)) --- 15489,15495 ---- (gnus-read-newsrc-file rawfile)) (when (and (not (assoc "archive" gnus-server-alist)) ! (gnus-archive-server-wanted-p)) (push (cons "archive" gnus-message-archive-method) gnus-server-alist)) *************** *** 15588,15594 **** (let* ((date (or gnus-newsrc-last-checked-date (current-time-string))) (methods (cons gnus-select-method (nconc ! (when gnus-message-archive-method (list "archive")) (append (and (consp gnus-check-new-newsgroups) --- 15639,15645 ---- (let* ((date (or gnus-newsrc-last-checked-date (current-time-string))) (methods (cons gnus-select-method (nconc ! (when (gnus-archive-server-wanted-p) (list "archive")) (append (and (consp gnus-check-new-newsgroups) *************** *** 16187,16193 **** ;; secondary ones. gnus-secondary-select-methods) ;; Also read from the archive server. ! (when gnus-message-archive-method (list "archive")))) list-type) (setq gnus-have-read-active-file nil) --- 16238,16244 ---- ;; secondary ones. gnus-secondary-select-methods) ;; Also read from the archive server. ! (when (gnus-archive-server-wanted-p) (list "archive")))) list-type) (setq gnus-have-read-active-file nil) *************** *** 16999,17005 **** (defun gnus-read-all-descriptions-files () (let ((methods (cons gnus-select-method (nconc ! (when gnus-message-archive-method (list "archive")) gnus-secondary-select-methods)))) (while methods --- 17050,17056 ---- (defun gnus-read-all-descriptions-files () (let ((methods (cons gnus-select-method (nconc ! (when (gnus-archive-server-wanted-p) (list "archive")) gnus-secondary-select-methods)))) (while methods *** pub/sgnus/lisp/message.el Tue Jun 25 23:15:53 1996 --- sgnus/lisp/message.el Wed Jun 26 23:18:24 1996 *************** *** 40,46 **** (require 'mail-abbrevs) (require 'mailabbrev)) - ;;;###autoload (defvar message-directory "~/Mail/" "*Directory from which all other mail file variables are derived.") --- 40,45 ---- *************** *** 164,172 **** (defvar message-user-organization-file "/usr/lib/news/organization" "*Local news organization file.") ! ;;;###autoload ! (defvar message-autosave-directory ! (concat (file-name-as-directory message-directory) "drafts/") "*Directory where message autosaves buffers. If nil, message won't autosave.") --- 163,170 ---- (defvar message-user-organization-file "/usr/lib/news/organization" "*Local news organization file.") ! (defvar message-autosave-directory "~/" ! ; (concat (file-name-as-directory message-directory) "drafts/") "*Directory where message autosaves buffers. If nil, message won't autosave.") *************** *** 1531,1538 **** ;; Check "Shoot me". (or (message-check-element 'shoot) (save-excursion ! (if (search-forward ! ".i-have-a-misconfigured-system-so-shoot-me" nil t) (y-or-n-p "You appear to have a misconfigured system. Really post? ") t))) --- 1529,1537 ---- ;; Check "Shoot me". (or (message-check-element 'shoot) (save-excursion ! (if (re-search-forward ! "Message-ID.*.i-have-a-misconfigured-system-so-shoot-me" ! nil t) (y-or-n-p "You appear to have a misconfigured system. Really post? ") t))) *************** *** 2489,2495 **** follow-to))))) (widen)) ! (message-pop-to-buffer (message-buffer-name "reply" from)) (setq message-reply-headers (vector 0 subject from date message-id references 0 0 "")) --- 2488,2496 ---- follow-to))))) (widen)) ! (message-pop-to-buffer (message-buffer-name ! (if wide "wide reply" "reply") from ! (if wide to-address nil))) (setq message-reply-headers (vector 0 subject from date message-id references 0 0 "")) *** pub/sgnus/lisp/nnmail.el Tue Jun 25 23:15:54 1996 --- sgnus/lisp/nnmail.el Wed Jun 26 22:58:07 1996 *************** *** 937,944 **** crash (cond ((and group (or (eq nnmail-spool-file 'procmail) ! nnmail-use-procmail)) procmails) ((listp nnmail-spool-file) (append nnmail-spool-file procmails)) ((stringp nnmail-spool-file) --- 937,947 ---- crash (cond ((and group (or (eq nnmail-spool-file 'procmail) ! nnmail-use-procmail) ! procmails) procmails) + ((eq nnmail-spool-file 'procmail) + nil) ((listp nnmail-spool-file) (append nnmail-spool-file procmails)) ((stringp nnmail-spool-file) *** pub/sgnus/lisp/nnspool.el Tue Jun 25 23:15:54 1996 --- sgnus/lisp/nnspool.el Wed Jun 26 22:58:07 1996 *************** *** 465,471 **** (buffer-disable-undo (current-buffer)) (erase-buffer) (condition-case () ! (call-process "grep" nil t nil id nnspool-history-file) (error nil)) (goto-char (point-min)) (prog1 --- 465,471 ---- (buffer-disable-undo (current-buffer)) (erase-buffer) (condition-case () ! (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file) (error nil)) (goto-char (point-min)) (prog1 *** pub/sgnus/lisp/smiley.el Tue Jun 25 23:15:54 1996 --- sgnus/lisp/smiley.el Wed Jun 26 22:16:45 1996 *************** *** 36,56 **** ;; The smilies were drawn by Joe Reiss . (require 'annotations) (eval-when-compile (require 'cl)) (defvar smiley-data-directory (message-xmas-find-glyph-directory "smilies") "Location of the smiley faces files.") (defvar smiley-regexp-alist ! '(("\\s-\\(:-*\\]\\)" 1 "FaceGrinning.xpm") ! ("\\s-\\(:-*[oO]\\)" 1 "FaceStartled.xpm") ("\\s-\\(:-*[)>]\\)" 1 "FaceHappy.xpm") ("\\s-\\(;-*[>)]\\)" 1 "FaceWinking.xpm") ("\\s-\\(:-[/\\]\\)" 1 "FaceIronic.xpm") ("\\s-\\(:-*|\\)" 1 "FaceStraight.xpm") ("\\s-\\(:-*<\\)" 1 "FaceAngry.xpm") ! ("\\s-\\(:-*d\\)" 1 "FaceTasty.xpm") ! ("\\s-\\(:-*[pP]\\)" 1 "FaceYukky.xpm") ("\\s-\\(8-*|\\)" 1 "FaceKOed.xpm") ("\\s-\\(:-*(\\)" 1 "FaceAngry.xpm")) "A list of regexps to map smilies to real images.") --- 36,57 ---- ;; The smilies were drawn by Joe Reiss . (require 'annotations) + (require 'messagexmas) (eval-when-compile (require 'cl)) (defvar smiley-data-directory (message-xmas-find-glyph-directory "smilies") "Location of the smiley faces files.") (defvar smiley-regexp-alist ! '(("\\s-\\(:-*\\]\\)\\W" 1 "FaceGrinning.xpm") ! ("\\s-\\(:-*[oO]\\)\\W" 1 "FaceStartled.xpm") ("\\s-\\(:-*[)>]\\)" 1 "FaceHappy.xpm") ("\\s-\\(;-*[>)]\\)" 1 "FaceWinking.xpm") ("\\s-\\(:-[/\\]\\)" 1 "FaceIronic.xpm") ("\\s-\\(:-*|\\)" 1 "FaceStraight.xpm") ("\\s-\\(:-*<\\)" 1 "FaceAngry.xpm") ! ("\\s-\\(:-*d\\)\\W" 1 "FaceTasty.xpm") ! ("\\s-\\(:-*[pP]\\)\\W" 1 "FaceYukky.xpm") ("\\s-\\(8-*|\\)" 1 "FaceKOed.xpm") ("\\s-\\(:-*(\\)" 1 "FaceAngry.xpm")) "A list of regexps to map smilies to real images.") *************** *** 89,101 **** (set-glyph-face glyph 'default) glyph)))) ! ;;;###interactive (defun smiley-region (beg end) "Smilify the region between point and mark." (interactive "r") (smiley-buffer (current-buffer) beg end)) ! ;;;###interactive (defun smiley-buffer (&optional buffer st nd) (interactive) (save-excursion --- 90,102 ---- (set-glyph-face glyph 'default) glyph)))) ! ;;;###autoload (defun smiley-region (beg end) "Smilify the region between point and mark." (interactive "r") (smiley-buffer (current-buffer) beg end)) ! ;;;###autoload (defun smiley-buffer (&optional buffer st nd) (interactive) (save-excursion *** pub/sgnus/lisp/ChangeLog Tue Jun 25 23:16:02 1996 --- sgnus/lisp/ChangeLog Wed Jun 26 23:35:32 1996 *************** *** 1,6 **** Tue Jun 25 21:15:41 1996 Lars Magne Ingebrigtsen ! * gnus.el: Gnus v5.2.26 is released. Tue Jun 25 21:13:37 1996 Lars Magne Ingebrigtsen --- 1,54 ---- + Wed Jun 26 20:40:39 1996 Lars Magne Ingebrigtsen + + * gnus.el (gnus-summary-edit-article-done): Don't beep after a + `C-u e'. + + * message.el (message-autosave-directory): New default value. + + * gnus-cache.el (gnus-cache-open): Don't create cache things + unconditionally. + + * gnus.el (gnus-server-status): New function. + (gnus-group-get-new-news-this-group): Better error message. + (gnus-clear-system): Clear state alist. + (gnus-error): Doc fix. + + * nnmail.el (nnmail-get-spool-files): Use the spool file even when + using procmail. + + Wed Jun 26 20:36:40 1996 Philippe Troin + + * gnus.el (gnus-thread-total-score-1): New version. + + Wed Jun 26 20:31:25 1996 Lars Magne Ingebrigtsen + + * nnspool.el (nnspool-find-id): Quote the Message-ID. + + * message.el (message-check-news-syntax): Would respond to + i-have-a-mi-etc in References. + + Wed Jun 26 19:59:27 1996 Nat Makarevitch + + * smiley.el (smiley-regexp-alist): New definition. + + Wed Jun 26 17:45:00 1996 Lars Magne Ingebrigtsen + + * message.el (message-reply): Name the message buffer "wide + reply..." if following up on a mail group. + + * gnus.el (gnus-auto-subscribed-groups): Doc fix. + (gnus-options-subscribe): Doc fix. + + * smiley.el (smiley-buffer): Autoload. + (messagexmas): Required. + + * gnus.el (gnus-message-archive-group): Moved here. + (gnus-archive-server-wanted-p): New function used throughout. + (gnus-message-archive-group): Default to nil. + Tue Jun 25 21:15:41 1996 Lars Magne Ingebrigtsen ! * gnus.el: Gnus v5.3 is released. Tue Jun 25 21:13:37 1996 Lars Magne Ingebrigtsen