lisp/emacs-lisp/timer.el (timer--time): Define setter with gv-define-setter.

2 files changed, 20 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da0ea72364b..15ff4e131a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,10 @@
 2013-08-10  Juanma Barranquero  <lekktu@gmail.com>
 
+	* emacs-lisp/timer.el (timer--time): Define setter with
+	gv-define-setter to avoid deprecation warning.
+
 	* completion.el: Remove stuff unused since revno:3176 (1993-05-27).
-	(*record-cmpl-statistics-p*): Remove (was commented out ).
+	(*record-cmpl-statistics-p*): Remove (was commented out).
 	(cmpl-statistics-block): Remove (body was commented out).
 	All callers changed.
 	(add-completions-from-buffer, load-completions-from-file):
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 0aa31f717ed..410e43b16e6 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -62,23 +62,22 @@
 	(timer--usecs timer)
 	(timer--psecs timer)))
 
-(gv-define-simple-setter timer--time
-  (lambda (timer time)
-    (timer--check timer)
-    (setf (timer--high-seconds timer) (pop time))
-    (let ((low time) (usecs 0) (psecs 0))
-      (if (consp time)
-          (progn
-            (setq low (pop time))
-            (if time
-                (progn
-                  (setq usecs (pop time))
-                  (if time
-                      (setq psecs (car time)))))))
-      (setf (timer--low-seconds timer) low)
-      (setf (timer--usecs timer) usecs)
-      (setf (timer--psecs timer) psecs))))
-
+(gv-define-setter timer--time (time timer)
+  (macroexp-let2 nil val time
+    `(progn
+       (timer--check ,timer)
+       (setf (timer--high-seconds ,timer) (pop ,val))
+       (let ((low ,val) (usecs 0) (psecs 0))
+	 (when (consp ,val)
+	   (setq low (pop ,val))
+	   (when ,val
+	     (setq usecs (pop ,val))
+	     (when ,val
+	       (setq psecs (car ,val)))))
+	 (setf (timer--low-seconds ,timer) low)
+	 (setf (timer--usecs ,timer) usecs)
+	 (setf (timer--psecs ,timer) psecs))
+       ,val)))
 
 (defun timer-set-time (timer time &optional delta)
   "Set the trigger time of TIMER to TIME.