comparison lisp/mail/supercite.el @ 11556:a83ee7a1e0fd

Made sc-string-text to strip of text properties of buffer text, so string comparison wouldn't fail in sc-mail-fetch-field and sc-mail-append-field.

11555:4cc0a5e1bdac

  (if (memq 'v19 sc-emacs-features)
      ;; maybe future versions will take a `history' argument:
      (read-string prompt initial-contents)
    (read-string prompt initial-contents)))

(defun sc-submatch (matchnum &optional string)
  "Returns `match-beginning' and `match-end' sub-expression for MATCHNUM.
If optional STRING is provided, take sub-expression using `substring'
of argument, otherwise use `buffer-substring' on current buffer.  Note
that `match-data' must have already been generated and no error
checking is performed by this function."
  (if string
      (substring string (match-beginning matchnum) (match-end matchnum))
    (buffer-substring (match-beginning matchnum) (match-end matchnum))))

(defun sc-member (elt list)
  "Like `memq', but uses `equal' instead of `eq'.
Emacs19 has a builtin function `member' which does exactly this."
  (catch 'elt-is-member
    (while list
      (if (equal elt (car list))
	  (throw 'elt-is-member list))
      (setq list (cdr list)))))
(and (memq 'v19 sc-emacs-features)
     (fset 'sc-member 'member))

(defun sc-ask (alist)
  "Ask a question in the minibuffer requiring a single character answer.
This function is kind of an extension of `y-or-n-p' where a single
letter is used to answer a question.  Question is formed from ALIST

(defun sc-mail-fetch-field (&optional attribs-p)
  "Insert a key and value into `sc-mail-info' alist.
If optional ATTRIBS-P is non-nil, the key/value pair is placed in
`sc-attributions' too."
  (if (string-match "^\\(\\S *\\)\\s *:\\s +\\(.*\\)$" curline)
      (let* ((key (downcase (sc-submatch 1 curline)))
	     (val (sc-submatch 2 curline))
	     (keyval (cons key val)))
	(setq sc-mail-info (cons keyval sc-mail-info))
	(if attribs-p
	    (setq sc-attributions (cons keyval sc-attributions)))
	))

(defun sc-mail-append-field ()
  "Append a continuation line onto the last fetched mail field's info."
  (let ((keyval (car sc-mail-info)))
    (if (and keyval (string-match "^\\s *\\(.*\\)$" curline))
	(setcdr keyval (concat (cdr keyval) " " (sc-submatch 1 curline)))))
  nil)

(defun sc-mail-error-in-mail-field ()
  "Issue warning that mail headers don't conform to RFC 822."
  (let* ((len (min (length curline) 10))

11556:a83ee7a1e0fd

  (if (memq 'v19 sc-emacs-features)
      ;; maybe future versions will take a `history' argument:
      (read-string prompt initial-contents)
    (read-string prompt initial-contents)))

(if (fboundp 'match-string)
    (defalias 'sc-submatch 'match-string)
  (defun sc-submatch (matchnum &optional string)
    "Returns `match-beginning' and `match-end' sub-expression for MATCHNUM.
If optional STRING is provided, take sub-expression using `substring'
of argument, otherwise use `buffer-substring' on current buffer.  Note
that `match-data' must have already been generated and no error
checking is performed by this function."
    (if string
	(substring string (match-beginning matchnum) (match-end matchnum))
      (buffer-substring (match-beginning matchnum) (match-end matchnum)))))

(if (fboundp 'member)
    (defalias 'sc-member 'member)
  (defun sc-member (elt list)
    "Like `memq', but uses `equal' instead of `eq'.
Emacs19 has a builtin function `member' which does exactly this."
    (catch 'elt-is-member
      (while list
	(if (equal elt (car list))
	    (throw 'elt-is-member list))
	(setq list (cdr list))))))

;; One day maybe Emacs will have this...
(if (fboundp 'string-text)
    (defalias 'sc-string-text 'string-text)
  (defun sc-string-text (string)
    "Return STRING with all text properties removed."
    (let ((string (copy-sequence string)))
      (set-text-properties 0 (length string) nil string)
      string)))

(defun sc-ask (alist)
  "Ask a question in the minibuffer requiring a single character answer.
This function is kind of an extension of `y-or-n-p' where a single
letter is used to answer a question.  Question is formed from ALIST

(defun sc-mail-fetch-field (&optional attribs-p)
  "Insert a key and value into `sc-mail-info' alist.
If optional ATTRIBS-P is non-nil, the key/value pair is placed in
`sc-attributions' too."
  (if (string-match "^\\(\\S *\\)\\s *:\\s +\\(.*\\)$" curline)
      (let* ((key (downcase (sc-string-text (sc-submatch 1 curline))))
	     (val (sc-string-text (sc-submatch 2 curline)))
	     (keyval (cons key val)))
	(setq sc-mail-info (cons keyval sc-mail-info))
	(if attribs-p
	    (setq sc-attributions (cons keyval sc-attributions)))
	))

(defun sc-mail-append-field ()
  "Append a continuation line onto the last fetched mail field's info."
  (let ((keyval (car sc-mail-info)))
    (if (and keyval (string-match "^\\s *\\(.*\\)$" curline))
	(setcdr keyval (concat (cdr keyval) " "
			       (sc-string-text (sc-submatch 1 curline))))))
  nil)

(defun sc-mail-error-in-mail-field ()
  "Issue warning that mail headers don't conform to RFC 822."
  (let* ((len (min (length curline) 10))