From: kaoru Date: Tue, 31 Aug 2010 11:56:33 +0000 (+0000) Subject: * wl-addrbook.el: Delete traing whitespace. X-Git-Tag: merged-trunk-to-elmo-imap4-compliance-1^2~4 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad53866b9dc2027a3badf6be4691e7320479eda0;p=elisp%2Fwanderlust.git * wl-addrbook.el: Delete traing whitespace. * wl-complete.el: Ditto. * rfc2368.el: Ditto. * ssl.el: Ditto. --- diff --git a/utils/ChangeLog b/utils/ChangeLog index 9e25604..7870f05 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,10 @@ +2010-08-31 TAKAHASHI Kaoru + + * wl-addrbook.el: Delete traing whitespace. + * wl-complete.el: Ditto. + * rfc2368.el: Ditto. + * ssl.el: Ditto. + 2010-08-24 TAKAHASHI Kaoru * ptexinfmt.el (texinfo-format-verb): Use (delete-char -1) diff --git a/utils/rfc2368.el b/utils/rfc2368.el index abca6ed..a2ab61e 100644 --- a/utils/rfc2368.el +++ b/utils/rfc2368.el @@ -89,7 +89,7 @@ ((match-beginning 1) "\n") (t " ")) buf) - (setq start (match-end 0))) + (setq start (match-end 0))) (apply 'concat (nreverse (cons (substring string start) buf))))) (defun rfc2368-parse-mailto-url (mailto-url) diff --git a/utils/ssl.el b/utils/ssl.el index 1bf399a..7006955 100644 --- a/utils/ssl.el +++ b/utils/ssl.el @@ -38,13 +38,13 @@ ;; We have the old custom-library, hack around it! (defmacro defgroup (&rest args) nil) - (defmacro defcustom (var value doc &rest args) + (defmacro defcustom (var value doc &rest args) `(devar ,var ,value ,doc)))) (defgroup ssl nil "Support for `Secure Sockets Layer' encryption." :group 'comm) - + (defcustom ssl-certificate-directory "~/.w3/certs/" "*Directory to store CA certificates in" :group 'ssl @@ -134,7 +134,7 @@ to." (while (re-search-forward "^\\([^=\n\r]+\\)\\s *=\\s *\\(.*\\)" nil t) (push (cons (match-string 1) (match-string 2)) vals)) vals))))) - + (defun ssl-accept-ca-certificate () "Ask if the user is willing to accept a new CA certificate. The buffer-name should be the intended name of the certificate, and the buffer should probably @@ -143,10 +143,10 @@ be in DER encoding" (let* ((process-connection-type nil) (tmpbuf (generate-new-buffer "X509 CA Certificate Information")) (response (save-excursion - (and (eq 0 + (and (eq 0 (apply 'call-process-region - (point-min) (point-max) - ssl-view-certificate-program-name + (point-min) (point-max) + ssl-view-certificate-program-name nil tmpbuf t ssl-view-certificate-program-arguments)) (switch-to-buffer tmpbuf) diff --git a/utils/wl-addrbook.el b/utils/wl-addrbook.el index 952dc84..e03b94b 100644 --- a/utils/wl-addrbook.el +++ b/utils/wl-addrbook.el @@ -26,7 +26,7 @@ "*Regular expression for \".im/Addrbook\".") (defvar wl-addrbook-override-by-newone t "If non-nil, the 'user' entry in 'wl-alias-auto-alist' -is override by a new entry of (user different-address). +is override by a new entry of (user different-address). This means that addresses in To: and Cc: in Draft mode are always learned with an exception 'user' is defined in Addrbook. If nil, the old 'user' entry remains.") @@ -242,7 +242,7 @@ If addresses is a string, expands it recursively." (setq wl-alias-auto-alist (cons (list user addr) (delete match-auto wl-alias-auto-alist)))) - (t + (t ;; the old entry remains ))) (match-adbk @@ -365,7 +365,7 @@ If addresses is a string, expands it recursively." (defun wl-draft-learn-alias () (interactive) - (let ((recipients (mapconcat 'identity + (let ((recipients (mapconcat 'identity (delq nil (std11-field-bodies '("To" "Cc"))) ","))) (mapcar '(lambda (addr) @@ -502,7 +502,7 @@ The keys that are defined for this mode are: (set-buffer buf) (goto-char (point-min)) (if (and shortname - (re-search-forward + (re-search-forward (concat "^" (regexp-quote shortname) "[ \t]*:?[ \t]+") nil t)) (setq not-uniq t)) (if not-uniq @@ -568,7 +568,7 @@ The keys that are defined for this mode are: ;; Redistribution and use in source and binary forms, with or without ;; modification, are permitted provided that the following conditions ;; are met: -;; +;; ;; 1. Redistributions of source code must retain the above copyright ;; notice, this list of conditions and the following disclaimer. ;; 2. Redistributions in binary form must reproduce the above copyright @@ -577,7 +577,7 @@ The keys that are defined for this mode are: ;; 3. Neither the name of the team nor the names of its contributors ;; may be used to endorse or promote products derived from this software ;; without specific prior written permission. -;; +;; ;; THIS SOFTWARE IS PROVIDED BY THE TEAM AND CONTRIBUTORS ``AS IS'' AND ;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR diff --git a/utils/wl-complete.el b/utils/wl-complete.el index 70dfc68..b44afe7 100644 --- a/utils/wl-complete.el +++ b/utils/wl-complete.el @@ -123,7 +123,7 @@ (wl-complete word wl-folder-entity-hashtb "folder" nil)))) (defun wl-addrbook-complete-address () - "Complete and expand address aliases. + "Complete and expand address aliases. First alias key is completed. When completed solely or the @ character is inserted before the cursor, the alias key is expanded to its value." (interactive) @@ -134,7 +134,7 @@ is inserted before the cursor, the alias key is expanded to its value." (insert (or (wl-alias-next word) word)) (wl-complete word wl-addrbook-alist "alias" ?@ nil nil - (function wl-addrbook-alias-get) + (function wl-addrbook-alias-get) (function wl-addrbook-alias-hit)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -153,8 +153,8 @@ is inserted before the cursor, the alias key is expanded to its value." (defun wl-circular-complete-domain () "Circular completion of domains for To:, Cc:, etc. If the @ character does not exist, the first value of -wl-mail-domain-list is inserted. If exists, the next value of -wl-mail-domain-list concerned with the string between @ and +wl-mail-domain-list is inserted. If exists, the next value of +wl-mail-domain-list concerned with the string between @ and the cursor is inserted." (interactive) (let ((word (wl-delete-backward-char "@"))) @@ -350,7 +350,7 @@ the name exists." (defun wl-slide-pair (x) (let ((ret nil) (first (car x))) - (cond + (cond ((eq x 0) nil) ((eq x 1) (cons first first)) (t @@ -371,7 +371,7 @@ the name exists." ;; Redistribution and use in source and binary forms, with or without ;; modification, are permitted provided that the following conditions ;; are met: -;; +;; ;; 1. Redistributions of source code must retain the above copyright ;; notice, this list of conditions and the following disclaimer. ;; 2. Redistributions in binary form must reproduce the above copyright @@ -380,7 +380,7 @@ the name exists." ;; 3. Neither the name of the team nor the names of its contributors ;; may be used to endorse or promote products derived from this software ;; without specific prior written permission. -;; +;; ;; THIS SOFTWARE IS PROVIDED BY THE TEAM AND CONTRIBUTORS ``AS IS'' AND ;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR