Update FSF's address.

[bpt/emacs.git] / lisp / mail / supercite.el

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 5c5d7ef..8babd36 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -24,8 +24,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;; LCD Archive Entry
 ;; supercite|Barry A. Warsaw|supercite-help@anthem.nlm.nih.gov
@@ -68,7 +69,7 @@ This should NOT have a leading `^' character.  See also
 (defvar sc-citation-nonnested-root-regexp "[-._a-zA-Z0-9]+"
   "*Regexp describing the variable root part of a nested citation.
 This should NOT have a leading `^' character.  This variable is
-related to `sc-citation-root-regexp' but where as that varariable
+related to `sc-citation-root-regexp' but whereas that variable
 describes both nested and non-nested citation roots, this variable
 describes only nested citation roots.")
 (defvar sc-citation-delimiter-regexp "[>]+"
@@ -896,8 +897,14 @@ This should be the author's full name minus an optional title."
          ;; If there is a <...> in the name,
          ;; treat everything before that as the full name.
          ;; Even if it contains parens, use the whole thing.
+         ;; On the other hand, we do look for quotes in the usual way.
          (and (string-match " *<.*>" from 0)
-              (sc-name-substring from 0 (match-beginning 0) 0))
+              (let ((before-angles
+                     (sc-name-substring from 0 (match-beginning 0) 0)))
+                (if (string-match "\".*\"" before-angles 0)
+                    (sc-name-substring
+                     before-angles (match-beginning 0) (match-end 0) 1)
+                  before-angles)))
          (sc-name-substring
           from (string-match "(.*)" from 0) (match-end 0) 1)
          (sc-name-substring
@@ -1320,7 +1327,7 @@ buffer."
      nesting)))
 
 (defun sc-add-citation-level ()
-  "Add a citation level for nested citation style w/ coersion."
+  "Add a citation level for nested citation style w/ coercion."
   (let* ((nesting (sc-guess-nesting))
         (citation (make-string (1+ (length nesting))
                                (string-to-char sc-citation-delimiter)))
@@ -1422,7 +1429,7 @@ non-nil."
   ())
 
 (defun sc-no-blank-line-or-header()
-  "Similar to `sc-no-header' except it removes the preceeding blank line."
+  "Similar to `sc-no-header' except it removes the preceding blank line."
   (if (not (bobp))
       (if (and (eolp)
               (progn (forward-line -1)