[PATCH] Trivial itimer tweaks for password.el

[PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 2327 bytes --]

Hi Simon!

Just keeping things neat and tidy. :-)

NOTE: This patch has been committed.


Gnus patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected:               lisp/ChangeLog
Source files diff command:    cvs -q diff -uN
Files affected:               lisp/password.el

Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 7.34
diff -u -U0 -r7.34 ChangeLog
--- lisp/ChangeLog	6 Jan 2004 01:53:45 -0000	7.34
+++ lisp/ChangeLog	6 Jan 2004 02:01:13 -0000
@@ -0,0 +1,5 @@
+2004-01-06  Steve Youngs  <sryoungs@bigpond.net.au>
+
+	* password.el: Only autoload `run-at-time' if not XEmacs.
+	Only autoload the itimer functions if XEmacs.
+
Index: lisp/password.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/password.el,v
retrieving revision 7.1
diff -u -u -r7.1 password.el
--- lisp/password.el	4 Jan 2004 22:49:38 -0000	7.1
+++ lisp/password.el	6 Jan 2004 02:01:09 -0000
@@ -52,7 +52,8 @@
 
 ;;; Code:
 
-(autoload 'run-at-time "timer")
+(unless (featurep 'xemacs)
+  (autoload 'run-at-time "timer"))
 
 (eval-when-compile
   (require 'cl))
@@ -83,15 +84,16 @@
       (read-passwd prompt)))
 
 (eval-when-compile
-  (defvar itimer-process)
-  (defvar itimer-timer)
-  (autoload 'delete-itimer "itimer")
-  (autoload 'itimer-driver-start "itimer")
-  (autoload 'itimer-value "itimer")
-  (autoload 'set-itimer-function "itimer")
-  (autoload 'set-itimer-function-arguments "itimer")
-  (autoload 'set-itimer-restart "itimer")
-  (autoload 'start-itimer "itimer"))
+  (when (featurep 'xemacs)
+    (defvar itimer-process)
+    (defvar itimer-timer)
+    (autoload 'delete-itimer "itimer")
+    (autoload 'itimer-driver-start "itimer")
+    (autoload 'itimer-value "itimer")
+    (autoload 'set-itimer-function "itimer")
+    (autoload 'set-itimer-function-arguments "itimer")
+    (autoload 'set-itimer-restart "itimer")
+    (autoload 'start-itimer "itimer")))
 
 (eval-and-compile
   (defalias

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]

Re: [PATCH] Trivial itimer tweaks for password.el

[Katsumi Yamaoka]

>>>>> In <microsoft-free.873cat25rx.fsf@eicq.dnsalias.org>
>>>>>	Steve Youngs <sryoungs@bigpond.net.au> wrote:

> +2004-01-06  Steve Youngs  <sryoungs@bigpond.net.au>
> +
> +	* password.el: Only autoload `run-at-time' if not XEmacs.
> +	Only autoload the itimer functions if XEmacs.

Autoloading itimer functions is not only for XEmacs.  I got the
following warnings when compiling Gnus with Emacs 21.3:

While compiling the end of the data in file /Work/gnus/lisp/password.el:
  ** The following functions are not known to be defined:
    itimer-driver-start, start-itimer, itimer-value, delete-itimer,
    set-itimer-function, set-itimer-restart,
    set-itimer-function-arguments
Wrote /Work/gnus/lisp/password.elc
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

|--==> "KY" == Katsumi Yamaoka <yamaoka@jpl.org> writes:

  >>>>>>In <microsoft-free.873cat25rx.fsf@eicq.dnsalias.org>
  >>>>>>Steve Youngs <sryoungs@bigpond.net.au> wrote:

  >>+2004-01-06  Steve Youngs  <sryoungs@bigpond.net.au>
  >>+
  >>+	* password.el: Only autoload `run-at-time' if not XEmacs.
  >>+	Only autoload the itimer functions if XEmacs.

  KY> Autoloading itimer functions is not only for XEmacs.  I got the
  KY> following warnings when compiling Gnus with Emacs 21.3:

  KY> While compiling the end of the data in file /Work/gnus/lisp/password.el:
  KY>   ** The following functions are not known to be defined:
  KY>     itimer-driver-start, start-itimer, itimer-value, delete-itimer,
  KY>     set-itimer-function, set-itimer-restart,
  KY>     set-itimer-function-arguments
  KY> Wrote /Work/gnus/lisp/password.elc

I don't understand.  itimer doesn't exist in GNU/Emacs does it?  How
do you autoload something that doesn't exist?


-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Steve Youngs <sryoungs@bigpond.net.au> writes:

> I don't understand.  itimer doesn't exist in GNU/Emacs does it?  How
> do you autoload something that doesn't exist?

Well, you avoid compiler warnings in the path that's not taken.  :-)

But looking at password.el, I don't quite understand why it defines a
version of `run-at-time'.  Both XEmacs 21.4 and Emacs 21.x defines
that function, don't they?

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Katsumi Yamaoka]

