[Emacs-diffs] Changes to emacs/lisp/mail/supercite.el

[Juri Linkov]

Index: emacs/lisp/mail/supercite.el
diff -c emacs/lisp/mail/supercite.el:1.38 emacs/lisp/mail/supercite.el:1.39
*** emacs/lisp/mail/supercite.el:1.38   Sat Nov 27 17:17:17 2004
--- emacs/lisp/mail/supercite.el        Tue Dec 14 00:53:05 2004
***************
*** 146,153 ****
               (...)))
  
  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."
    :type '(repeat (list symbol (repeat (cons regexp
                                            (choice (repeat (repeat sexp))
                                                    symbol)))))
--- 146,154 ----
               (...)))
  
  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 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,1445 ****
  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))
        (sc-confirm-always-p (if confirm-p t sc-confirm-always-p)))
      (run-hooks 'sc-pre-cite-hook)
      (if interactive
        (sc-select-attribution))
--- 1435,1445 ----
  and that means call `sc-select-attribution' too."
    (interactive "r\nP\np")
    (undo-boundary)
!   (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,1460 ****
  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)))
      (run-hooks 'sc-pre-uncite-hook)
      (regi-interpret frame start end)))
  
--- 1450,1459 ----
  First runs `sc-pre-uncite-hook'."
    (interactive "r")
    (undo-boundary)
!   (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,1475 ****
    (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)))
      (run-hooks 'sc-pre-recite-hook)
      (regi-interpret frame start end)))
  
--- 1464,1473 ----
    (let ((sc-confirm-always-p t))
      (sc-select-attribution))
    (undo-boundary)
!   (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)))