From xemacs-m  Wed Mar  5 01:15:25 1997
Received: from jens.metrix.de (jens@jens.metrix.de [194.123.88.124])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id BAA24781
	for <xemacs-beta@xemacs.org>; Wed, 5 Mar 1997 01:15:22 -0600 (CST)
Received: (from jens@localhost) by jens.metrix.de (8.7.6/8.7.3) id IAA10908; Wed, 5 Mar 1997 08:15:18 +0100
To: xemacs-beta@xemacs.org
Cc: "Steven L. Baur" <steve@miranova.com>
Subject: Re: display-time on tty
References: <199703050409.VAA15018@branagh.ta52.lanl.gov> 	<m2lo83q7li.fsf@altair.xemacs.org> <199703050454.VAA15953@branagh.ta52.lanl.gov> <m2d8tedi2e.fsf@altair.xemacs.org> <xcd4teqzxh6.fsf@jordan.cs.uchicago.edu> <m27mjmddyj.fsf@altair.xemacs.org>
X-Face: Z[@OB)("ZvE?ev~1b+b!0ZUB.$%rh.9qE>dVf>q}Q/V?%d`J3gd!LR\aAZ8<Hwi]xTA(:*c;i3,?K?+rCy*^b$)a,}E?eo},}x2]5LlJysyoUOK"o[>K)'\Ulb7y-7*.If^;rHl['oa)n_M7E6w+LDKMs"G8_`c)uOS1^}.1|8Ill]7X68X-paeUOpBhz<F`B0?~^2Et~GYfw~/0]H]nx4~C_E/_mp#^7Ixc:
Reply-To: jens@lemming0.lem.uni-karlsruhe.de
Mime-Version: 1.0 (generated by tm-edit 7.105)
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Mar__5_08:15:16_1997-1"
Content-Transfer-Encoding: 7bit
From: Jens Lautenbacher <jens@metrix.de>
Date: 05 Mar 1997 08:15:17 +0100
In-Reply-To: Steven L Baur's message of 04 Mar 1997 22:56:20 -0800
Message-ID: <m3ohcy6c8q.fsf@jens.metrix.de>
Lines: 152
X-Mailer: Gnus v5.4.17/XEmacs 19.15

--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: text/plain; charset=US-ASCII

Steven L Baur <steve@miranova.com> writes:

> Soren Dayton writes:
> 
> > Steven L Baur <steve@miranova.com> writes:
> >> The other suggestion is about the am/pm indicator.  To be really like
> >> a digital clock it ought to display as an upper dot and a lower dot. :-)
> 
> > of course I have seen at least three different conventions about how
> > this is done...
> 
> Oh, well.  I also hadn't thought of 24 hour format as being a European
> standard.  I'd thought of it as being US military format ...

OK OK. Here is your am-pm. Funny americans.

But Steve, please check which of these pics should be actually the
am and which the pm. I don't know.

the patch first:


--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="timampm.patch"
Content-Transfer-Encoding: 7bit

*** /usr/local/lib/xemacs-19.15/lisp/packages/time.el	Wed Mar  5 07:26:12 1997
--- time.el	Wed Mar  5 08:08:12 1997
***************
*** 206,212 ****
        (setq display-time-load-3.0-glyph
  	    (cons (make-extent nil nil)
  		  (make-glyph	(concat display-time-icons-dir "l-3.0.xpm"))))
