diff lisp/mu/mu-cite.el @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1
author cvs
date Mon, 13 Aug 2007 09:13:56 +0200
parents 364816949b59
children fe104dbd9147
line wrap: on
line diff
--- a/lisp/mu/mu-cite.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/mu/mu-cite.el	Mon Aug 13 09:13:56 2007 +0200
@@ -6,7 +6,7 @@
 ;;         MINOURA Makoto <minoura@netlaputa.or.jp>
 ;;         Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
-;; Version: $Revision: 1.3 $
+;; Version: $Revision: 1.4 $
 ;; Keywords: mail, news, citation
 
 ;; This file is part of MU (Message Utilities).
@@ -54,14 +54,14 @@
 ;;;
 
 (defconst mu-cite/RCS-ID
-  "$Id: mu-cite.el,v 1.3 1997/01/30 02:22:36 steve Exp $")
+  "$Id: mu-cite.el,v 1.4 1997/02/15 22:21:09 steve Exp $")
 (defconst mu-cite/version (get-version-string mu-cite/RCS-ID))
 
 
 ;;; @ formats
 ;;;
 
-(defvar mu-cite/cited-prefix-regexp "\\(^[^ \t\n>]+>+[ \t]*\\|^[ \t]*$\\)"
+(defvar mu-cite/cited-prefix-regexp "\\(^[^ \t\n<>]+>+[ \t]*\\|^[ \t]*$\\)"
   "*Regexp to match the citation prefix.
 If match, mu-cite doesn't insert citation prefix.")
 
@@ -390,10 +390,13 @@
 
 ;;; @ message editing utilities
 ;;;
-  
+
 (defvar citation-mark-chars ">}|"
   "*String of characters for citation delimiter. [mu-cite.el]")
 
+(defvar citation-disable-chars "<{"
+  "*String of characters not allowed as citation-prefix.")
+
 (defun detect-paragraph-cited-prefix ()
   (save-excursion
     (goto-char (point-min))
@@ -410,7 +413,10 @@
 			     (progn (end-of-line)(point))))
 		  (setq ret (string-compare-from-top prefix str))
 		  )
-	(setq prefix (second ret))
+	(setq prefix
+	      (if (stringp ret)
+		  ret
+		(second ret)))
 	(setq i (1+ i))
 	)
       (cond ((> i 1) prefix)
@@ -432,8 +438,10 @@
 		 prefix)))
 	    ((progn
 	       (goto-char (point-max))
-	       (re-search-backward (concat "[" citation-mark-chars "]")
-				   nil t)
+	       (re-search-backward
+		(concat "[" citation-disable-chars "]") nil t)
+	       (re-search-backward
+		(concat "[" citation-mark-chars "]") nil t)
 	       )
 	     (goto-char (match-end 0))
 	     (if (looking-at "[ \t]+")