(rmail-reply): Don't call mail-strip-quoted-names.

[gnu-emacs] / lisp / mail / supercite.el

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 6b66f2843bc9859785a93b37d58e8143bc39c950..eadfa1430c3e919aca1d42ff1107e0a30068569f 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -32,7 +32,9 @@
 ;; |Mail and news reply citation package
 ;; |1993/09/22 18:58:46|3.1|
 
-;; Code:
+;;; Commentary:
+
+;;; Code:
 
 \f
 (require 'regi)
@@ -511,9 +513,8 @@ string."
 (defconst sc-emacs-features
   (let ((version 'v18)
        (flavor  'GNU))
-    (if (or
-        (string= (substring emacs-version 0 2) "19")
-        (string= (substring emacs-version 0 2) "20"))
+    (if (not
+        (string= (substring emacs-version 0 2) "18"))
        (setq version 'v19))
     (if (string-match "Lucid" emacs-version)
        (setq flavor 'Lucid))
@@ -522,9 +523,9 @@ string."
   "A list describing what version of Emacs we're running on.
 Known flavors are:
 
-Emacs 18        : (v18 GNU)
-Emacs 19 or 20  : (v19 GNU)
-Lucid 19 or 20  : (v19 Lucid)")
+Emacs 18           : (v18 GNU)
+Emacs 19 or later  : (v19 GNU)
+Lucid 19 or later  : (v19 Lucid)")
 
 
 (defvar sc-tmp-nested-regexp nil
@@ -1321,18 +1322,20 @@ to the auto-selected attribution string."
          (setq sc-attrib-or-cite nil)  ; nil==attribution, t==citation
          (while
              (catch 'sc-reconfirm
-               (string= "" (setq choice
-                                 (if sc-attrib-or-cite
-                                     (sc-read-string
-                                      "Enter citation prefix: "
-                                      citation
-                                      'sc-citation-confirmation-history)
-                                   (sc-completing-read
-                                    "Complete attribution name: "
-                                    query-alist nil nil
-                                    (cons initial 0)
-                                    'sc-attribution-confirmation-history)
-                                   )))))
+               (progn
+                 (setq choice
+                       (if sc-attrib-or-cite
+                           (sc-read-string
+                            "Enter citation prefix: "
+                            citation
+                            'sc-citation-confirmation-history)
+                         (sc-completing-read
+                          "Complete attribution name: "
+                          query-alist nil nil
+                          (cons initial 0)
+                          'sc-attribution-confirmation-history)
+                         ))
+                 nil)))
          (if sc-attrib-or-cite
              ;; since the citation was chosen, we have to guess at
              ;; the attribution
@@ -1865,11 +1868,11 @@ entered, regardless of the value of `sc-electric-references-p'.  See
 
 (defun sc-toggle-var (variable)
   "Boolean toggle VARIABLE's value.
-VARIABLE must be a bound symbol.  Nil values change to t, non-nil
+VARIABLE must be a bound symbol.  nil values change to t, non-nil
 values are changed to nil."
   (message "%s changed from %s to %s"
           variable (symbol-value variable)
-          (set-variable variable (not (eval-expression variable))))
+          (set variable (not (symbol-value variable))))
   (sc-set-mode-string))
 
 (defun sc-set-variable (var)
@@ -2096,7 +2099,7 @@ cited."
            (looking-at "^[ \t]*$")
            (consp arg))
        (insert (sc-mail-field "sc-citation"))
-      (error "Line is already cited."))))
+      (error "Line is already cited"))))
 
 (defun sc-version (arg)
   "Echo the current version of Supercite in the minibuffer.