Commit 82db7fdf authored by Dave Love's avatar Dave Love
Browse files

Defvar curline when compiling.

(sc-citation-root-regexp, sc-citation-nonnested-root-regexp)
(sc-get-address, sc-attribs-extract-namestring): Use [:alnum:]
rather than a-zA-Z0-9 to allow non-ASCII characters.
parent b9427ca6
......@@ -103,14 +103,14 @@ This should NOT have a leading `^' character."
;; Nemacs and Mule users note: please see the texinfo manual for
;; suggestions on setting these variables.
(defcustom sc-citation-root-regexp "[-._a-zA-Z0-9]*"
(defcustom sc-citation-root-regexp "[-._[:alnum:]]*"
"*Regexp describing variable root part of a citation for a cited line.
This should NOT have a leading `^' character. See also
`sc-citation-nonnested-root-regexp'."
:type 'regexp
:group 'supercite-cite)
(defcustom sc-citation-nonnested-root-regexp "[-._a-zA-Z0-9]+"
(defcustom sc-citation-nonnested-root-regexp "[-._[:alnum:]]+"
"*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 whereas that variable
......@@ -800,6 +800,8 @@ the list should be unique."
(end (setq sc-mail-headers-end (point))))
"Regi frame for glomming mail header information.")
(eval-when-compile (defvar curline)) ; dynamic bondage
;; regi functions
(defun sc-mail-fetch-field (&optional attribs-p)
"Insert a key and value into `sc-mail-info' alist.
......@@ -1010,7 +1012,7 @@ AUTHOR is the author's name (which is removed from the address)."
(= (aref address (1- (length address))) ?>))
(substring address 1 (1- (length address)))
address))
(if (string-match "[-a-zA-Z0-9!@%._]+" from 0)
(if (string-match "[-[:alnum:]!@%._]+" from 0)
(sc-submatch 0 from)
"")
)))
......@@ -1057,7 +1059,7 @@ This should be the author's full name minus an optional title."
(sc-name-substring
from (string-match "\".*\"" from 0) (match-end 0) 1)
(sc-name-substring
from (string-match "\\([-.a-zA-Z0-9_]+\\s +\\)+<" from 0)
from (string-match "\\([-.[:alnum:]_]+\\s +\\)+<" from 0)
(match-end 1) 0)
(sc-attribs-emailname from))))
;; strip off any leading or trailing whitespace
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment