From 07efe5c831f8a3261dc5948cc890449c30e9507e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 15 Aug 2001 22:40:12 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 16 ++++++++++++++++ lisp/gnus-agent.el | 8 +++++--- lisp/gnus-delay.el | 24 ++++++++++++++++++++++-- lisp/gnus-srvr.el | 2 +- lisp/lpath.el | 1 + 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1474f22..f9eff16 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2001-05-21 17:11:46 Lars Magne Ingebrigtsen + + * gnus-srvr.el (gnus-server-browse-in-group-buffer): Default to + nil. + +2001-08-15 Kai Gro,A_(Bjohann + + * gnus-delay.el (gnus-delay-article): Allow "01:23" time spec, + which specifies a time today or tomorrow. + +2001-08-15 Simon Josefsson + From Pavel@Janik.cz (Pavel Jan,Bm(Bk) + + * gnus-agent.el (gnus-agent-make-mode-line-string) + (gnus-agent-toggle-plugged): Use new API. + 2001-08-14 Kai Gro,A_(Bjohann * gnus-delay.el (gnus-delay-send-drafts): Fix check whether diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index de8e5ab..623c136 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -322,11 +322,11 @@ If this is `ask' the hook will query the user." ["Add" gnus-agent-add-server t] ["Remove" gnus-agent-remove-server t])))) -(defun gnus-agent-make-mode-line-string (string mouse2-func) +(defun gnus-agent-make-mode-line-string (string mouse-button mouse-func) (if (and (fboundp 'propertize) - (fboundp 'make-mode-line-mouse2-map)) + (fboundp 'make-mode-line-mouse-map)) (propertize string 'local-map - (make-mode-line-mouse2-map mouse2-func)) + (make-mode-line-mouse-map mouse-button mouse-func)) string)) (defun gnus-agent-toggle-plugged (plugged) @@ -339,12 +339,14 @@ If this is `ask' the hook will query the user." (gnus-run-hooks 'gnus-agent-plugged-hook) (setcar (cdr gnus-agent-mode-status) (gnus-agent-make-mode-line-string " Plugged" + 'mouse-2 'gnus-agent-toggle-plugged))) (gnus-agent-close-connections) (setq gnus-plugged plugged) (gnus-run-hooks 'gnus-agent-unplugged-hook) (setcar (cdr gnus-agent-mode-status) (gnus-agent-make-mode-line-string " Unplugged" + 'mouse-2 'gnus-agent-toggle-plugged))) (force-mode-line-update)) diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 92c0e2f..ac89011 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -49,12 +49,15 @@ DELAY is a string, giving the length of the time. Possible values are: weeks (`w'), months (`M'), or years (`Y'); * YYYY-MM-DD for a specific date. The time of day is given by the - variable `gnus-delay-default-hour', minute and second are zero." + variable `gnus-delay-default-hour', minute and second are zero. + +* hh:mm for a specific time. Use 24h format. If it is later than this + time, then the deadline is tomorrow, else today." (interactive (list (read-string "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): " gnus-delay-default-delay))) - (let (num unit days year month day deadline) + (let (num unit days year month day hour minute deadline) (cond ((string-match "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)" delay) @@ -66,6 +69,23 @@ DELAY is a string, giving the length of the time. Possible values are: (encode-time 0 0 ; second and minute gnus-delay-default-hour day month year)))) + ((string-match "\\([0-9]+\\):\\([0-9]+\\)" delay) + (setq hour (string-to-number (match-string 1 delay)) + minute (string-to-number (match-string 2 delay))) + ;; Use current time, except... + (setq deadline (apply 'vector (decode-time (current-time)))) + ;; ... for minute and hour. + (aset deadline 1 minute) + (aset deadline 2 hour) + ;; Convert to seconds. + (setq deadline (time-to-seconds (apply 'encode-time + (append deadline nil)))) + ;; If this time has passed already, add a day. + (when (< deadline (time-to-seconds (current-time))) + (setq deadline (+ 3600 deadline))) ;3600 secs/day + ;; Convert seconds to date header. + (setq deadline (message-make-date + (seconds-to-time deadline)))) ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay) (setq num (match-string 1 delay)) (setq unit (match-string 2 delay)) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 1ccb572..ba93d8c 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -56,7 +56,7 @@ The following specs are understood: (defvar gnus-server-exit-hook nil "*Hook run when exiting the server buffer.") -(defvar gnus-server-browse-in-group-buffer t +(defvar gnus-server-browse-in-group-buffer nil "Whether browse server in group buffer.") ;;; Internal variables. diff --git a/lisp/lpath.el b/lisp/lpath.el index 0c6667d..eba2a3b 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -25,6 +25,7 @@ charsetp coding-system-p propertize make-mode-line-mouse2-map + make-mode-line-mouse-map rmail-select-summary rmail-summary-exists rmail-update-summary sc-cite-regexp set-font-family set-font-size temp-directory string-as-multibyte -- 1.7.10.4