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

[Richard M . Stallman]

Index: emacs/lisp/mail/supercite.el
diff -c emacs/lisp/mail/supercite.el:1.35 emacs/lisp/mail/supercite.el:1.36
*** emacs/lisp/mail/supercite.el:1.35   Mon Sep 20 15:47:08 2004
--- emacs/lisp/mail/supercite.el        Thu Nov  4 10:14:47 2004
***************
*** 1424,1441 ****
    nil)
  
  ;; interactive functions
! (defun sc-cite-region (start end &optional confirm-p)
    "Cite a region delineated by START and END.
  If optional CONFIRM-P is non-nil, the attribution is confirmed before
  its use in the citation string.  This function first runs
! `sc-pre-cite-hook'."
!   (interactive "r\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)
!     (if (interactive-p)
        (sc-select-attribution))
      (regi-interpret frame start end)))
  
--- 1424,1444 ----
    nil)
  
  ;; interactive functions
! (defun sc-cite-region (start end &optional confirm-p interactive)
    "Cite a region delineated by START and END.
  If optional CONFIRM-P is non-nil, the attribution is confirmed before
  its use in the citation string.  This function first runs
! `sc-pre-cite-hook'.
! 
! 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)
                   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))
      (regi-interpret frame start end)))
  
***************
*** 1978,1993 ****
        (insert (sc-mail-field "sc-citation"))
        (error "Line is already cited"))))
  
! (defun sc-version (arg)
    "Echo the current version of Supercite in the minibuffer.
! With \\[universal-argument] (universal-argument), or if run non-interactively,
  inserts the version string in the current buffer instead."
!   (interactive "P")
    (let ((verstr (format "Using Supercite.el %s" sc-version)))
!     (if (or (consp arg)
!           (not (interactive-p)))
!       (insert "`sc-version' says: " verstr)
!       (message verstr))))
  
  (defun sc-describe ()
    "
--- 1981,1995 ----
        (insert (sc-mail-field "sc-citation"))
        (error "Line is already cited"))))
  
! (defun sc-version (message)
    "Echo the current version of Supercite in the minibuffer.
! If MESSAGE is non-nil (interactively, with no prefix argument),
  inserts the version string in the current buffer instead."
!   (interactive (not current-prefix-arg))
    (let ((verstr (format "Using Supercite.el %s" sc-version)))
!     (if message
!       (message verstr)
!       (insert "`sc-version' says: " verstr))))
  
  (defun sc-describe ()
    "