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

[Miles Bader]

Index: emacs/lisp/mail/supercite.el
diff -c emacs/lisp/mail/supercite.el:1.30.2.4 
emacs/lisp/mail/supercite.el:1.30.2.5
*** emacs/lisp/mail/supercite.el:1.30.2.4       Fri Nov 12 04:21:24 2004
--- emacs/lisp/mail/supercite.el        Wed Dec  8 23:36:37 2004
***************
*** 1,6 ****
  ;;; supercite.el --- minor mode for citing mail and news replies
  
! ;; Copyright (C) 1993, 1997, 2003 Free Software Foundation, Inc.
  
  ;; Author: 1993 Barry A. Warsaw <address@hidden>
  ;; Maintainer:    FSF
--- 1,6 ----
  ;;; supercite.el --- minor mode for citing mail and news replies
  
! ;; Copyright (C) 1993, 1997, 2003, 2004 Free Software Foundation, Inc.
  
  ;; Author: 1993 Barry A. Warsaw <address@hidden>
  ;; Maintainer:    FSF
***************
*** 1434,1440 ****
  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)
                   sc-default-cite-frame))
        (sc-confirm-always-p (if confirm-p t sc-confirm-always-p)))
      (run-hooks 'sc-pre-cite-hook)
--- 1434,1443 ----
  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)
***************
*** 1447,1453 ****
  First runs `sc-pre-uncite-hook'."
    (interactive "r")
    (undo-boundary)
!   (let ((frame (or (sc-scan-info-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 (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,1465 ****
    (let ((sc-confirm-always-p t))
      (sc-select-attribution))
    (undo-boundary)
!   (let ((frame (or (sc-scan-info-alist sc-recite-frame-alist)
                   sc-default-recite-frame)))
      (run-hooks 'sc-pre-recite-hook)
      (regi-interpret frame start end)))
--- 1465,1474 ----
    (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)))