# HG changeset patch # User Dave Love # Date 936652857 0 # Node ID 564aae4ff7f00ed13473c81dd42e6cbb070d7b50 # Parent fcdaa4081df41a5c235715957c4e9382aac93d47 Don't conditionally define caddr. (quickurl-url-comment): Use nth, not caddr in function and defsetf. diff -r fcdaa4081df4 -r 564aae4ff7f0 lisp/quickurl.el --- a/lisp/quickurl.el Mon Sep 06 19:49:33 1999 +0000 +++ b/lisp/quickurl.el Mon Sep 06 21:20:57 1999 +0000 @@ -98,17 +98,6 @@ (defmacro defcustom (symbol init docstring &rest rest) `(defvar ,symbol ,init ,docstring)))) -;; `caddr' is a function in cl and so might not always be available -;; (remembering the general rule that says cl functions should not be used, -;; only cl macros). So, to make use of `caddr' without forcing the load of -;; cl-seq we'll define our own. - -(eval-when (load eval) - (unless (fboundp 'caddr) - (defun caddr (l) - "Return the `car' of the `cddr' of L." - (car (cddr l))))) - ;; Customize options. (defgroup quickurl nil @@ -238,7 +227,7 @@ If the URL has no comment an empty string is returned. Also note that this function is a setfable place." (if (quickurl-url-commented-p url) - (caddr url) + (nth 2 url) "")) (defsetf quickurl-url-comment (url) (store) @@ -246,7 +235,7 @@ (if (quickurl-url-commented-p ,url) (if (zerop (length ,store)) (setf (cdr ,url) (cadr ,url)) - (setf (caddr ,url) ,store)) + (setf (nth 2 ,url) ,store)) (unless (zerop (length ,store)) (setf (cdr ,url) (list (cdr ,url) ,store)))))