(sc-cite-frame-alist): Doc fix.

(sc-cite-region, sc-uncite-region, sc-recite-region):
Fix previous change to handle not alist as a symbol, but
a citation frame as a symbol that represents a variable name.

2 files changed, 26 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0e9e860ff2..905c8b4e549 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,19 @@
+2004-12-13  Juri Linkov  <juri@jurta.org>
+
+	* simple.el (next-error-buffer-p, next-error-find-buffer):
+	Doc fix.
+
+	* mail/supercite.el (sc-cite-frame-alist): Doc fix.
+	(sc-cite-region, sc-uncite-region, sc-recite-region):
+	Fix previous change to handle not alist as a symbol, but
+	a citation frame as a symbol that represents a variable name.
+
 2004-12-13  Richard M. Stallman  <rms@gnu.org>
 
 	* filecache.el (file-cache-add-directory-using-find):
 	Only set up file-cache-find-command-posix-flag if we will use it.
 
-	* bindings.el (mode-line-buffer-identification-keymap): 
+	* bindings.el (mode-line-buffer-identification-keymap):
 	Don't cancel the mode-line's usual down-mouse-1 binding.
 
 	* cus-edit.el (custom-face-selected): Handle `default' specs.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index c1f4b6f0170..06282c430f0 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -146,8 +146,9 @@ Each element of this list has the following form:
              (...)))
 
 Where INFOKEY is a key for `sc-mail-field', REGEXP is a regular
-expression to match against the INFOKEY's value.  FRAME is a citation
-frame, or a variable containing a citation frame."
+expression to match against the INFOKEY's value.  FRAME is
+a citation frame, or a symbol that represents the name of
+a variable whose value is a citation frame."
   :type '(repeat (list symbol (repeat (cons regexp
 					    (choice (repeat (repeat sexp))
 						    symbol)))))
@@ -1434,12 +1435,11 @@ 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
-		    (if (symbolp sc-cite-frame-alist)
-			(symbol-value sc-cite-frame-alist)
-		      sc-cite-frame-alist))
-		   sc-default-cite-frame))
+  (let ((frame (sc-scan-info-alist sc-cite-frame-alist))
 	(sc-confirm-always-p (if confirm-p t sc-confirm-always-p)))
+    (if (and frame (symbolp frame))
+	(setq frame (symbol-value frame)))
+    (or frame (setq frame sc-default-cite-frame))
     (run-hooks 'sc-pre-cite-hook)
     (if interactive
 	(sc-select-attribution))
@@ -1450,11 +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
-		    (if (symbolp sc-uncite-frame-alist)
-			(symbol-value sc-uncite-frame-alist)
-		      sc-uncite-frame-alist))
-		   sc-default-uncite-frame)))
+  (let ((frame (sc-scan-info-alist sc-uncite-frame-alist)))
+    (if (and frame (symbolp frame))
+	(setq frame (symbol-value frame)))
+    (or frame (setq frame sc-default-uncite-frame))
     (run-hooks 'sc-pre-uncite-hook)
     (regi-interpret frame start end)))
 
@@ -1465,11 +1464,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
-		    (if (symbolp sc-recite-frame-alist)
-			(symbol-value sc-recite-frame-alist)
-		      sc-recite-frame-alist))
-		   sc-default-recite-frame)))
+  (let ((frame (sc-scan-info-alist sc-recite-frame-alist)))
+    (if (and frame (symbolp frame))
+	(setq frame (symbol-value frame)))
+    (or frame (setq frame sc-default-recite-frame))
     (run-hooks 'sc-pre-recite-hook)
     (regi-interpret frame start end)))