!       ))
  
  
  (defun display-time-convert-num-to-pics (string)
--- 206,218 ----
        (setq display-time-load-3.0-glyph
  	    (cons (make-extent nil nil)
  		  (make-glyph	(concat display-time-icons-dir "l-3.0.xpm"))))
!       (setq display-time-am-glyph
! 	    (cons (make-extent nil nil)
! 		  (make-glyph	(concat display-time-icons-dir "am.xpm"))))
!       (setq display-time-pm-glyph
! 	    (cons (make-extent nil nil)
! 		  (make-glyph	(concat display-time-icons-dir "pm.xpm"))))
!       )) 
  
  
  (defun display-time-convert-num-to-pics (string)
***************
*** 228,234 ****
  	result elem)
      (if (not (and display-time-show-icons-maybe
  		  (eq (console-type) 'x)
! 		  (not display-time-echo-area))) load
        (while (>= load-number (setq elem (pop list)))
  	(setq result (eval (intern-soft (concat
  					 "display-time-load-"
--- 234,240 ----
  	result elem)
      (if (not (and display-time-show-icons-maybe
  		  (eq (console-type) 'x)
! 		  (not display-time-echo-area))) n
        (while (>= load-number (setq elem (pop list)))
  	(setq result (eval (intern-soft (concat
  					 "display-time-load-"
***************
*** 236,242 ****
  					 "-glyph")))))
        result)))
  
!     
  (defun display-time-mail-sign ()
    "*A function giving back the object indicating 'mail' which
  is the value of display-time-mail-sign when running under X,
--- 242,255 ----
  					 "-glyph")))))
        result)))
  
! (defun display-time-convert-am-pm (n)
!   (if (not (and display-time-show-icons-maybe
! 		(eq (console-type) 'x)
! 		(not display-time-echo-area))) n
!     (cond ((equal n "am") display-time-am-glyph)
! 	  ((equal n "pm") display-time-pm-glyph))))
! 
! 
  (defun display-time-mail-sign ()
    "*A function giving back the object indicating 'mail' which
  is the value of display-time-mail-sign when running under X,
***************
*** 319,325 ****
  		      (format "%s:%s"
  			      (if display-time-24hr-format 24-hours 12-hours)
  			      minutes)) tmp)
! 	       (if (not display-time-24hr-format) (push am-pm tmp))))
  	    ((eq elem 'day) (push day tmp))
  	    ((eq elem 'dayname) (push dayname tmp))
  	    ((eq elem 'month) (push month tmp))
--- 332,339 ----
  		      (format "%s:%s"
  			      (if display-time-24hr-format 24-hours 12-hours)
  			      minutes)) tmp)
! 	       (if (not display-time-24hr-format)
! 		   (push (display-time-convert-am-pm am-pm) tmp))))
  	    ((eq elem 'day) (push day tmp))
  	    ((eq elem 'dayname) (push dayname tmp))
  	    ((eq elem 'month) (push month tmp))

--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: text/plain; charset=US-ASCII




And the pics:


--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="am.xpm"
Content-Transfer-Encoding: base64

LyogWFBNICovCnN0YXRpYyBjaGFyICpub25hbWVbXSA9IHsKLyogd2lkdGggaGVpZ2h0IG5j
b2xvcnMgY2hhcnNfcGVyX3BpeGVsICovCiI0IDEzIDIgMSIsCi8qIGNvbG9ycyAqLwoiYCBj
ICMwMDAwMDAiLAoiYSBjICNDQTFFMUMiLAovKiBwaXhlbHMgKi8KImBgYGAiLAoiYGBhYSIs
CiJgYGFhIiwKImBgYGAiLAoiYGBgYCIsCiJgYGBgIiwKImBgYGAiLAoiYGBgYCIsCiJgYGBg
IiwKImBgYGAiLAoiYGBgYCIsCiJgYGBgIiwKImBgYGAiCn07Cg==

--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: text/plain; charset=US-ASCII



--Multipart_Wed_Mar__5_08:15:16_1997-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="pm.xpm"
Content-Transfer-Encoding: base64

LyogWFBNICovCnN0YXRpYyBjaGFyICpub25hbWVbXSA9IHsKLyogd2lkdGggaGVpZ2h0IG5j
b2xvcnMgY2hhcnNfcGVyX3BpeGVsICovCiI0IDEzIDIgMSIsCi8qIGNvbG9ycyAqLwoiYCBj
ICMwMDAwMDAiLAoiYSBjICNDQTFFMUMiLAovKiBwaXhlbHMgKi8KImBgYGAiLAoiYGBgYCIs
CiJgYGBgIiwKImBgYGAiLAoiYGBgYCIsCiJgYGBgIiwKImBgYGAiLAoiYGBgYCIsCiJgYGBg
IiwKImBgYGAiLAoiYWFgYCIsCiJhYWBgIiwKImBgYGAiCn07Cg==

--Multipart_Wed_Mar__5_08:15:16_1997-1--

