Commits

Anonymous committed e13b4af Merge

Don't assume timer-list is available, use itimer-list when not <200803122134.42592.scop@xemacs.org>

  • Participants
  • Parent commits a4c2eea, 2bc60b7

Comments (0)

Files changed (2)

+2008-03-12  Ville Skyttä  <scop@xemacs.org>
+
+	* lisp/mm-decode.el (mm-display-external): Use `itimer-list' if
+	`timer-list' is not available.
+
 2008-01-02  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.92 released.

File lisp/mm-decode.el

 					 nil))))
 			  ;; Message to be issued when the process exits.
 			  (done (format "Displaying %s...done" command))
+			  ;; `timer-list' in GNU Emacs, `itimer-list' in XEmacs
+			  (tlist (if (boundp 'timer-list)
+				     timer-list
+				   itimer-list))
 			  ;; In particular, the timer object (which is
 			  ;; a vector in Emacs but is a list in XEmacs)
 			  ;; requires that it is lexically scoped.
 			  (timer (run-at-time 2.0 nil 'ignore)))
 		       (lambda (process state)
 			 (when (eq 'exit (process-status process))
-			   (if (memq timer timer-list)
+			   (if (memq timer tlist)
 			       (timer-set-function timer fn)
 			     (funcall fn))
 			   (ignore-errors (eval fm))