From a4ee595da5c3b757f5c718cb1d336439745cf0b7 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 4 Mar 1997 04:03:30 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 53 ++++++++++++++++++++++ lisp/gnus-cache.el | 7 +++ lisp/gnus-edit.el | 4 +- lisp/gnus-ems.el | 4 +- lisp/gnus-kill.el | 2 + lisp/gnus-mh.el | 6 +-- lisp/gnus-msg.el | 5 ++- lisp/gnus-score.el | 7 ++- lisp/gnus-vis.el | 18 ++++---- lisp/gnus.el | 107 +++++++++++++++++++++++++-------------------- lisp/nnspool.el | 14 ++---- 11 files changed, 152 insertions(+), 75 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bed488815..8f169f17a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,54 @@ +Fri Nov 3 03:16:04 1995 Lars Magne Ingebrigtsen + + * gnus.el (gnus-summary-refer-article): Would mark oddly. + + * gnus-msg.el (gnus-inews-do-fcc): rmail-file-p doesn't exist in + 19.30. + +Fri Nov 3 00:25:35 1995 Lars Ingebrigtsen + + * gnus.el (gnus-documentation-group-file): Removed variable. + +Thu Nov 2 21:58:41 1995 Lars Ingebrigtsen + + * gnus.el (gnus-group-make-help-group): Find gnus-tut.txt in the + etc directory. + +Wed Nov 1 02:51:56 1995 Lars Ingebrigtsen + + * gnus-msg.el (gnus-inews-check-post): Counted signatures + wrongly. + + * gnus-kill.el (gnus-apply-kill-file-internal): Update mode line + after processing. + +Mon Oct 23 11:06:39 1995 Per Abrahamsen + + * gnus-edit.el (gnus-score-custom-get): Special treatment of + adapt. + +Mon Oct 30 00:56:46 1995 Lars Ingebrigtsen + + * gnus.el (gnus-summary-delete-article): Update mode line. + (gnus-summary-move-article): Ditto. + (gnus-summary-line-format): Doc fix. + (gnus-articles-to-read): Understand numerical prefixes. + (gnus-group-quit-config): New function. + (gnus-group-change-level): Don't enter empemeral groups into the + dribble buffer. + + * gnus-score.el (gnus-score-load-file): Didn't expand excluded + file names. + + * gnus-mh.el (gnus-mail-reply-using-mhe): Force window configs. + +Sun Oct 29 18:45:38 1995 Lars Magne Ingebrigtsen + + * gnus.el (gnus-parse-simple-format): Backtrack-regexp + eliminated. + + * gnus.el: 5.0.10 is released. + Thu Oct 26 00:32:40 1995 Lars Ingebrigtsen * gnus-msg.el (gnus-inews-news): Didn't delete continuation Bcc @@ -27,6 +78,8 @@ Wed Oct 18 19:09:10 1995 Lars Ingebrigtsen (gnus-summary-sort-by-subject): Use article numbers as the secondary sort keys. + * gnus.el: 5.0.9 is released. + Sat Oct 14 01:41:11 1995 Sudish Joseph * nntp.el (nntp-possibly-change-server): Open SERVER even if diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 1d998607b..833659862 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -219,6 +219,13 @@ (if (not (file-exists-p file)) () (erase-buffer) + ;; There may be some overlays that we have to kill... + (insert "i") + (let ((overlays (overlays-at (point-min)))) + (while overlays + (delete-overlay (car overlays)) + (setq overlays (cdr overlays)))) + (erase-buffer) (insert-file-contents file) t))) diff --git a/lisp/gnus-edit.el b/lisp/gnus-edit.el index 766b66f5e..964528ae6 100644 --- a/lisp/gnus-edit.el +++ b/lisp/gnus-edit.el @@ -548,7 +548,9 @@ groups matched by the current score file.") (if entry (mapcar 'gnus-score-custom-sanify (cdr entry)) (setq entry (assoc name gnus-score-alist)) - (if (memq name '(files exclude-files local adapt)) + (if (or (memq name '(files exclude-files local)) + (and (eq name 'adapt) + (not (symbolp (car (cdr entry)))))) (cdr entry) (car (cdr entry))))))) diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index 7a2cdb204..e0b2244ab 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -33,6 +33,9 @@ (defalias 'gnus-overlay-put 'overlay-put) (defalias 'gnus-move-overlay 'move-overlay) +(or (fboundp 'mail-file-babyl-p) + (fset 'mail-file-babyl-p 'rmail-file-p)) + ;; Don't warn about these undefined variables. ;defined in gnus.el (defvar gnus-active-hashtb) @@ -516,7 +519,6 @@ call it with the value of the `gnus-data' text property." (select-window lowest-window) (setq window-search nil))))))) - (defun gnus-ems-redefine () (cond ((string-match "XEmacs\\|Lucid" emacs-version) diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el index 23d1dfe0b..781651acd 100644 --- a/lisp/gnus-kill.el +++ b/lisp/gnus-kill.el @@ -389,6 +389,8 @@ Returns the number of articles marked as read." (message "Processing kill file %s...done" (car kill-files))) (setq kill-files (cdr kill-files))))) + (gnus-set-mode-line 'summary) + (if beg (let ((nunreads (- unreads (length gnus-newsgroup-unreads)))) (or (eq nunreads 0) diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el index 3692c2054..369b6a5fb 100644 --- a/lisp/gnus-mh.el +++ b/lisp/gnus-mh.el @@ -124,8 +124,8 @@ The command \\[mh-yank-cur-msg] yank the original message into current buffer." (gnus-mail-buffer (current-buffer)) mail-buf) (if (not yank) - (gnus-configure-windows 'reply) - (gnus-configure-windows 'reply-yank)) + (gnus-configure-windows 'reply 'force) + (gnus-configure-windows 'reply-yank 'force)) (setq mail-buf gnus-mail-buffer) (pop-to-buffer mail-buf);; always in the display, so won't have window probs (switch-to-buffer draft)) @@ -173,7 +173,7 @@ The command \\[mh-yank-cur-msg] yank the original message into current buffer." (let ((draft (current-buffer)) (gnus-mail-buffer (current-buffer)) mail-buf) - (gnus-configure-windows 'reply-yank) + (gnus-configure-windows 'reply-yank 'force) (setq mail-buf (eval (cdr (assq 'mail gnus-window-to-buffer)))) (pop-to-buffer mail-buf);; always in the display, so won't have window probs (switch-to-buffer draft) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 5103e2539..89d4c3e98 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -885,7 +885,7 @@ will attempt to use the foreign server to post the article." (goto-char (point-max)) (if (not (re-search-backward gnus-signature-separator nil t)) t - (if (> (count-lines (point) (point-max)) 4) + (if (> (count-lines (point) (point-max)) 5) (gnus-y-or-n-p (format "Your .sig is %d lines; it should be max 4. Really post? " @@ -1251,7 +1251,8 @@ a program specified by the rest of the value." (if (and gnus-author-copy-saver (not (eq gnus-author-copy-saver 'rmail-output))) (funcall gnus-author-copy-saver fcc-file) - (if (and (file-readable-p fcc-file) (rmail-file-p fcc-file)) + (if (and (file-readable-p fcc-file) + (mail-file-babyl-p fcc-file)) (gnus-output-to-rmail fcc-file) (rmail-output fcc-file 1 t t)))))))))) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index be3f112bb..db30a7551 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -612,8 +612,13 @@ SCORE is the score to add." (gnus-score-load-file file)) files)))) (and eval (not global) (eval eval)) + ;; We then expand any exclude-file directives. (setq gnus-scores-exclude-files - (append exclude-files gnus-scores-exclude-files)) + (nconc + (mapcar + (lambda (sfile) + (expand-file-name sfile (file-name-directory file))) + exclude-files) gnus-scores-exclude-files)) (if (not local) () (save-excursion diff --git a/lisp/gnus-vis.el b/lisp/gnus-vis.el index 270d8bd80..7577dd22e 100644 --- a/lisp/gnus-vis.el +++ b/lisp/gnus-vis.el @@ -964,9 +964,9 @@ If nil, the user will be asked for a duration.") ("prev" . gnus-group-prev-unread-group) ("read" . gnus-group-read-group) ("select" . gnus-group-select-group) - ("catch up" . gnus-group-catchup-current) - ("new news" . gnus-group-get-new-news-this-group) - ("toggle sub" . gnus-group-unsubscribe-current-group) + ("catch-up" . gnus-group-catchup-current) + ("new-news" . gnus-group-get-new-news-this-group) + ("toggle-sub" . gnus-group-unsubscribe-current-group) ("subscribe" . gnus-group-unsubscribe-group) ("kill" . gnus-group-kill-group) ("yank" . gnus-group-yank-group) @@ -980,7 +980,7 @@ If nil, the user will be asked for a duration.") ("post" . gnus-group-post-news) ("mail" . gnus-group-mail) ("rescan" . gnus-group-get-new-news) - ("browse foreign" . gnus-group-browse-foreign) + ("browse-foreign" . gnus-group-browse-foreign) ("exit" . gnus-group-exit))) (defvar gnus-carpal-summary-buffer-buttons @@ -991,15 +991,15 @@ If nil, the user will be asked for a duration.") ("expirable" . gnus-summary-mark-as-expirable) "move" ("scroll" . gnus-summary-next-page) - ("next unread" . gnus-summary-next-unread-article) - ("prev unread" . gnus-summary-prev-unread-article) + ("next-unread" . gnus-summary-next-unread-article) + ("prev-unread" . gnus-summary-prev-unread-article) ("first" . gnus-summary-first-unread-article) ("best" . gnus-summary-best-unread-article) "article" ("headers" . gnus-summary-toggle-header) ("uudecode" . gnus-uu-decode-uu) - ("enter digest" . gnus-summary-enter-digest-group) - ("fetch parent" . gnus-summary-refer-parent-article) + ("enter-digest" . gnus-summary-enter-digest-group) + ("fetch-parent" . gnus-summary-refer-parent-article) "mail" ("move" . gnus-summary-move-article) ("copy" . gnus-summary-copy-article) @@ -1015,7 +1015,7 @@ If nil, the user will be asked for a duration.") ("cancel" . gnus-summary-cancel-article) "misc" ("exit" . gnus-summary-exit) - ("fed up" . gnus-summary-catchup-and-goto-next-group))) + ("fed-up" . gnus-summary-catchup-and-goto-next-group))) (defvar gnus-carpal-server-buffer-buttons '(("add" . gnus-server-add-server) diff --git a/lisp/gnus.el b/lisp/gnus.el index 850916cd8..ccc74c663 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -933,8 +933,8 @@ with some simple extensions. %I Indentation based on thread level (a string of spaces) %T A string with two possible values: 80 spaces if the article is on thread level two or larger and 0 spaces on level one -%R \"R\" if this article has been replied to, \" \" otherwise (character) -%U Status of this article (character, \"D\", \"K\", \"-\" or \" \") +%R \"A\" if this article has been replied to, \" \" otherwise (character) +%U Status of this article (character, \"R\", \"K\", \"-\" or \" \") %[ Opening bracket (character, \"[\" or \"<\") %] Closing bracket (character, \"]\" or \">\") %> Spaces of length thread-level (string) @@ -1349,7 +1349,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 "Gnus v5.0.10" +(defconst gnus-version "Gnus v5.0.11" "Version number for this version of Gnus.") (defvar gnus-info-nodes @@ -1358,9 +1358,6 @@ variable (string, integer, character, etc).") (gnus-article-mode "(gnus)The Article Buffer")) "Assoc list of major modes and related Info nodes.") -(defvar gnus-documentation-group-file "~/dgnus/lisp/doc.txt" - "The location of the Gnus documentation group.") - (defvar gnus-group-buffer "*Group*") (defvar gnus-summary-buffer "*Summary*") (defvar gnus-article-buffer "*Article*") @@ -2838,6 +2835,10 @@ that that variable is buffer-local to the summary buffers." "Say whether GROUP is ephemeral or not." (assoc 'quit-config (gnus-find-method-for-group group))) +(defun gnus-group-quit-config (group) + "Return the quit-config of GROUP." + (cdr (assoc 'quit-config (gnus-find-method-for-group group)))) + ;;; List and range functions (defun gnus-last-element (list) @@ -3638,7 +3639,7 @@ moves the point to the colon." (let* ((buffer-read-only nil) (group (gnus-group-group-name)) (entry (and group (gnus-gethash group gnus-newsrc-hashtb)))) - (if entry + (if (and entry (not (gnus-ephemeral-group-p group))) (gnus-dribble-enter (concat "(gnus-group-set-info '" (prin1-to-string (nth 2 entry)) ")"))) @@ -3726,7 +3727,8 @@ If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't already." (let ((buffer-read-only nil) visible) (let ((entry (gnus-gethash group gnus-newsrc-hashtb))) - (if entry + (if (and entry + (not (gnus-ephemeral-group-p group))) (gnus-dribble-enter (concat "(gnus-group-set-info '" (prin1-to-string (nth 2 entry)) ")")))) @@ -4145,8 +4147,9 @@ ADDRESS." gnus-newsrc-hashtb)) t) (gnus-sethash nname (cons 1 0) gnus-active-hashtb) - (gnus-dribble-enter - (concat "(gnus-group-set-info '" (prin1-to-string (cdr info)) ")")) + (or (gnus-ephemeral-group-p name) + (gnus-dribble-enter + (concat "(gnus-group-set-info '" (prin1-to-string (cdr info)) ")"))) (gnus-group-insert-group-line-info nname) (if (assoc method gnus-valid-select-methods) @@ -4238,23 +4241,22 @@ ADDRESS." (defun gnus-group-make-help-group () "Create the Gnus documentation group." (interactive) - (let ((path load-path) - name) - (and (gnus-gethash (setq name (gnus-group-prefixed-name - "gnus-help" '(nndoc "gnus-help"))) - gnus-newsrc-hashtb) + (let ((path (cons (concat installation-directory "etc/") load-path)) + (name (gnus-group-prefixed-name "gnus-help" '(nndoc "gnus-help"))) + file) + (and (gnus-gethash name gnus-newsrc-hashtb) (error "Documentation group already exists")) (while (and path - (not (file-exists-p (concat (file-name-as-directory (car path)) - "doc.txt")))) + (not (file-exists-p + (setq file (concat (file-name-as-directory (car path)) + "gnus-tut.txt"))))) (setq path (cdr path))) (if (not path) (message "Couldn't find doc group") (gnus-group-make-group (gnus-group-real-name name) (list 'nndoc name - (list 'nndoc-address - (concat (file-name-as-directory (car path)) "doc.txt")) + (list 'nndoc-address file) (list 'nndoc-article-type 'mbox))))) (gnus-group-position-cursor)) @@ -5214,14 +5216,15 @@ buffer. gnus-browse-current-method)))) (defun gnus-browse-unsubscribe-group () + "Toggle subscription of the current group in the browse buffer." (let ((sub nil) (buffer-read-only nil) group) (save-excursion (beginning-of-line) + ;; If this group it killed, then we want to subscribe it. (if (= (following-char) ?K) (setq sub t)) (setq group (gnus-browse-group-name)) - (beginning-of-line) (delete-char 1) (if sub (progn @@ -5929,8 +5932,7 @@ If SHOW-ALL is non-nil, already read articles are also listed. If NO-ARTICLE is non-nil, no article is selected initially." (gnus-message 5 "Retrieving newsgroup: %s..." group) (let* ((new-group (gnus-summary-setup-buffer group)) - (quit-config (nth 1 (assoc 'quit-config (gnus-find-method-for-group - group)))) + (quit-config (gnus-group-quit-config group)) (did-select (and new-group (gnus-select-newsgroup group show-all)))) (cond ((not new-group) @@ -6779,7 +6781,7 @@ If READ-ALL is non-nil, all articles in the group are selected." (let* ((articles ;; Select all articles if `read-all' is non-nil, or if all the ;; unread articles are dormant articles. - (if (or (and read-all (not (numberp read-all))) + (if (or read-all (= (length gnus-newsgroup-unreads) (length gnus-newsgroup-dormant))) (gnus-uncompress-range @@ -7782,7 +7784,7 @@ The prefix argument ALL means to select all articles." (funcall 'gnus-score-save)) ;; Do not switch windows but change the buffer to work. (set-buffer gnus-group-buffer) - (or (assoc 'quit-config (gnus-find-method-for-group gnus-newsgroup-name)) + (or (gnus-ephemeral-group-p gnus-newsgroup-name) (gnus-group-update-group group))))) (defun gnus-summary-exit (&optional temporary) @@ -7792,8 +7794,7 @@ gnus-exit-group-hook is called with no arguments if that value is non-nil." (gnus-set-global-variables) (gnus-kill-save-kill-buffer) (let* ((group gnus-newsgroup-name) - (quit-config (nth 1 (assoc 'quit-config (gnus-find-method-for-group - gnus-newsgroup-name)))) + (quit-config (gnus-group-quit-config gnus-newsgroup-name)) (mode major-mode) (buf (current-buffer))) (run-hooks 'gnus-summary-prepare-exit-hook) @@ -7844,8 +7845,7 @@ gnus-exit-group-hook is called with no arguments if that value is non-nil." (interactive) (gnus-set-global-variables) (let* ((group gnus-newsgroup-name) - (quit-config (nth 1 (assoc 'quit-config - (gnus-find-method-for-group group))))) + (quit-config (gnus-group-quit-config group))) (if (or no-questions gnus-expert-user (gnus-y-or-n-p "Do you really wanna quit reading this group? ")) @@ -8187,7 +8187,7 @@ If BACKWARD, the previous article is selected instead of the next." gnus-newsgroup-end))) ;; Go to next/previous group. (t - (or (assoc 'quit-config (gnus-find-method-for-group gnus-newsgroup-name)) + (or (gnus-ephemeral-group-p gnus-newsgroup-name) (gnus-summary-jump-to-group gnus-newsgroup-name)) (let ((cmd last-command-char) (group @@ -8205,8 +8205,7 @@ If BACKWARD, the previous article is selected instead of the next." (gnus-message 7 "No more%s articles" (if unread " unread" ""))) ((eq gnus-auto-select-next 'quietly) ;; Select quietly. - (if (assoc 'quit-config (gnus-find-method-for-group - gnus-newsgroup-name)) + (if (gnus-ephemeral-group-p gnus-newsgroup-name) (gnus-summary-exit) (gnus-message 7 "No more%s articles (%s)..." (if unread " unread" "") @@ -8219,9 +8218,8 @@ If BACKWARD, the previous article is selected instead of the next." (while (or (null key) (memq key keystrokes)) (gnus-message 7 "No more%s articles%s" (if unread " unread" "") - (if (and group (not (assoc 'quit-config - (gnus-find-method-for-group - gnus-newsgroup-name)))) + (if (and group + (not (gnus-ephemeral-group-p gnus-newsgroup-name))) (format " (Type %s for %s [%s])" (single-key-description cmd) group (car (gnus-gethash group gnus-newsrc-hashtb))) @@ -8242,9 +8240,8 @@ If BACKWARD, the previous article is selected instead of the next." (setq group (gnus-group-group-name)) (switch-to-buffer obuf))))) (if (equal key cmd) - (if (or (not group) (assoc 'quit-config - (gnus-find-method-for-group - gnus-newsgroup-name))) + (if (or (not group) + (gnus-ephemeral-group-p gnus-newsgroup-name)) (gnus-summary-exit) (gnus-summary-next-group nil group backward)) (execute-kbd-macro (char-to-string key))))))))))) @@ -8504,6 +8501,8 @@ NOTE: This command only works with newsgroups that use real or simulated NNTP." (gnus-summary-recenter) (gnus-article-set-window-start (cdr (assq number gnus-newsgroup-bookmarks))) + (and gnus-visual + (run-hooks 'gnus-visual-mark-article-hook)) message-id) ;; We restore the old article buffer. (save-excursion @@ -8872,7 +8871,8 @@ and `request-accept' functions. (Ie. mail newsgroups at present.)" gnus-newsgroup-reads))) (gnus-message 1 "Couldn't move article %s" (car articles))) (gnus-summary-remove-process-mark (car articles)) - (setq articles (cdr articles))))) + (setq articles (cdr articles))) + (gnus-set-mode-line 'summary))) (defun gnus-summary-respool-article (&optional n respool-method) "Respool the current article. @@ -9099,6 +9099,7 @@ delete these instead." (gnus-summary-mark-article (car articles) gnus-canceled-mark)) (setq articles (cdr articles)))) (gnus-summary-position-cursor) + (gnus-set-mode-line 'summary) not-deleted)) (defun gnus-summary-edit-article (&optional force) @@ -10501,7 +10502,7 @@ is initialized from the SAVEDIR environment variable." (save-excursion (save-restriction (widen) - (if (and (file-readable-p filename) (rmail-file-p filename)) + (if (and (file-readable-p filename) (mail-file-babyl-p filename)) (gnus-output-to-rmail filename) (rmail-output filename 1 t t))))) ;; Remember the directory name to save articles. @@ -10846,10 +10847,17 @@ The following commands are available: (numberp article) (gnus-cache-request-article article group)) 'article - ;; Get the article and into the article buffer. + ;; Get the article and put into the article buffer. (if (or (stringp article) (numberp article)) (progn (erase-buffer) + ;; There may be some overlays that we have to kill... + (insert "i") + (let ((overlays (overlays-at (point-min)))) + (while overlays + (delete-overlay (car overlays)) + (setq overlays (cdr overlays)))) + (erase-buffer) (let ((gnus-override-method (and (stringp article) gnus-refer-article-method))) (and (gnus-request-article article group (current-buffer)) @@ -12275,9 +12283,10 @@ The `-n' option line from .newsrc is respected." ;; subscribed. () ; Do nothing. - (gnus-dribble-enter - (format "(gnus-group-change-level %S %S %S %S %S)" - group level oldlevel (car (nth 2 previous)) fromkilled)) + (or (gnus-ephemeral-group-p group) + (gnus-dribble-enter + (format "(gnus-group-change-level %S %S %S %S %S)" + group level oldlevel (car (nth 2 previous)) fromkilled))) ;; Then we remove the newgroup from any old structures, if needed. ;; If the group was killed, we remove it from the killed or zombie @@ -13344,8 +13353,8 @@ If FORCE is non-nil, the .newsrc file is read." 'subscribe) out))))) (setq gnus-newsrc-options-n out)))) - + (defun gnus-save-newsrc-file () "Save .newsrc file." ;; Note: We cannot save .newsrc file if all newsgroups are removed @@ -13970,7 +13979,7 @@ GROUP using BNews sys file syntax." (insert "\\"))) ;; Translate ".all" to "[./].*"; (while (search-forward ".all" nil t) - (replace-match "[./].*" t t)) + (replace-match "[./:].*" t t)) (goto-char (point-min)) ;; Translate "all" to ".*". (while (search-forward "all" nil t) @@ -14005,9 +14014,11 @@ GROUP using BNews sys file syntax." (concat gnus-kill-files-directory (gnus-replace-chars-in-string group ?. ?/ ?: ?/) "/" gnus-score-file-suffix))))) - (and (member localscore ofiles) - (delete localscore ofiles)) - (setq ofiles (cons localscore ofiles))) + ;; The localest score file might already be there, but it's + ;; supposed to be the very last file, so we delete it from the + ;; list if it's already there, and add it to the head of the + ;; list. + (setq ofiles (cons localscore (delete localscore ofiles)))) (nreverse ofiles)))) (defun gnus-score-find-single (group) diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 96f3df8dd..3d1351f89 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -482,16 +482,10 @@ Newsgroup must be selected before calling this function." (ttime (mapcar (lambda (ti) (and ti (string-to-int ti))) (timezone-parse-time (aref (timezone-parse-date date) 3)))) - (edate (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-date "Jan 1 12:00:00 1970"))) - (tday (- (timezone-absolute-from-gregorian - (nth 1 tdate) (nth 2 tdate) (nth 0 tdate)) - (timezone-absolute-from-gregorian - (nth 1 edate) (nth 2 edate) (nth 0 edate))))) - (+ (nth 2 ttime) - (* (nth 1 ttime) 60) - (* 1.0 (nth 0 ttime) 60 60) - (* 1.0 tday 60 60 24)))) + (unix (encode-time (nth 2 ttime) (nth 1 ttime) (nth 0 ttime) + (nth 2 tdate) (nth 1 tdate) (nth 0 tdate) (nth 4 tdate)))) + (+ (* (car unix) 65536.0) + (car (cdr unix))))) (provide 'nnspool) -- 2.34.1