>>>>> In <microsoft-free.874qv9d86o.fsf@eicq.dnsalias.org>
>>>>>	Steve Youngs <sryoungs@bigpond.net.au> wrote:

KY> Autoloading itimer functions is not only for XEmacs.  I got the
KY> following warnings when compiling Gnus with Emacs 21.3:

KY> While compiling the end of the data in file /Work/gnus/lisp/password.el:
KY>   ** The following functions are not known to be defined:
KY>     itimer-driver-start, start-itimer, itimer-value, delete-itimer,
KY>     set-itimer-function, set-itimer-restart,
KY>     set-itimer-function-arguments
KY> Wrote /Work/gnus/lisp/password.elc

> I don't understand.  itimer doesn't exist in GNU/Emacs does it?  How
> do you autoload something that doesn't exist?

Those autoloads are for only avoiding compiler warnings in
Emacs because of the absence of itimer functions.  Rather, they
are unnecessary for XEmacs.  It will be quite obvious if you try
it on Emacs 21.3 (not 21.3.50).
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Trivial itimer tweaks for password.el

[Katsumi Yamaoka]

>>>>> In <m31xqdy7sj.fsf@quimbies.gnus.org>
>>>>>	Lars Magne Ingebrigtsen <larsi@gnus.org> wrote:

> But looking at password.el, I don't quite understand why it defines a
> version of `run-at-time'.  Both XEmacs 21.4 and Emacs 21.x defines
> that function, don't they?

There's a bug in XEmacs.  It ends more quickly than the
specified time in almost cases.  Here's a test case that Adrian
Aichner wrote:

(defun test-timer (second)
  (interactive "nSecond: ")
  (let ((start (current-time)))
    (run-at-time
     second nil
     (lambda (start second)
       (let ((end (current-time)))
	 (message "Requested: %f, Lapsed: %f"
		  second
		  (+ (* (- (car end) (car start)) 65536)
		     (- (nth 1 end) (nth 1 start))
		     (/ (- (nth 2 end) (nth 2 start)) 1000000.0)))))
     start second)))

Although I've sent a patch for itimer.el last year, it is still
neglected.
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> There's a bug in XEmacs.  It ends more quickly than the
> specified time in almost cases.  Here's a test case that Adrian
> Aichner wrote:

[...]

> Although I've sent a patch for itimer.el last year, it is still
> neglected.

That's too bad.  Was the patch just lost, perhaps?

Anyway, it might make sense to separate out the run-at-time stuff
from password.el into, say, run-at-time.el, and just include that
file if we're in XEmacs.  At a later date, when this gets fixed in
XEmacs, we can remove that file again...

I'll do that, if nobody objects.

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Katsumi Yamaoka]

>>>>> In <m3oethwrv5.fsf@quimbies.gnus.org>
>>>>>	Lars Magne Ingebrigtsen <larsi@gnus.org> wrote:

> Katsumi Yamaoka <yamaoka@jpl.org> writes:

[...]

>> Although I've sent a patch for itimer.el last year, it is still
>> neglected.

> That's too bad.  Was the patch just lost, perhaps?

> Anyway, it might make sense to separate out the run-at-time stuff
>>From password.el into, say, run-at-time.el, and just include that
> file if we're in XEmacs.  At a later date, when this gets fixed in
> XEmacs, we can remove that file again...

Hm, the bug is in the XEmacs core.  So it won't help old XEmacs
users even if the patch is applied.

> I'll do that, if nobody objects.

Please keep in mind there is the same thing in nnheaderxm.el.
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

>> I'll do that, if nobody objects.
>
> Please keep in mind there is the same thing in nnheaderxm.el.

Right; then it makes even more sense to create a separate
run-at-time.el -- it'll remove the code duplication...

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Right; then it makes even more sense to create a separate
> run-at-time.el -- it'll remove the code duplication...

I've now done so.

But I ran into a strange problem when running under XEmacs 21.4,
unrelated to this, I think.

It says that `set-text-properties' is undefined as a function.
(Steve killed the definition of gnus-xmas-set-text-properties, and I
cleaned up the code to just call that function directly.)

