1 files changed, 9 insertions, 6 deletions

@@ -42,14 +42,17 @@ OPTIONS is a plist with three optional arguments:
   (declare (indent 1))
   (let ((testfn (or (plist-get options :testfn)
                     (lambda (a b)
-                      (string= (cdr a) (cdar b)))))
+                      (string= (cdr-safe a) (cdar b)))))
         (replace (or (plist-get options :replace) nil))
         (after (or (plist-get options :after) nil)))
-    (when replace
-      (setq auto-insert-alist
-            (assoc-delete-all condition auto-insert-alist testfn)))
-    (unless (assoc (list condition) auto-insert-alist testfn) 
-      (define-auto-insert condition action after))))
+    (if replace
+        (progn (setq auto-insert-alist
+                     (assoc-delete-all (list condition)
+                                       auto-insert-alist
+                                       testfn))
+               (define-auto-insert condition action after))
+      (unless (assoc (list condition) auto-insert-alist testfn)
+        (define-auto-insert condition action after)))))
 
 (provide 'acdw-autoinsert)
 ;;; acdw-autoinsert.el ends here