(sc-cite-region): Handle the case where sc-cite-frame-alist is a symbol.

(sc-uncite-region): Handle the case where sc-uncite-frame-alist is a symbol.
(sc-recite-region): Handle the case where sc-recite-frame-alist is a symbol.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 677fd39b97eb410f202caab0066acf5c25e50d71..68f003f4c97ca1b249fcab5e995a94bcf73b86e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * mail/supercite.el (sc-cite-region): Handle the case where
+       sc-cite-frame-alist is a symbol.
+       (sc-uncite-region): Handle the case where sc-uncite-frame-alist is
+       a symbol.
+       (sc-recite-region): Handle the case where sc-recite-frame-alist is
+       a symbol.
+
 2004-11-27  Arne J\e,Ax\e(Brgensen  <arne@arnested.dk>  (tiny change)
 
        * wid-edit.el (widget-narrow-to-field): New function.

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 0f5925021e8951e840478f2d4f0c905c19e89e23..0afab79e4fa57d46dfc64f8be5076d743cdb3ade 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1434,7 +1434,10 @@ When called interactively, the optional arg INTERACTIVE is non-nil,
 and that means call `sc-select-attribution' too."
   (interactive "r\nP\np")
   (undo-boundary)
-  (let ((frame (or (sc-scan-info-alist sc-cite-frame-alist)
+  (let ((frame (or (sc-scan-info-alist
+                   (if (symbolp sc-cite-frame-alist)
+                       (symbol-value sc-cite-frame-alist)
+                     sc-cite-frame-alist))
                   sc-default-cite-frame))
        (sc-confirm-always-p (if confirm-p t sc-confirm-always-p)))
     (run-hooks 'sc-pre-cite-hook)
@@ -1447,7 +1450,10 @@ and that means call `sc-select-attribution' too."
 First runs `sc-pre-uncite-hook'."
   (interactive "r")
   (undo-boundary)
-  (let ((frame (or (sc-scan-info-alist sc-uncite-frame-alist)
+  (let ((frame (or (sc-scan-info-alist
+                   (if (symbolp sc-uncite-frame-alist)
+                       (symbol-value sc-uncite-frame-alist)
+                     sc-uncite-frame-alist))
                   sc-default-uncite-frame)))
     (run-hooks 'sc-pre-uncite-hook)
     (regi-interpret frame start end)))
@@ -1459,7 +1465,10 @@ First runs `sc-pre-recite-hook'."
   (let ((sc-confirm-always-p t))
     (sc-select-attribution))
   (undo-boundary)
-  (let ((frame (or (sc-scan-info-alist sc-recite-frame-alist)
+  (let ((frame (or (sc-scan-info-alist
+                   (if (symbolp sc-recite-frame-alist)
+                       (symbol-value sc-recite-frame-alist)
+                     sc-recite-frame-alist))
                   sc-default-recite-frame)))
     (run-hooks 'sc-pre-recite-hook)
     (regi-interpret frame start end)))