But the odd thing is that before starting Gnus, the function is
defined.  After loading Gnus, the function is no longer defined.  And
I've grepped through the source without finding anything suspicious...

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

|--==> "LMI" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

  LMI> But looking at password.el, I don't quite understand why it
  LMI> defines a version of `run-at-time'.  Both XEmacs 21.4 and Emacs
  LMI> 21.x defines that function, don't they?

Strictly speaking, no, XEmacs doesn't have a `run-at-time' function.
The only place it exists in XEmacs-land is in the "fsf-compat" elisp
package.  But I wouldn't recommend using _that_ one simply because
Katsumi has defined a _much_ better one in password.el. :-)

Probably be better if it was called `password-run-at-time', or
`gnus-run-at-time' though.

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Steve Youngs <sryoungs@bigpond.net.au> writes:

> Strictly speaking, no, XEmacs doesn't have a `run-at-time' function.
> The only place it exists in XEmacs-land is in the "fsf-compat" elisp
> package.

Right.

> But I wouldn't recommend using _that_ one simply because
> Katsumi has defined a _much_ better one in password.el. :-)
>
> Probably be better if it was called `password-run-at-time', or
> `gnus-run-at-time' though.

It was called `password-run-at-time', but I just renamed it to
`run-at-time'.  :-)

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Kai Grossjohann]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> It was called `password-run-at-time', but I just renamed it to
> `run-at-time'.  :-)

Please don't overwrite built-in functions.  Better choose a
nonconflicting name.

Kai

Re: [PATCH] Trivial itimer tweaks for password.el

[Katsumi Yamaoka]

>>>>> In <878yklpfnh.fsf@emptyhost.emptydomain.de>
>>>>>	Kai Grossjohann <kai@emptydomain.de> wrote:

> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

>> It was called `password-run-at-time', but I just renamed it to
>> `run-at-time'.  :-)

> Please don't overwrite built-in functions.  Better choose a
> nonconflicting name.

> Kai

run-at-time.el is loaded only for XEmacs, and `run-at-time' is
not built-in.
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Trivial itimer tweaks for password.el

[Kai Grossjohann]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> run-at-time.el is loaded only for XEmacs, and `run-at-time' is
> not built-in.

OK.  Sorry.

Kai

Re: [PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 785 bytes --]

|--==> "LMI" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

  LMI> It says that `set-text-properties' is undefined as a function.
  LMI> (Steve killed the definition of gnus-xmas-set-text-properties,
  LMI> and I cleaned up the code to just call that function directly.)

  LMI> But the odd thing is that before starting Gnus, the function
  LMI> is defined.  After loading Gnus, the function is no longer
  LMI> defined.  And I've grepped through the source without finding
  LMI> anything suspicious...

I can't reproduce this.

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Kai Grossjohann <kai@emptydomain.de> writes:

> Katsumi Yamaoka <yamaoka@jpl.org> writes:
>
>> run-at-time.el is loaded only for XEmacs, and `run-at-time' is
>> not built-in.
>
> OK.  Sorry.

Well, I agree that it isn't a good thing to redefine functions
defined elsewhere.  It makes debugging things so difficult.  But in
this one instance, it seemed to tempting, since it's really
bug-fixing one fsf-compat function in XEmacs.

But I agree that it's bad practice.  Perhaps it should be renamed
back to something else...  I don't know.

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Steve Youngs <sryoungs@bigpond.net.au> writes:

> I can't reproduce this.

This is with:

XEmacs 21.4 (patch 6) "Common Lisp" [Lucid] (i386-debian-linux, Mule) of Sat Apr  6 2002 on eeyore

Before running Gnus, `C-h f set-text-properties' returns this:

`set-text-properties' is a compiled Lisp function
  -- loaded from "/usr/lib/xemacs-21.4.6/lisp/text-props.elc"
