Commit f98b752f authored by Karl Heuer's avatar Karl Heuer
Browse files

(mail-extract-address-components):

Rename local :-pos to colon-pos.
parent 120821e1
...@@ -786,7 +786,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible ...@@ -786,7 +786,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible
(not (eobp)))) (not (eobp))))
(let (char (let (char
end-of-address end-of-address
<-pos >-pos @-pos :-pos comma-pos !-pos %-pos \;-pos <-pos >-pos @-pos colon-pos comma-pos !-pos %-pos \;-pos
group-:-pos group-\;-pos route-addr-:-pos group-:-pos group-\;-pos route-addr-:-pos
record-pos-symbol record-pos-symbol
first-real-pos last-real-pos first-real-pos last-real-pos
...@@ -881,7 +881,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible ...@@ -881,7 +881,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible
((setq record-pos-symbol ((setq record-pos-symbol
(cdr (assq char (cdr (assq char
'((?< . <-pos) (?> . >-pos) (?@ . @-pos) '((?< . <-pos) (?> . >-pos) (?@ . @-pos)
(?: . :-pos) (?, . comma-pos) (?! . !-pos) (?: . colon-pos) (?, . comma-pos) (?! . !-pos)
(?% . %-pos) (?\; . \;-pos))))) (?% . %-pos) (?\; . \;-pos)))))
(set record-pos-symbol (set record-pos-symbol
(cons (point) (symbol-value record-pos-symbol))) (cons (point) (symbol-value record-pos-symbol)))
...@@ -921,7 +921,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible ...@@ -921,7 +921,7 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible
;; Example: @foo.bar.dom,@xxx.yyy.zzz:mailbox@aaa.bbb.ccc ;; Example: @foo.bar.dom,@xxx.yyy.zzz:mailbox@aaa.bbb.ccc
;; This commonly happens on the UUCP "From " line. Ugh. ;; This commonly happens on the UUCP "From " line. Ugh.
(cond ((and (> (length @-pos) 1) (cond ((and (> (length @-pos) 1)
(eq 1 (length :-pos)) ;TODO: check if between last two @s (eq 1 (length colon-pos)) ;TODO: check if between last two @s
(not \;-pos) (not \;-pos)
(not <-pos)) (not <-pos))
(goto-char (point-min)) (goto-char (point-min))
...@@ -961,9 +961,9 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible ...@@ -961,9 +961,9 @@ ADDRESS may be a string or a buffer. If it is a buffer, the visible
;; Check for : that indicates GROUP list and for : part of ;; Check for : that indicates GROUP list and for : part of
;; ROUTE-ADDR spec. ;; ROUTE-ADDR spec.
;; Can't possibly be more than two :. Nuke any extra. ;; Can't possibly be more than two :. Nuke any extra.
(while :-pos (while colon-pos
(setq temp (car :-pos) (setq temp (car colon-pos)
:-pos (cdr :-pos)) colon-pos (cdr colon-pos))
(cond ((and <-pos >-pos (cond ((and <-pos >-pos
(> temp <-pos) (> temp <-pos)
(< temp >-pos)) (< temp >-pos))
......
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