summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorSean Neakums <sneakums@zork.net>2011-05-22 14:46:49 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-05-22 14:46:49 -0400
commit7261f6cee1b1db51a43a48c246eb96c24d951840 (patch)
tree43c9ca03f3200ac603e0c457caad8b64ae3dfc80 /lisp
parent4d8ade89573bba54d21c2cff9886420770e0ef0b (diff)
downloademacs-7261f6cee1b1db51a43a48c246eb96c24d951840.tar.gz
emacs-7261f6cee1b1db51a43a48c246eb96c24d951840.tar.bz2
emacs-7261f6cee1b1db51a43a48c246eb96c24d951840.zip
Fix for sc-nested-citation-p in supercite.el.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=109145 * mail/supercite.el (sc-default-cite-frame): Handle sc-nested-citation-p when sc-cite-blank-lines-p is non-nil.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/supercite.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c07682f8a7b..ad7729fe38d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-22 Sean Neakums <sneakums@zork.net>
+
+ * mail/supercite.el (sc-default-cite-frame): Handle
+ sc-nested-citation-p when sc-cite-blank-lines-p is non-nil.
+
2011-05-16 Andreas Schwab <schwab@linux-m68k.org>
* diff-mode.el (diff-fixup-modifs): Fix last change.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 0dacfc3402d..4676bf04059 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -186,7 +186,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