(set-text-properties START END PROPS &optional BUFFER-OR-STRING)

After starting Gnus, it says this:

Signaling: (void-function set-text-properties)
  indirect-function(set-text-properties)
  function-arglist(set-text-properties)
  describe-function-1(set-text-properties)
  #<compiled-function nil "...(10)" [standard-output function describe-function-1 buffer-string nil] 4>()
  with-displaying-help-buffer(#<compiled-function nil "...(10)" [standard-output function describe-function-1 buffer-string nil] 4> "function `set-text-properties'")
  #<compiled-function (function) "...(8)" [function with-displaying-help-buffer #<compiled-function nil "...(10)" ... 4> format "function `%s'"] 5 902143 (let* (... ...) (list ...))>(set-text-properties)
  call-interactively(describe-function)

It's pretty bizarre...
  
-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 2019 bytes --]

|--==> "LMI" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

  LMI> This is with:

  LMI> XEmacs 21.4 (patch 6) "Common Lisp" [Lucid] (i386-debian-linux,
  LMI> Mule) of Sat Apr 6 2002 on eeyore

  LMI> Before running Gnus, `C-h f set-text-properties' returns this:

  LMI> `set-text-properties' is a compiled Lisp function
  LMI>   -- loaded from "/usr/lib/xemacs-21.4.6/lisp/text-props.elc"
  LMI> (set-text-properties START END PROPS &optional BUFFER-OR-STRING)

  LMI> After starting Gnus, it says this:

  LMI> Signaling: (void-function set-text-properties)

[...]

A wee test...

XEmacs 21.4 (patch 14) "Reasonable Discussion" [Lucid] (i586-pc-linux,
Mule) of Sun Dec 21 2003 on eicq 

$ xemacs -vanilla

(describe-function 'set-text-properties)
 => `set-text-properties' is a compiled Lisp function
  -- loaded from "/usr/local/src/xemacs/lisp/text-props.elc"
(set-text-properties START END PROPS &optional BUFFER-OR-STRING)

(load-user-init-file)
 => nil

(describe-function 'set-text-properties)
 => `set-text-properties' is a compiled Lisp function
  -- loaded from "/usr/local/src/xemacs/lisp/text-props.elc"
(set-text-properties START END PROPS &optional BUFFER-OR-STRING)

(gnus)
 => #<network connection "nntpd" ("nntp" . "localhost") state:run>

C-h f set-text-properties RET
 => `set-text-properties' is a compiled Lisp function
  -- loaded from "/usr/local/src/xemacs/lisp/text-props.elc"
(set-text-properties START END PROPS &optional BUFFER-OR-STRING)

q

(describe-function 'set-text-properties)
 => `set-text-properties' is a compiled Lisp function
  -- loaded from "/usr/local/src/xemacs/lisp/text-props.elc"
(set-text-properties START END PROPS &optional BUFFER-OR-STRING)


  LMI> It's pretty bizarre...

Truly.  Perhaps update your XEmacs?

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]

Re: [PATCH] Trivial itimer tweaks for password.el

[Lars Magne Ingebrigtsen]

Steve Youngs <sryoungs@bigpond.net.au> writes:

>   LMI> It's pretty bizarre...
>
> Truly.  Perhaps update your XEmacs?

Oops.  Look what I found in my .gnus.el file:

(when (string-match "XEmacs" emacs-version)
  (fset 'set-text-properties 'gnus-xmas-set-text-properties))

Sorry.  :-/

-- 
(domestic pets only, the antidote for overdose, milk.)
  larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [PATCH] Trivial itimer tweaks for password.el

[Steve Youngs]

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

|--==> "LMI" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

  LMI> Oops.  Look what I found in my .gnus.el file:

  LMI> (when (string-match "XEmacs" emacs-version)
  LMI>   (fset 'set-text-properties 'gnus-xmas-set-text-properties))

  LMI> Sorry.  :-/

I was going to ask you what was in your Gnus setup. :-)

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|              Ashes to ashes, dust to dust.               |
|      The proof of the pudding, is under the crust.       |
|------------------------------<sryoungs@bigpond.net.au>---|

[-- Attachment #2: Type: application/pgp-signature, Size: 256 bytes --]