[mew-dist 23643] Re: format strings
Tatsuya Kinoshita
tats at example.com
2003年 5月 15日 (木) 08:30:07 JST
On August 30, 2001, [mew-dist 18612],
Kazu Yamamoto <kazu at example.com> wrote:
> minibuffer に表示されるメッセージやエラーのメッセージでは、
>
> * 大文字で始める (変数名とかが最初に来なければ)
> * 最後に "." は付けない。(複数文の場合は、最後の文には "." を付けない)
> * can't などの短縮形は使わない
>
> ように昨日統一しました。
On May 13, 2003, [mew-dist 23640],
Tatsuya Kinoshita <tats at example.com> wrote:
> (message
> + "To expand '%s', type '%c' then '%s'."
末尾の`.'は余計でした。そのほかの個所も見直してみました。
-- tats
This patch is written by Tatsuya Kinoshita. Copyright is disclaimed.
Index: mew-bq.el
===================================================================
RCS file: /cvsmew/mew/mew-bq.el,v
retrieving revision 1.29
diff -u -r1.29 mew-bq.el
--- mew-bq.el 2003/05/08 01:59:54 1.29
+++ mew-bq.el 2003/05/14 23:13:40
@@ -334,10 +334,10 @@
(throw 'quote nil))
((> c 127)
(mew-encode-error
- "Only ASCII is allowed in quoted-string in the header. ")))
+ "Only ASCII is allowed in quoted-string in the header")))
(setq I (1+ I))))
(if open
- (mew-encode-error "Quote string must be closed in the header. "))
+ (mew-encode-error "Quote string must be closed in the header"))
(mew-header-encode-cond ?a)
(setq i I))
;; end of quote
@@ -364,9 +364,9 @@
(setq i (1+ i))))
(if (and qp (eq status 'non-ascii))
(mew-encode-error
- "Only ASCII is allowed in quoted-string in the header. ")))
+ "Only ASCII is allowed in quoted-string in the header")))
(if open
- (mew-encode-error "Comment must be closed in the header. "))
+ (mew-encode-error "Comment must be closed in the header"))
(mew-header-encode-cond2 'comment)
(if (= i len)
()
@@ -393,19 +393,19 @@
(setq open nil)
(throw 'route nil))
((> c 127)
- (mew-encode-error "<> must contain ASCII only. "))
+ (mew-encode-error "<> must contain ASCII only"))
(t
(insert c)))
(setq i (1+ i))))
(if open
- (mew-encode-error "<> must be closed in the header. "))
+ (mew-encode-error "<> must be closed in the header"))
(if (= i len)
()
(insert ">")
(setq bound (1+ i)))
(setq status 'space))
((char-equal c ?>)
- (mew-encode-error "Unbalanced <> in the header. "))
+ (mew-encode-error "Unbalanced <> in the header"))
;; end of <>
;; group
@@ -424,7 +424,7 @@
(insert ":")
(setq i (1+ i))
(unless (char-equal (aref str i) ?\;)
- (mew-encode-error ": must be followed by ; in the header. "))
+ (mew-encode-error ": must be followed by ; in the header"))
(insert ";")
(setq bound (1+ i))
(setq status 'space))
@@ -671,7 +671,7 @@
(defun mew-header-decode-region (key rbeg rend &optional draftp)
"RFC 2047 decoding. This is liberal on the one point from RFC 2047.
-That is, each line may be more than 75. "
+That is, each line may be more than 75."
(setq key (capitalize key))
(let* ((type (mew-field-type-for-decoding key)) (nl "\0"))
(save-restriction
Index: mew-cache.el
===================================================================
RCS file: /cvsmew/mew/mew-cache.el,v
retrieving revision 1.20
diff -u -r1.20 mew-cache.el
--- mew-cache.el 2003/05/13 10:18:36 1.20
+++ mew-cache.el 2003/05/14 23:13:40
@@ -80,7 +80,7 @@
cache file time size ok)
(if (null entry)
(if must-hit
- (error "Cache not found.")
+ (error "Cache not found")
nil)
(setq cache (mew-cache-buffer-get entry))
(setq file (mew-expand-folder fld msg))
@@ -96,7 +96,7 @@
(mew-cache-sort entry)
cache)
(if must-hit
- (error "Cache not found.")
+ (error "Cache not found")
(mew-cache-delete2 fld msg)
nil)))))
Index: mew-complete.el
===================================================================
RCS file: /cvsmew/mew/mew-complete.el,v
retrieving revision 1.61
diff -u -r1.61 mew-complete.el
--- mew-complete.el 2003/05/13 11:00:12 1.61
+++ mew-complete.el 2003/05/14 23:13:41
@@ -533,7 +533,7 @@
(mew-complete-window-show all)
(if (and (mew-characterp EXPAND-CHAR) (funcall fhit cmp ALIST))
(message
- "To expand '%s', type '%c' then '%s'."
+ "To expand '%s', type '%c' then '%s'"
cmp EXPAND-CHAR
(substitute-command-keys
"\\<mew-draft-header-map>\\[mew-draft-header-comp]"))))
Index: mew-env.el
===================================================================
RCS file: /cvsmew/mew/mew-env.el,v
retrieving revision 1.35
diff -u -r1.35 mew-env.el
--- mew-env.el 2003/04/01 06:38:14 1.35
+++ mew-env.el 2003/05/14 23:13:41
@@ -17,7 +17,7 @@
requires PTY.")
(defvar mew-connection-type2 t
- "Connection type for processes that requires a password. ")
+ "Connection type for processes that requires a password.")
(defvar mew-connection-type-for-scan t
"Connection type for 'mewl' whose output speed is very fast.
Index: mew-exec.el
===================================================================
RCS file: /cvsmew/mew/mew-exec.el,v
retrieving revision 1.37
diff -u -r1.37 mew-exec.el
--- mew-exec.el 2003/04/09 12:31:40 1.37
+++ mew-exec.el 2003/05/14 23:13:42
@@ -265,7 +265,7 @@
(dst (cdr (mew-refile-get msg)))
func)
(if (not dst)
- (message "No message to be refiled here.")
+ (message "No message to be refiled here")
(setq func (lambda (num) (equal dst (cdr (mew-refile-get num)))))
(mew-summary-exec-region (point-min) (point-max) func))))))
Index: mew-header.el
===================================================================
RCS file: /cvsmew/mew/mew-header.el,v
retrieving revision 1.20
diff -u -r1.20 mew-header.el
--- mew-header.el 2003/05/08 01:59:54 1.20
+++ mew-header.el 2003/05/14 23:13:43
@@ -262,7 +262,7 @@
(throw 'max nil))
(when (and (integerp mew-header-max-depth)
(>= sep-cnt mew-header-max-depth))
- (mew-warn "Too many values. Truncate values over mew-header-max-depth.")
+ (mew-warn "Too many values. Truncate values over mew-header-max-depth")
(throw 'max nil))))
(defun mew-addrstr-parse-syntax-list (str sep addrp &optional depth)
Index: mew-mark.el
===================================================================
RCS file: /cvsmew/mew/mew-mark.el,v
retrieving revision 1.110
diff -u -r1.110 mew-mark.el
--- mew-mark.el 2003/03/14 03:56:05 1.110
+++ mew-mark.el 2003/05/14 23:13:44
@@ -404,7 +404,7 @@
(defun mew-summary-multi (&optional count)
"\\<mew-summary-mode-map>
Put the multi mark (default is '@') in COUNT times
-for '\\[mew-summary-multi-forward]', '\\[mew-summary-unshar]', '\\[mew-summary-uudecode]', '\\[mew-summary-burst-multi]'. "
+for '\\[mew-summary-multi-forward]', '\\[mew-summary-unshar]', '\\[mew-summary-uudecode]', '\\[mew-summary-burst-multi]'."
(interactive "P")
(mew-mark-put-mark-loop 'mew-summary-multi-one count nil))
@@ -580,7 +580,7 @@
(if (and (or (eq mew-mark-duplicated mew-mark-delete)
(eq mew-mark-duplicated mew-mark-unlink))
(eq mew-summary-mark-duplicated-skip nil))
- (message "Cannot mark because messages may lost by this setting.")
+ (message "Cannot mark because messages may lost by this setting")
(let ((reversep (eq mew-summary-mark-duplicated-skip 'last))
(count 0) my-id dup-id size ids beg end region)
(cond
Index: mew-pgp.el
===================================================================
RCS file: /cvsmew/mew/mew-pgp.el,v
retrieving revision 1.42
diff -u -r1.42 mew-pgp.el
--- mew-pgp.el 2003/01/16 11:03:31 1.42
+++ mew-pgp.el 2003/05/14 23:13:45
@@ -210,19 +210,19 @@
(defconst mew-pgp-err-seckey-or-secring 'mew-err-seckey-or-secring)
(defconst mew-pgp-err-other 'mew-err-other)
-(defvar mew-pgp-result-pass "Pass phrase is wrong.")
-(defvar mew-pgp-result-pubring "No public keyring.")
-(defvar mew-pgp-result-secring "No secret keyring.")
-(defvar mew-pgp-result-pubkey "No his/her public key.")
+(defvar mew-pgp-result-pass "Pass phrase is wrong")
+(defvar mew-pgp-result-pubring "No public keyring")
+(defvar mew-pgp-result-secring "No secret keyring")
+(defvar mew-pgp-result-pubkey "No his/her public key")
(defvar mew-pgp-result-invalid
- "His/her public key is invalid. Sign the key by yourself, first.")
-(defvar mew-pgp-result-seckey "No your secret key.")
+ "His/her public key is invalid. Sign the key by yourself, first")
+(defvar mew-pgp-result-seckey "No your secret key")
(defvar mew-pgp-result-seckey-or-secring
- "No secret keyring or no your secret key.")
-(defvar mew-pgp-result-other "PGP failed for some reasons.")
-(defvar mew-pgp-result-sec-succ "PGP decrypted. ")
-(defvar mew-pgp-result-dec-fail "PGP NOT decrypted for some reasons.")
-(defvar mew-pgp-result-unsup "PGP unsupported signature.")
+ "No secret keyring or no your secret key")
+(defvar mew-pgp-result-other "PGP failed for some reasons")
+(defvar mew-pgp-result-sec-succ "PGP decrypted")
+(defvar mew-pgp-result-dec-fail "PGP NOT decrypted for some reasons")
+(defvar mew-pgp-result-unsup "PGP unsupported signature")
(defvar mew-pgp-prompt-enter-pass "Enter pass phrase (%s): ")
(defvar mew-pgp-prompt-reenter-pass "Re-enter pass phrase (%s): ")
Index: mew-refile.el
===================================================================
RCS file: /cvsmew/mew/mew-refile.el,v
retrieving revision 1.89
diff -u -r1.89 mew-refile.el
--- mew-refile.el 2003/05/08 01:59:54 1.89
+++ mew-refile.el 2003/05/14 23:13:46
@@ -208,7 +208,7 @@
There are two special <key>s: @samp{nil} and @samp{t}. @samp{nil} is
used to specify <folder> to be returned when nothing is
guessed. @samp{t} can specify <folder> to be returned in addition to
-guessed values. "
+guessed values."
(let (key alist val f-or-r header ent ret)
(while rule
(setq key (car (car rule)))
Index: mew-smime.el
===================================================================
RCS file: /cvsmew/mew/mew-smime.el,v
retrieving revision 1.17
diff -u -r1.17 mew-smime.el
--- mew-smime.el 2003/02/04 03:32:14 1.17
+++ mew-smime.el 2003/05/14 23:13:47
@@ -37,7 +37,7 @@
((or (not mew-smime-additional-certificates)
(not (file-readable-p mew-smime-additional-certificates)))
"Please set mew-smime-additional-certificates")
- ((not (mew-which-exec "openssl")) "OpenSSL is not installed.")))
+ ((not (mew-which-exec "openssl")) "OpenSSL is not installed")))
(defun mew-smime-verify-configuration-check ()
(cond
@@ -46,7 +46,7 @@
((or (not mew-smime-pubkey-dir)
(not (file-directory-p mew-smime-pubkey-dir)))
"Please set mew-smime-pubkey-dir")
- ((not (mew-which-exec "openssl")) "OpenSSL is not installed.")))
+ ((not (mew-which-exec "openssl")) "OpenSSL is not installed")))
;; internal variables
(defvar mew-smime-running nil)
@@ -240,9 +240,9 @@
"-outform" "DER"
"-in" file1 "-out" encrypt-file) pubkey-list)))
(list encrypt-file nil)
- (list encrypt-file "openssl exited abnormally."))
+ (list encrypt-file "OpenSSL exited abnormally"))
;; XXX Is this English correct??
- (list nil "Not all public keys of reciepients are available.")))))
+ (list nil "Not all public keys of reciepients are available")))))
(defun mew-smime-sign-message ()
"Sign the entire draft with S/MIME. Input your passphrase."
Index: mew-ssh.el
===================================================================
RCS file: /cvsmew/mew/mew-ssh.el,v
retrieving revision 1.29
diff -u -r1.29 mew-ssh.el
--- mew-ssh.el 2003/02/04 03:32:14 1.29
+++ mew-ssh.el 2003/05/14 23:13:47
@@ -74,7 +74,7 @@
"Open SSH stream for SERVER's SERV via SSHSERVER.
This function returns a process when an SSH connection is created
successfully. A local port number can be obtained the process name
-after ':'. "
+after ':'."
(cond
((not (and (stringp server) (stringp serv) (stringp sshserver)))
())
Index: mew-ssl.el
===================================================================
RCS file: /cvsmew/mew/mew-ssl.el,v
retrieving revision 1.14
diff -u -r1.14 mew-ssl.el
--- mew-ssl.el 2003/02/04 03:32:14 1.14
+++ mew-ssl.el 2003/05/14 23:13:47
@@ -22,7 +22,7 @@
connection is not created. If not present, an SSL connection is
not created.
3 - verify server's certificate which locally installed (not one from
- the server). ")
+ the server).")
(defvar mew-prog-ssl-arg nil) ;; xxx what about v4?
@@ -91,7 +91,7 @@
"Open SSL stream for SERVER's SERV.
This function returns a process when an SSL connection is created
successfully. A local port number can be obtained the process name
-after ':'. "
+after ':'."
(cond
((not (and (stringp server) (stringp serv)))
())
Index: mew-summary4.el
===================================================================
RCS file: /cvsmew/mew/mew-summary4.el,v
retrieving revision 1.91
diff -u -r1.91 mew-summary4.el
--- mew-summary4.el 2003/05/13 10:18:37 1.91
+++ mew-summary4.el 2003/05/14 23:13:48
@@ -90,7 +90,7 @@
(if (mew-virtual-thread-p folder)
(if (mew-thread-cache-valid-p folder)
(mew-summary-switch-to-folder folder)
- (message "%s is old. " folder))
+ (message "%s is old" folder))
(mew-summary-switch-to-folder folder))
(message "No such virtual folder: %s" folder)))
(t ;; local/remote folders
@@ -223,7 +223,7 @@
(if (mew-virtual-thread-p folder)
(if (mew-thread-cache-valid-p folder)
(setq getback t)
- (message "%s is old. " folder))
+ (message "%s is old" folder))
(setq getback t)))
(t
(setq getback t)))
Index: mew-thread.el
===================================================================
RCS file: /cvsmew/mew/mew-thread.el,v
retrieving revision 1.98
diff -u -r1.98 mew-thread.el
--- mew-thread.el 2003/04/23 09:16:13 1.98
+++ mew-thread.el 2003/05/14 23:13:50
@@ -145,7 +145,7 @@
(= (string-width idt2) (string-width idt3))
(= (string-width idt3) (string-width idt4)))
(error
- "All members of mew-thread-indent-strings must have the same length."))
+ "All members of mew-thread-indent-strings must have the same length"))
(setq mew-thread-indent-width (string-width idt1))
(setq mew-thread-indent-length (length idt1))))
Index: mew-vars.el
===================================================================
RCS file: /cvsmew/mew/mew-vars.el,v
retrieving revision 1.189
diff -u -r1.189 mew-vars.el
--- mew-vars.el 2003/05/10 00:46:14 1.189
+++ mew-vars.el 2003/05/14 23:13:53
@@ -570,7 +570,7 @@
;;;
(defcustom mew-mbox-command "incm"
- "*A command to be execute if 'mew-mailbox-type' is 'mbox. "
+ "*A command to be execute if 'mew-mailbox-type' is 'mbox."
:group 'mew-pop
:type '(choice string (const nil)))
@@ -657,7 +657,7 @@
(defcustom mew-pop-size (* 54 1024) ;; 4K hdr + 50K bdy
"*The limit size of messages to be retrieved by POP. The default is
55296 byte. 0 means unlimited, so you can get all messages from the
-POP server. "
+POP server."
:group 'mew-pop
:type 'integer)
@@ -736,7 +736,7 @@
(defcustom mew-imap-size (* 54 1024) ;; 4K hdr + 50K bdy
"*The limit size of messages to be retrieved by IMAP. The default is
55296 byte. 0 means unlimited, so you can get all messages from the
-IMAP server. "
+IMAP server."
:group 'mew-imap
:type 'integer)
@@ -794,7 +794,7 @@
(defcustom mew-nntp-size (* 54 1024) ;; 4K hdr + 50K bdy
"*The limit size of messages to be retrieved by NNTP. The default is
55296 byte. 0 means unlimited, so you can get all messages from the
-NNTP server. "
+NNTP server."
:group 'mew-nntp
:type 'integer)
@@ -1326,7 +1326,7 @@
:type 'boolean)
(defcustom mew-use-other-frame-for-draft nil
- "*If non-nil, a new frame is created when a draft is prepared. "
+ "*If non-nil, a new frame is created when a draft is prepared."
:group 'mew-env
:type 'boolean)
@@ -1386,7 +1386,7 @@
To use this feature, 'mew-use-cached-passwd' should be 't'.
If you want to use the biff functionality against a local mailbox, use
-'display-time-mode' instead. "
+'display-time-mode' instead."
:group 'mew-env
:type 'boolean)
@@ -2043,7 +2043,7 @@
"*Regular expression used in 'mew-dir-list-with-link-count'
and 'mew-dir-list-without-link-count' to list up folder
candidates. The default value \"^[^.0-9]\\|^[0-9].*[^0-9]\" lists up
-folders whose name is alphabet only. "
+folders whose name is alphabet only."
:group 'mew-env
:type 'regexp)
@@ -2381,7 +2381,7 @@
(defcustom mew-cursor-mark ">"
"*The mark in the beginning of the cursor line if
-'mew-use-cursor-mark' is *non-nil*. "
+'mew-use-cursor-mark' is *non-nil*."
:group 'mew-highlight
:type '(choice string (const nil)))
@@ -2495,7 +2495,7 @@
Currently, 'pgp-signature, 'pgp-encryption, 'pgp-signature-encryption,
'pgp-encryption-signature, and nil are available. Since signature
does not require receiver's public key, signature service may be
-appropriate for this value. "
+appropriate for this value."
:group 'mew-privacy
:type '(choice (const pgp-signature)
(const pgp-encryption)
@@ -2517,7 +2517,7 @@
"*A type of privacy protection for drafts replying encrypted
messages. Currently, 'pgp-signature, 'pgp-encryption,
'pgp-signature-encryption, 'pgp-encryption-signature,
-and nil are available. "
+and nil are available."
:group 'mew-privacy
:type '(choice (const pgp-signature)
(const pgp-encryption)
Index: mew-vars2.el
===================================================================
RCS file: /cvsmew/mew/mew-vars2.el,v
retrieving revision 1.104
diff -u -r1.104 mew-vars2.el
--- mew-vars2.el 2003/04/11 04:19:59 1.104
+++ mew-vars2.el 2003/05/14 23:13:54
@@ -78,7 +78,7 @@
(cons mew-was-regex nil)) ;; regexp
"*Replacement alist to simplify Subject: field body
Each element is cons cell whos car is REGEXP to replace,
-cdr is new text. ")
+cdr is new text.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
Index: mew.el
===================================================================
RCS file: /cvsmew/mew/mew.el,v
retrieving revision 1.188
diff -u -r1.188 mew.el
--- mew.el 2003/04/10 03:37:24 1.188
+++ mew.el 2003/05/14 23:13:55
@@ -186,7 +186,7 @@
(set-buffer-modified-p nil)
(setq buffer-read-only t)
;; cause an error again
- (error "Mew found some errors above.")))))
+ (error "Mew found some errors above")))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
@@ -214,7 +214,7 @@
also updated in addition to that of Addrbook.
If executed with '1', information about local folders is updated.
If executed with '2', information about newsgroups is updated.
-If executed with '3', information about IMAP folders is updated. "
+If executed with '3', information about IMAP folders is updated."
(interactive "P")
(message "Updating status...")
(cond
@@ -476,7 +476,7 @@
(defun mew-temp-dir-init ()
"Setting temporary directory for Mew.
mew-temp-file must be local and readable for the user only
-for privacy/speed reasons. "
+for privacy/speed reasons."
(setq mew-temp-dir (make-temp-name mew-temp-file-initial))
(mew-make-directory mew-temp-dir)
(set-file-modes mew-temp-dir mew-folder-mode)
Mew-dist メーリングリストの案内