summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/footnote.el8
-rw-r--r--lisp/mail/mail-hist.el8
-rw-r--r--lisp/mail/mail-utils.el6
-rw-r--r--lisp/mail/mailalias.el4
-rw-r--r--lisp/mail/metamail.el8
-rw-r--r--lisp/mail/mspools.el26
-rw-r--r--lisp/mail/rfc2368.el6
-rw-r--r--lisp/mail/rfc822.el4
-rw-r--r--lisp/mail/rmailsort.el2
-rw-r--r--lisp/mail/rmailsum.el18
-rw-r--r--lisp/mail/sendmail.el8
-rw-r--r--lisp/mail/smtpmail.el2
-rw-r--r--lisp/mail/supercite.el16
-rw-r--r--lisp/mail/uce.el24
14 files changed, 70 insertions, 70 deletions
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 8cf12b82262..b4e8d20c4ef 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -161,7 +161,7 @@ Wrapping around the alphabet implies successive repetitions of letters."
(setq rc (concat rc chr))
(setq rep (1- rep)))
rc))
-
+
;;; ENGLISH LOWER
(defconst footnote-english-lower "abcdefghijklmnopqrstuvwxyz"
"Lower case English alphabet.")
@@ -482,7 +482,7 @@ styles."
(Footnote-goto-char-point-max)
(if (re-search-backward (concat "^" footnote-section-tag-regexp) nil t)
(save-restriction
- (when footnote-narrow-to-footnotes-when-editing
+ (when footnote-narrow-to-footnotes-when-editing
(Footnote-narrow-to-footnotes))
(Footnote-goto-footnote (1- arg)) ; evil, FIXME (less evil now)
;; (message "Inserting footnote %d" arg)
@@ -554,9 +554,9 @@ Return nil if the cursor is not over a footnote."
(unless rc
(setq rc (car alist-ptr)))
(save-excursion
- (message "Renumbering from %s to %s"
+ (message "Renumbering from %s to %s"
(Footnote-index-to-string (car alist-ptr))
- (Footnote-index-to-string
+ (Footnote-index-to-string
(1+ (car alist-ptr))))
(Footnote-renumber (car alist-ptr)
(1+ (car alist-ptr))
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index 3814d583641..da27b726efa 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -122,7 +122,7 @@ the message."
(defsubst mail-hist-forward-header (count)
"Move forward COUNT headers (backward if COUNT is negative).
If last/first header is encountered first, stop there and returns
-nil.
+nil.
Places point on the first non-whitespace on the line following the
colon after the header name, or on the second space following that if
@@ -212,11 +212,11 @@ Optional argument CONTENTS is a string which will be the contents
;;;###autoload
(defun mail-hist-put-headers-into-history ()
- "Put headers and contents of this message into mail header history.
+ "Put headers and contents of this message into mail header history.
Each header has its own independent history, as does the body of the
message.
-This function normally would be called when the message is sent."
+This function normally would be called when the message is sent."
(and
mail-hist-keep-history
(save-excursion
@@ -260,7 +260,7 @@ This function normally would be called when the message is sent."
;; bottom is often just the same quoted history for every
;; message in the thread, differing only in indentation
;; level.
- (if (string-equal header "body")
+ (if (string-equal header "body")
(goto-char start)))
))))
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index db31f3d4064..42be6b57040 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -32,7 +32,7 @@
;;; We require lisp-mode to make sure that lisp-mode-syntax-table has
;;; been initialized.
(require 'lisp-mode)
-
+
;;;###autoload
(defcustom mail-use-rfc822 nil "\
*If non-nil, use a full, hairy RFC822 parser on mail addresses.
@@ -166,7 +166,7 @@ Return a modified address list."
(setq address (buffer-string))
(erase-buffer))
;; Strip non-nested comments an easier way.
- (while (setq pos (string-match
+ (while (setq pos (string-match
;; This doesn't hack rfc822 nested comments
;; `(xyzzy (foo) whinge)' properly. Big deal.
"[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*)"
@@ -240,7 +240,7 @@ the comma-separated list. The pruned list is returned."
(naked-address (mail-strip-quoted-names address)))
(if (string-match rmail-dont-reply-to-names naked-address)
(setq destinations (concat (substring destinations 0 start-pos)
- (and cur-pos (substring destinations
+ (and cur-pos (substring destinations
(1+ cur-pos))))
cur-pos start-pos)
(setq cur-pos (and cur-pos (1+ cur-pos))
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index caef6bd670d..0e22538011c 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -302,7 +302,7 @@ By default, this is the file specified by `mail-personal-alias-file'."
This means that sending a message to NAME will actually send to DEFINITION.
Normally, the addresses in DEFINITION must be separated by commas.
-If FROM-MAILRC-FILE is non-nil, then addresses in DEFINITION
+If FROM-MAILRC-FILE is non-nil, then addresses in DEFINITION
can be separated by spaces; an address can contain spaces
if it is quoted with double-quotes."
@@ -352,7 +352,7 @@ if it is quoted with double-quotes."
(if convert-backslash
(while (string-match "[\\]" temp pos)
(setq temp (replace-match "" t t temp))
- (if start
+ (if start
(setq start (1- start)))
(setq pos (match-end 0))))
(setq result (cons temp result))))
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 9c0b806bfca..7cfc4312a79 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -3,7 +3,7 @@
;; Copyright (C) 1993, 1996 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Version: $Id: metamail.el,v 1.13 1999/10/15 15:45:02 monnier Exp $
+;; Version: $Id: metamail.el,v 1.14 2000/11/12 00:22:02 fx Exp $
;; Keywords: mail, news, mime, multimedia
;; This file is part of GNU Emacs.
@@ -111,9 +111,9 @@ Its header part is not interpreted at all."
;; Find Content-Type and Content-Transfer-Encoding from the header.
(save-restriction
(narrow-to-region (point-min) end)
- (setq contype
+ (setq contype
(or (mail-fetch-field "Content-Type") "text/plain"))
- (setq encoding
+ (setq encoding
(or (mail-fetch-field "Content-Transfer-Encoding") "7bit")))
;; Interpret the body part only.
(let ((metamail-switches ;Process body part only.
@@ -153,7 +153,7 @@ redisplayed as output is inserted."
(buffer-read-only nil)
(metafile (make-temp-file "metamail"))
(option-environment
- (list (format "EMACS_VIEW_MODE=%d"
+ (list (format "EMACS_VIEW_MODE=%d"
(if (numberp viewmode) viewmode 1)))))
(save-excursion
;; Gee! Metamail does not ouput to stdout if input comes from
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index f7527fa186b..1f8651727ec 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -196,7 +196,7 @@ your primary spool is. If this fails, set it to something like
mspools-vm-system-mail ; your mailbox
vm-crash-box ;crash for mailbox
))
-
+
;; Mailing list inboxes
;; must have VM already loaded to get vm-folder-directory.
(mapcar '(lambda (s)
@@ -206,8 +206,8 @@ your primary spool is. If this fails, set it to something like
(concat mspools-folder-directory s "." mspools-suffix)
(concat mspools-folder-directory s ".crash")))
;; So I create a vm-spool-files entry for each of those mail drops
- (mapcar 'file-name-sans-extension
- (directory-files mspools-folder-directory nil
+ (mapcar 'file-name-sans-extension
+ (directory-files mspools-folder-directory nil
(format "^[^.]+\\.%s" mspools-suffix)))
))
))
@@ -225,14 +225,14 @@ Buffer is not displayed if SHOW is non-nil."
(delete-region (point-min) (point-max)))
;; else buffer doesn't exist so create it
(get-buffer-create mspools-buffer))
-
+
;; generate the list of spool files
(if mspools-using-vm
(mspools-set-vm-spool-files))
-
+
(mspools-get-spool-files)
(if (not noshow) (pop-to-buffer mspools-buffer))
-
+
(setq buffer-read-only t)
(mspools-mode)
)
@@ -244,9 +244,9 @@ Buffer is not displayed if SHOW is non-nil."
(setq spool-name (mspools-get-spool-name))
(if (null spool-name)
(message "No spool on current line")
-
+
(setq folder-name (mspools-get-folder-from-spool spool-name))
-
+
;; put in a little "*" to indicate spool file has been read.
(if (not mspools-update)
(save-excursion
@@ -266,7 +266,7 @@ Buffer is not displayed if SHOW is non-nil."
(next-line (- 1 mspools-files-len)) ;back to top of list
;; else just on to next line
(next-line 1))
-
+
;; Choose whether to use VM or RMAIL for reading folder.
(if mspools-using-vm
(vm-visit-folder (concat mspools-folder-directory folder-name))
@@ -275,8 +275,8 @@ Buffer is not displayed if SHOW is non-nil."
(setq rmail-inbox-list
(list (concat mspools-folder-directory spool-name)))
(rmail-get-new-mail))
-
-
+
+
(if mspools-update
;; generate new list of spools.
(save-excursion
@@ -313,7 +313,7 @@ Buffer is not displayed if SHOW is non-nil."
(if mspools-mode-map
()
(setq mspools-mode-map (make-sparse-keymap))
-
+
(define-key mspools-mode-map "\C-c\C-c" 'mspools-visit-spool)
(define-key mspools-mode-map "\C-m" 'mspools-visit-spool)
(define-key mspools-mode-map " " 'mspools-visit-spool)
@@ -334,7 +334,7 @@ Buffer is not displayed if SHOW is non-nil."
nil."
(interactive)
(mspools-show noshow))
-
+
(defun mspools-help ()
"Show help for `mspools-mode'."
(interactive)
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index b0d2a23b90b..25456523657 100644
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -125,7 +125,7 @@ calling this function."
(setq prequery
(match-string rfc2368-mailto-prequery-index mailto-url))
-
+
(setq query
(match-string rfc2368-mailto-query-index mailto-url))
@@ -154,9 +154,9 @@ calling this function."
(setcdr our-cons-cell (concat our-cdr ", " prequery)))
(setq headers-alist
(cons (cons "To" prequery) headers-alist)))))
-
+
headers-alist)
-
+
(error "Failed to match a mailto: url"))
))
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 633a2e2417e..7c32b251bf9 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -26,7 +26,7 @@
;;; Commentary:
;; Support functions for parsing RFC-822 headers, used by mail and news
-;; modes.
+;; modes.
;;; Code:
@@ -269,7 +269,7 @@
(t
(rfc822-bad-address "Strange character or missing comma")))))))
-
+
(defun rfc822-addresses (header-text)
(if (string-match "\\`[ \t]*\\([^][\000-\037 ()<>@,;:\\\".]+\\)[ \t]*\\'"
header-text)
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 8e00f3e4d55..c4e95c80541 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -133,7 +133,7 @@ KEYWORDS is a comma-separated list of labels."
(setq labels (concat (substring labels (match-beginning 0)) ","))
(let (labelvec)
(while (string-match "[ \t]*,[ \t]*" labels)
- (setq labelvec (cons
+ (setq labelvec (cons
(concat ", ?\\("
(substring labels 0 (match-beginning 0))
"\\),")
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 86324242d45..6431180845f 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -119,7 +119,7 @@ Emacs will list the header line in the RMAIL-summary."
(defun rmail-summary-by-topic (subject &optional whole-message)
"Display a summary of all messages with the given SUBJECT.
Normally checks the Subject field of headers;
-but if WHOLE-MESSAGE is non-nil (prefix arg given),
+but if WHOLE-MESSAGE is non-nil (prefix arg given),
look in the whole message.
SUBJECT is a string of regexps separated by commas."
(interactive "sTopics to summarize by: \nP")
@@ -412,8 +412,8 @@ Setting this variable has an effect only before reading a mail."
(skip-chars-backward " \t")
(point)))))
len mch lo)
- (if (string-match
- (or rmail-user-mail-address-regexp
+ (if (string-match
+ (or rmail-user-mail-address-regexp
(concat "^\\("
(regexp-quote (user-login-name))
"\\($\\|@\\)\\|"
@@ -1499,12 +1499,12 @@ starting with the current one. Deleted messages are skipped and don't count."
(list (rmail-output-read-rmail-file-name)
(prefix-numeric-value current-prefix-arg))))
(let ((i 0) prev-msg)
- (while
+ (while
(and (< i n)
(progn (rmail-summary-goto-msg)
(not (eq prev-msg
(setq prev-msg
- (with-current-buffer rmail-buffer
+ (with-current-buffer rmail-buffer
rmail-current-message))))))
(setq i (1+ i))
(with-current-buffer rmail-buffer
@@ -1559,13 +1559,13 @@ The variables `rmail-secondary-file-directory' and
(if files
(progn
(define-key rmail-summary-mode-map [menu-bar classify input-menu]
- (cons "Input Rmail File"
- (rmail-list-to-menu "Input Rmail File"
+ (cons "Input Rmail File"
+ (rmail-list-to-menu "Input Rmail File"
files
'rmail-summary-input)))
(define-key rmail-summary-mode-map [menu-bar classify output-menu]
- (cons "Output Rmail File"
- (rmail-list-to-menu "Output Rmail File"
+ (cons "Output Rmail File"
+ (rmail-list-to-menu "Output Rmail File"
files
'rmail-summary-output-to-rmail-file))))
(define-key rmail-summary-mode-map [menu-bar classify input-menu]
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index a7a65302efd..40ef9e87228 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -575,7 +575,7 @@ If within the headers, this makes the new lines into continuation lines."
(defun mail-mode-fill-paragraph (arg)
;; Do something special only if within the headers.
(if (< (point) (mail-header-end))
- (let (beg end fieldname)
+ (let (beg end fieldname)
(when (prog1 (re-search-backward "^[-a-zA-Z]+:" nil 'yes)
(setq beg (point)))
(setq fieldname
@@ -944,7 +944,7 @@ external program defined by `sendmail-program'."
;; ... then undo escaping of matching parentheses,
;; including matching nested parentheses.
(goto-char fullname-start)
- (while (re-search-forward
+ (while (re-search-forward
"\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)"
fullname-end 1)
(replace-match "\\1(\\3)" t)
@@ -992,7 +992,7 @@ external program defined by `sendmail-program'."
delimline t))
(let* ((default-directory "/")
(coding-system-for-write selected-coding)
- (args
+ (args
(append (list (point-min) (point-max)
program
nil errbuf nil "-oi")
@@ -1230,7 +1230,7 @@ external program defined by `sendmail-program'."
(mail-position-on-field "to"))
(insert "\nFCC: " folder))
-(defun mail-reply-to ()
+(defun mail-reply-to ()
"Move point to end of Reply-To-field. Create a Reply-To field if none."
(interactive)
(expand-abbrev)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 17b02e3d6f9..17f1f6d43c1 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -696,7 +696,7 @@ This is relative to `smtpmail-queue-dir'.")
envelope-from
size-part
body-part))
-
+
(if (or (null (car (setq response-code (smtpmail-read-response process))))
(not (integerp (car response-code)))
(>= (car response-code) 400))
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index eadfa1430c3..df4bb4e3ff6 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -250,7 +250,7 @@ nil -- do not cite the region at all
the number of lines in the region is greater than this
value, a warning message will be printed and the region
will not be cited. Lines in region are counted with
- `count-lines'.
+ `count-lines'.
The gathering of attribution information is not affected by the value
of this variable. The number of lines in the region is calculated
@@ -595,7 +595,7 @@ If this is nil, Supercite keymap is not installed.")
(define-key sc-mode-map "\C-b" 'sc-submit-bug-report)
(define-key sc-mode-map "?" 'sc-describe)
)
-
+
(defvar sc-electric-mode-map ()
"Keymap for `sc-electric-mode' electric references mode.")
(if sc-electric-mode-map
@@ -1152,7 +1152,7 @@ supplied, is used instead of the line point is on in the current buffer."
This populates the `sc-attributions' with the list of possible attributions."
(if (and (stringp from)
(< 0 (length from)))
- (let* ((sc-mumble "")
+ (let* ((sc-mumble "")
(namestring (sc-attribs-extract-namestring from))
(namelist (sc-attribs-filter-namelist
(sc-attribs-chop-namestring namestring)))
@@ -1164,7 +1164,7 @@ This populates the `sc-attributions' with the list of possible attributions."
(emailname (sc-attribs-emailname from))
(n 1)
author middlenames)
-
+
;; put basic information
(setq
;; put middle names and build sc-author entry
@@ -1342,7 +1342,7 @@ to the auto-selected attribution string."
(setq citation choice
attribution (or (sc-guess-attribution citation)
citation))
-
+
(setq citation (sc-make-citation choice)
attribution choice))
))
@@ -1543,7 +1543,7 @@ First runs `sc-pre-uncite-hook'."
sc-default-uncite-frame)))
(run-hooks 'sc-pre-uncite-hook)
(regi-interpret frame start end)))
-
+
(defun sc-recite-region (start end)
"Recite a region delineated by START and END.
First runs `sc-pre-recite-hook'."
@@ -1702,7 +1702,7 @@ error occurs."
(progn
(eval ref)
(let ((lines (count-lines (point-min) (point-max))))
- (or nomsg (message "Ref header %d [%d line%s]: %s"
+ (or nomsg (message "Ref header %d [%d line%s]: %s"
sc-eref-style lines
(if (= lines 1) "" "s")
ref))))
@@ -2020,7 +2020,7 @@ before, and `sc-post-hook' is run after the guts of this function."
(mark-active t) ; for Emacs
(point (point-marker))
(mark (copy-marker (mark-marker))))
-
+
;; make sure point comes before mark, not all functions are
;; interactive "r"
(if (< mark point)
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 722ef28aa0c..93b3e430e7a 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -117,7 +117,7 @@
(require 'sendmail)
;; Those sections of code which are dependent upon
;; RMAIL are only evaluated if we have received a message with RMAIL...
-;;(require 'rmail)
+;;(require 'rmail)
(defgroup uce nil
"Facilitate reply to unsolicited commercial email."
@@ -137,7 +137,7 @@ This hook is run after `mail-setup-hook', which is run as well."
:type 'hook
:group 'uce)
-(defcustom uce-message-text
+(defcustom uce-message-text
"Recently, I have received an Unsolicited Commercial E-mail from you.
I do not like UCE's and I would like to inform you that sending
unsolicited messages to someone while he or she may have to pay for
@@ -148,8 +148,8 @@ If you think that this is a good way to advertise your products or
services you are mistaken. Spamming will only make people hate you, not
buy from you.
-If you have any list of people you send unsolicited commercial emails to,
-REMOVE me from such list immediately. I suggest that you make this list
+If you have any list of people you send unsolicited commercial emails to,
+REMOVE me from such list immediately. I suggest that you make this list
just empty.
----------------------------------------------------
@@ -192,7 +192,7 @@ Value nil means use no separator."
:group 'uce)
(defcustom uce-signature mail-signature
-"Text to put as your signature after the note to UCE sender.
+"Text to put as your signature after the note to UCE sender.
Value nil means none, t means insert `~/.signature' file (if it happens
to exist), if this variable is a string this string will be inserted
as your signature."
@@ -221,7 +221,7 @@ address, and postmaster of the mail relay used."
(let ((message-buffer
(cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
((eq uce-mail-reader 'rmail) "RMAIL")
- (t (error
+ (t (error
"Variable uce-mail-reader set to unrecognized value"))))
(full-header-p (and (eq uce-mail-reader 'rmail)
(not (rmail-msg-is-pruned)))))
@@ -246,7 +246,7 @@ address, and postmaster of the mail relay used."
end-of-hostname (string-match "[ ,>]" to first-at-sign)
sender-host (substring to first-at-sign end-of-hostname))
(if (string-match "\\." sender-host)
- (setq to (format "%s, postmaster%s, abuse%s"
+ (setq to (format "%s, postmaster%s, abuse%s"
to sender-host sender-host))))
(setq mail-send-actions nil)
(setq mail-reply-buffer nil)
@@ -258,7 +258,7 @@ address, and postmaster of the mail relay used."
(rmail-toggle-header 1)
(widen)
(rmail-maybe-set-message-counters)
- (copy-region-as-kill (rmail-msgbeg rmail-current-message)
+ (copy-region-as-kill (rmail-msgbeg rmail-current-message)
(rmail-msgend rmail-current-message))))))
;; Restore the pruned header state we found.
(if full-header-p
@@ -286,7 +286,7 @@ address, and postmaster of the mail relay used."
(beginning-of-buffer)
(search-forward "*** EOOH ***\n")
(beginning-of-line)
- (forward-line -1)))
+ (forward-line -1)))
(re-search-backward "^Received:")
(beginning-of-line)
;; Is this always good? It's the only thing I saw when I checked
@@ -304,7 +304,7 @@ address, and postmaster of the mail relay used."
(forward-char -1)
;; And add its postmaster to the list of addresses.
(if (string-match "\\." (buffer-substring temp (point)))
- (setq to (format "%s, postmaster@%s"
+ (setq to (format "%s, postmaster@%s"
to (buffer-substring temp (point)))))
;; Also look at the message-id, it helps *very* often.
(if (and (search-forward "\nMessage-Id: " nil t)
@@ -320,7 +320,7 @@ address, and postmaster of the mail relay used."
(search-forward ">")
(forward-char -1)
(if (string-match "\\." (buffer-substring temp (point)))
- (setq to (format "%s, postmaster@%s"
+ (setq to (format "%s, postmaster@%s"
to (buffer-substring temp (point)))))))
(cond ((eq uce-mail-reader 'gnus)
;; Does Gnus always have Lines: in the end?
@@ -384,7 +384,7 @@ address, and postmaster of the mail relay used."
;; might be to set up special key bindings, replace standart
;; functions in mail-mode, etc.
(run-hooks 'mail-setup-hook 'uce-setup-hook))))
-
+
(defun uce-insert-ranting (&optional ignored)
"Insert text of the usual reply to UCE into current buffer."
(interactive "P")
View Lorry Controller Status