Merge from emacs-23; up to 2010-06-11T21:26:13Z!lekktu@gmail.com.

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

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index e73897e..3d754c0 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1,7 +1,6 @@
 ;;; supercite.el --- minor mode for citing mail and news replies
 
-;; Copyright (C) 1993, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1997, 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
 ;; Maintainer:    Glenn Morris <rgm@gnu.org>
@@ -185,7 +184,9 @@ See the variable `sc-cite-frame-alist' for details."
     ;; paragraph, unless sc-cite-blank-lines-p is non-nil, in which
     ;; case we treat blank lines just like any other line.
     ("^[ \t]*$"                 (if sc-cite-blank-lines-p
-                                   (sc-cite-line)
+                                   (if sc-nested-citation-p
+                                       (sc-add-citation-level)
+                                     (sc-cite-line))
                                  (sc-fill-if-different "")))
     ;; do nothing if looking at a reference tag. make sure that the
     ;; tag string isn't the empty string since this will match every