From 00329b4c7862f2460b5896deec8849b982e6c47c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 8 Jan 2002 08:06:01 +0000 Subject: [PATCH] Remove useless whitespaces. --- lisp/binhex.el | 6 +++--- lisp/gnus-art.el | 2 +- lisp/gnus-bcklg.el | 2 +- lisp/gnus-cache.el | 8 ++++---- lisp/gnus-cus.el | 2 +- lisp/gnus-diary.el | 2 +- lisp/gnus-fun.el | 2 +- lisp/gnus-group.el | 12 ++++++------ lisp/gnus-msg.el | 6 +++--- lisp/gnus-picon.el | 4 ++-- lisp/gnus-sieve.el | 2 +- lisp/gnus-spec.el | 2 +- lisp/gnus-srvr.el | 2 +- lisp/gnus-sum.el | 6 +++--- lisp/gnus-topic.el | 2 +- lisp/gnus-xmas.el | 2 +- lisp/gnus.el | 2 +- lisp/hex-util.el | 4 ++-- lisp/ietf-drums.el | 4 ++-- lisp/mm-util.el | 32 ++++++++++++++++---------------- lisp/mml.el | 6 +++--- lisp/mml1991.el | 48 ++++++++++++++++++++++++------------------------ lisp/mml2015.el | 50 +++++++++++++++++++++++++------------------------- lisp/nnimap.el | 2 +- lisp/nnmail.el | 6 +++--- lisp/nnslashdot.el | 10 +++++----- lisp/nnspool.el | 2 +- lisp/nntp.el | 2 +- lisp/nnwfm.el | 2 +- lisp/rfc2047.el | 4 ++-- lisp/sieve-manage.el | 16 ++++++++-------- lisp/sieve-mode.el | 12 ++++++------ lisp/sieve.el | 2 +- lisp/smiley-ems.el | 2 +- lisp/smime.el | 2 +- lisp/uudecode.el | 14 +++++++------- 36 files changed, 142 insertions(+), 142 deletions(-) diff --git a/lisp/binhex.el b/lisp/binhex.el index 120821f..678b73f 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -47,7 +47,7 @@ input and write the converted data to its standard output." :group 'gnus-extract :type '(repeat string)) -(defcustom binhex-use-external +(defcustom binhex-use-external (executable-find binhex-decoder-program) "*Use external binhex program." :group 'gnus-extract @@ -277,7 +277,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (interactive "r") (let ((cbuf (current-buffer)) firstline work-buffer status (file-name (expand-file-name - (concat (binhex-decode-region-internal start end t) + (concat (binhex-decode-region-internal start end t) ".data") binhex-temporary-file-directory))) (save-excursion @@ -315,7 +315,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (defun binhex-decode-region (start end) "Binhex decode region between START and END." (interactive "r") - (if binhex-use-external + (if binhex-use-external (binhex-decode-region-external start end) (binhex-decode-region-internal start end))) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 35ba3ee..f280e6b 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1870,7 +1870,7 @@ unfolded." (defun gnus-article-treat-body-boundary () "Place a boundary line at the end of the headers." (interactive) - (when (and gnus-body-boundary-delimiter + (when (and gnus-body-boundary-delimiter (> (length gnus-body-boundary-delimiter) 0)) (gnus-with-article-headers (goto-char (point-max)) diff --git a/lisp/gnus-bcklg.el b/lisp/gnus-bcklg.el index 4f0bddc..3a14103 100644 --- a/lisp/gnus-bcklg.el +++ b/lisp/gnus-bcklg.el @@ -1,5 +1,5 @@ ;;; gnus-bcklg.el --- backlog functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 02531fe..680b4cf 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -381,10 +381,10 @@ Returns the list of articles removed." (let ((cached (sort (copy-sequence gnus-newsgroup-cached) '>)) (gnus-verbose (max 6 gnus-verbose))) (if cached - (progn - (gnus-summary-limit cached) - (gnus-summary-position-point)) - (gnus-message 3 "No cached articles for this group")))) + (progn + (gnus-summary-limit cached) + (gnus-summary-position-point)) + (gnus-message 3 "No cached articles for this group")))) ;;; Internal functions. diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 6df3ffa..85c5cbf 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -195,7 +195,7 @@ Which articles to display on entering the group. unread and ticked articles. `Other' - Display the articles that satisfy the S-expression. The S-expression + Display the articles that satisfy the S-expression. The S-expression should be in an array form.") (comment (string :tag "Comment") "\ diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index 5f1f6e2..54b51d3 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -265,7 +265,7 @@ There are currently two built-in format functions: (o1 (nndiary-next-occurence s1 now)) (o2 (nndiary-next-occurence s2 now))) (if (and (= (car o1) (car o2)) (= (cadr o1) (cadr o2))) - (< (mail-header-number h1) (mail-header-number h2)) + (< (mail-header-number h1) (mail-header-number h2)) (time-less-p o1 o2)))) diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index 876b5e7..50139b9 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -176,7 +176,7 @@ colors of the displayed X-Faces." (save-restriction (article-narrow-to-head) (gnus-article-goto-header "from") - (when (bobp) + (when (bobp) (insert "From: \n") (forward-char -2)) (gnus-add-image diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 8465b31..98d08e3 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -191,7 +191,7 @@ Also note that if you change the format specification to include any of these specs, you must probably re-start Gnus to see them go into effect. -General format specifiers can also be used. +General format specifiers can also be used. See (gnus)Formatting Variables." :link '(custom-manual "(gnus)Formatting Variables") :group 'gnus-group-visual @@ -1907,7 +1907,7 @@ Return the name of the group if selection was successful." `(-1 nil (,group ,gnus-level-default-subscribed nil nil ,method ,(cons - (if quit-config + (if quit-config (cons 'quit-config quit-config) (cons 'quit-config (cons gnus-summary-buffer @@ -3708,10 +3708,10 @@ The hook gnus-suspend-gnus-hook is called before actually suspending." (let ((group-buf (get-buffer gnus-group-buffer))) (mapcar (lambda (buf) (unless (or (member buf (list group-buf gnus-dribble-buffer)) - (progn + (progn (save-excursion - (set-buffer buf) - (eq major-mode 'message-mode)))) + (set-buffer buf) + (eq major-mode 'message-mode)))) (gnus-kill-buffer buf))) (gnus-buffers)) (gnus-kill-gnus-frames) @@ -4035,7 +4035,7 @@ This command may read the active file." (mark gnus-read-mark) active n) (if (get-buffer buffer) - (with-current-buffer buffer + (with-current-buffer buffer (setq active gnus-newsgroup-active) (gnus-activate-group group) (when gnus-newsgroup-prepared diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 5dfbfd8..f8f3ef1 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -71,7 +71,7 @@ current newsgroup name and then returns a suitable group name (or list of names)." :group 'gnus-message :type '(choice (string :tag "Group") - (function))) + (function))) (defcustom gnus-mailing-list-groups nil "*Regexp matching groups that are really mailing lists. @@ -145,7 +145,7 @@ See Info node `(gnus)Posting Styles'." (defvar gnus-inews-mark-gcc-as-read nil "Obsolete variable. Use `gnus-gcc-mark-as-read' instead.") -(make-obsolete-variable 'gnus-inews-mark-gcc-as-read +(make-obsolete-variable 'gnus-inews-mark-gcc-as-read 'gnus-gcc-mark-as-read) (defcustom gnus-gcc-externalize-attachments nil @@ -1577,7 +1577,7 @@ this is a reply." (gnus-message 1 "Couldn't store article in group %s: %s" group (gnus-status-message method)) (sit-for 2)) - (when (and group-art + (when (and group-art (or gnus-gcc-mark-as-read gnus-inews-mark-gcc-as-read)) (gnus-group-mark-article-read group (cdr group-art))) diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 704c03a..e4e2529 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -181,7 +181,7 @@ GLYPH can be either a glyph or a string." gnus-picon-user-directories))) (setcar spec (cons (gnus-picon-create-glyph file) (car spec)))) - + (dotimes (i (1- (length spec))) (when (setq file (gnus-picon-find-face (concat "unknown@" @@ -193,7 +193,7 @@ GLYPH can be either a glyph or a string." (nth (1+ i) spec))))) (setq spec (nreverse spec)) (push (cons address spec) gnus-picon-cache)) - + (gnus-article-goto-header header) (mail-header-narrow-to-field) (when (search-forward address nil t) diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el index 36c99d0..18300ed 100644 --- a/lisp/gnus-sieve.el +++ b/lisp/gnus-sieve.el @@ -219,7 +219,7 @@ This is returned as a string." (let* ((newsrc (cdr gnus-newsrc-alist)) script) (dolist (info newsrc) - (when (or (not method) + (when (or (not method) (gnus-server-equal method (gnus-info-method info))) (let* ((group (gnus-info-group info)) (spec (gnus-group-find-parameter group 'sieve t))) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index edaf2ea..aaa1eca 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -462,7 +462,7 @@ characters when given a pad value." `(let (gnus-position) ,@(gnus-complex-form-to-spec form spec-alist) (if gnus-position - (gnus-put-text-property gnus-position (1+ gnus-position) + (gnus-put-text-property gnus-position (1+ gnus-position) 'gnus-position t))) `(progn ,@(gnus-complex-form-to-spec form spec-alist))))))) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index eb0ba28..6222153 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -57,7 +57,7 @@ The following specs are understood: %s status %a agent covered -General format specifiers can also be used. +General format specifiers can also be used. See (gnus)Formatting Variables." :link '(custom-manual "(gnus)Formatting Variables") :group 'gnus-server-visual diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 92428dd..8b999fc 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -600,7 +600,7 @@ with some simple extensions. %S The subject -General format specifiers can also be used. +General format specifiers can also be used. See (gnus)Formatting Variables." :link '(custom-manual "(gnus)Formatting Variables") :group 'gnus-threading @@ -7048,10 +7048,10 @@ articles that are younger than AGE days." (when (> (length days) 0) (setq days (read days))) (if (numberp days) - (progn + (progn (setq days-got t) (if (< days 0) - (progn + (progn (setq younger (not younger)) (setq days (* days -1))))) (message "Please enter a number.") diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 88f4a6e..f01ad87 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -62,7 +62,7 @@ with some simple extensions. %a Number of unread articles in the groups in the topic. %A Number of unread articles in the groups in the topic and its subtopics. -General format specifiers can also be used. +General format specifiers can also be used. See (gnus)Formatting Variables." :link '(custom-manual "(gnus)Formatting Variables") :type 'string diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index ddcdfae..0badab5 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -389,7 +389,7 @@ call it with the value of the `gnus-data' text property." (defalias 'gnus-put-text-property 'gnus-xmas-put-text-property) (defalias 'gnus-deactivate-mark 'ignore) (defalias 'gnus-window-edges 'window-pixel-edges) - + (if (and (<= emacs-major-version 19) (< emacs-minor-version 14)) (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) diff --git a/lisp/gnus.el b/lisp/gnus.el index 0edf11c..6a3d249 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2294,7 +2294,7 @@ possible. This restriction may disappear in later versions of Gnus. -General format specifiers can also be used. +General format specifiers can also be used. See (gnus)Formatting Variables." :link '(custom-manual "(gnus)Formatting Variables") :type 'string diff --git a/lisp/hex-util.el b/lisp/hex-util.el index ddf154d..6936bf3 100644 --- a/lisp/hex-util.el +++ b/lisp/hex-util.el @@ -49,7 +49,7 @@ (aset dst idx (+ (* (hex-char-to-num (aref string pos)) 16) (hex-char-to-num (aref string (1+ pos))))) (setq idx (1+ idx) - pos (+ 2 pos))) + pos (+ 2 pos))) dst)) (defun encode-hex-string (string) @@ -65,7 +65,7 @@ ;;; (aset dst idx (num-to-hex-char (logand (aref string pos) 15))) (aset dst idx (num-to-hex-char (% (aref string pos) 16))) (setq idx (1+ idx) - pos (1+ pos))) + pos (1+ pos))) dst)) (provide 'hex-util) diff --git a/lisp/ietf-drums.el b/lisp/ietf-drums.el index e1b19a9..76d243f 100644 --- a/lisp/ietf-drums.el +++ b/lisp/ietf-drums.el @@ -216,7 +216,7 @@ ((eq c ?,) (setq address (condition-case nil - (ietf-drums-parse-address + (ietf-drums-parse-address (buffer-substring beg (point))) (error nil))) (if address (push address pairs)) @@ -226,7 +226,7 @@ (forward-char 1)))) (setq address (condition-case nil - (ietf-drums-parse-address + (ietf-drums-parse-address (buffer-substring beg (point))) (error nil))) (if address (push address pairs)) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 642462b..a6aa5b4 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -124,7 +124,7 @@ '((iso-8859-15 . iso-8859-1))) ;; Windows-1252 is actually a superset of Latin-1. See also ;; `gnus-article-dumbquotes-map'. - ,@(unless (mm-coding-system-p 'windows-1252) + ,@(unless (mm-coding-system-p 'windows-1252) (if (mm-coding-system-p 'cp1252) '((windows-1252 . cp1252)) '((windows-1252 . iso-8859-1)))) @@ -248,7 +248,7 @@ Valid elements include: `iso-2022-jp-2' convert ISO-2022-jp to ISO-2022-jp-2 if ISO-2022-jp-2 exists." ) -(defvar mm-iso-8859-15-compatible +(defvar mm-iso-8859-15-compatible '((iso-8859-1 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE") (iso-8859-9 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xD0\xDD\xDE\xF0\xFD\xFE")) "ISO-8859-15 exchangeable coding systems and inconvertible characters.") @@ -256,16 +256,16 @@ Valid elements include: (defvar mm-iso-8859-x-to-15-table (and (fboundp 'coding-system-p) (mm-coding-system-p 'iso-8859-15) - (mapcar + (mapcar (lambda (cs) (if (mm-coding-system-p (car cs)) - (let ((c (string-to-char + (let ((c (string-to-char (decode-coding-string "\341" (car cs))))) (cons (char-charset c) (cons - (- (string-to-char + (- (string-to-char (decode-coding-string "\341" 'iso-8859-15)) c) - (string-to-list (decode-coding-string (car (cdr cs)) + (string-to-list (decode-coding-string (car (cdr cs)) (car cs)))))) '(gnus-charset 0))) mm-iso-8859-15-compatible)) @@ -361,7 +361,7 @@ used as the line break code type of the coding system." default-enable-multibyte-characters (fboundp 'set-buffer-multibyte)) "Emacs mule.") - + (defvar mm-mule4-p (and mm-emacs-mule (fboundp 'charsetp) (not (charsetp 'eight-bit-control))) @@ -388,7 +388,7 @@ This is a no-op in XEmacs." Only used in Emacs Mule 4." (set-buffer-multibyte t)) (defalias 'mm-enable-multibyte-mule4 'ignore)) - + (if mm-mule4-p (defun mm-disable-multibyte-mule4 () "Disable multibyte in the current buffer. @@ -481,15 +481,15 @@ If the charset is `composition', return the actual one." (goto-char (point-min)) (skip-chars-forward "\0-\177") (while (not (eobp)) - (cond - ((not (setq item (assq (char-charset (setq c (char-after))) + (cond + ((not (setq item (assq (char-charset (setq c (char-after))) mm-iso-8859-x-to-15-table))) (forward-char)) ((memq c (cdr (cdr item))) (setq inconvertible t) (forward-char)) (t - (insert-before-markers (prog1 (+ c (car (cdr item))) + (insert-before-markers (prog1 (+ c (car (cdr item))) (delete-char 1)))) (skip-chars-forward "\0-\177")))) (not inconvertible)))) @@ -510,7 +510,7 @@ charset, and a longer list means no appropriate charset." ;; system that has one. (let ((systems (find-coding-systems-region b e))) (when mm-coding-system-priorities - (setq systems + (setq systems (sort systems 'mm-sort-coding-systems-predicate))) ;; Fixme: The `mime-charset' (`x-ctext') of `compound-text' ;; is not in the IANA list. @@ -524,7 +524,7 @@ charset, and a longer list means no appropriate charset." charsets)) ;; Otherwise we're not multibyte, XEmacs or a single coding ;; system won't cover it. - (setq charsets + (setq charsets (mm-delete-duplicates (mapcar 'mm-mime-charset (delq 'ascii @@ -553,8 +553,8 @@ Also bind `default-enable-multibyte-characters' to nil. Equivalent to `progn' in XEmacs" (let ((multibyte (make-symbol "multibyte")) (buffer (make-symbol "buffer"))) - `(if mm-emacs-mule - (let ((,multibyte enable-multibyte-characters) + `(if mm-emacs-mule + (let ((,multibyte enable-multibyte-characters) (,buffer (current-buffer))) (unwind-protect (let (default-enable-multibyte-characters) @@ -573,7 +573,7 @@ Mule4 only." (let ((multibyte (make-symbol "multibyte")) (buffer (make-symbol "buffer"))) `(if mm-mule4-p - (let ((,multibyte enable-multibyte-characters) + (let ((,multibyte enable-multibyte-characters) (,buffer (current-buffer))) (unwind-protect (let (default-enable-multibyte-characters) diff --git a/lisp/mml.el b/lisp/mml.el index 04bf91c..0d40ae9 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -64,7 +64,7 @@ NAME is a string containing the name of the TWEAK parameter in the MML handle. FUNCTION is a Lisp function which is called with the MML handle to tweak the part.") -(defvar mml-tweak-sexp-alist +(defvar mml-tweak-sexp-alist '((mml-externalize-attachments . mml-tweak-externalize-attachments)) "A list of (SEXP . FUNCTION) for tweaking MML parts. SEXP is a s-expression. If the evaluation of SEXP is non-nil, FUNCTION @@ -164,7 +164,7 @@ one charsets.") (list (intern (downcase (cdr (assq 'charset tag)))))) (t - (mm-find-mime-charset-region point (point) + (mm-find-mime-charset-region point (point) mm-hack-charsets)))) (when (and (not raw) (memq nil charsets)) (if (or (memq 'unknown-encoding mml-confirmation-set) @@ -987,7 +987,7 @@ If RAW, don't highlight the article." (defun mml-tweak-externalize-attachments (cont) "Tweak attached files as external parts." (let (filename-cons) - (when (and (eq (car cont) 'part) + (when (and (eq (car cont) 'part) (not (cdr (assq 'buffer cont))) (and (setq filename-cons (assq 'filename cont)) (not (equal (cdr (assq 'nofile cont)) "yes")))) diff --git a/lisp/mml1991.el b/lisp/mml1991.el index 0911874..49abfd6 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -1,7 +1,7 @@ ;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -;; Author: Sascha Lüdecke , +;; Author: Sascha Ldecke , ;; Simon Josefsson (Mailcrypt interface, Gnus glue) ;; Keywords PGP @@ -46,15 +46,15 @@ (defun mml1991-mailcrypt-sign (cont) (let ((text (current-buffer)) - headers signature - (result-buffer (get-buffer-create "*GPG Result*"))) + headers signature + (result-buffer (get-buffer-create "*GPG Result*"))) ;; Save MIME Content[^ ]+: headers from signing (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (if (> (point) (point-min)) - (progn - (setq headers (buffer-substring (point-min) (point))) - (kill-region (point-min) (point)))) + (progn + (setq headers (buffer-substring (point-min) (point))) + (kill-region (point-min) (point)))) (goto-char (point-max)) (unless (bolp) (insert "\n")) @@ -81,13 +81,13 @@ (defun mml1991-mailcrypt-encrypt (cont) (let ((text (current-buffer)) cipher - (result-buffer (get-buffer-create "*GPG Result*"))) + (result-buffer (get-buffer-create "*GPG Result*"))) ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (if (> (point) (point-min)) - (progn - (kill-region (point-min) (point)))) + (progn + (kill-region (point-min) (point)))) (mm-with-unibyte-current-buffer-mule4 (with-temp-buffer (setq cipher (current-buffer)) @@ -108,10 +108,10 @@ (while (re-search-forward "\r+$" nil t) (replace-match "" t t)) (set-buffer text) - (kill-region (point-min) (point-max)) + (kill-region (point-min) (point-max)) ;;(insert "Content-Type: application/pgp-encrypted\n\n") ;;(insert "Version: 1\n\n") - (insert "\n") + (insert "\n") (insert-buffer cipher) (goto-char (point-max)))))) @@ -122,24 +122,24 @@ (defun mml1991-gpg-sign (cont) (let ((text (current-buffer)) - headers signature - (result-buffer (get-buffer-create "*GPG Result*"))) + headers signature + (result-buffer (get-buffer-create "*GPG Result*"))) ;; Save MIME Content[^ ]+: headers from signing (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (if (> (point) (point-min)) - (progn - (setq headers (buffer-substring (point-min) (point))) - (kill-region (point-min) (point)))) + (progn + (setq headers (buffer-substring (point-min) (point))) + (kill-region (point-min) (point)))) (goto-char (point-max)) (unless (bolp) (insert "\n")) (quoted-printable-decode-region (point-min) (point-max)) (with-temp-buffer (unless (gpg-sign-cleartext text (setq signature (current-buffer)) - result-buffer - nil - (message-options-get 'message-sender)) + result-buffer + nil + (message-options-get 'message-sender)) (unless (> (point-max) (point-min)) (pop-to-buffer result-buffer) (error "Sign error"))) @@ -157,13 +157,13 @@ (defun mml1991-gpg-encrypt (cont) (let ((text (current-buffer)) cipher - (result-buffer (get-buffer-create "*GPG Result*"))) + (result-buffer (get-buffer-create "*GPG Result*"))) ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") (forward-line)) (if (> (point) (point-min)) - (progn - (kill-region (point-min) (point)))) + (progn + (kill-region (point-min) (point)))) (mm-with-unibyte-current-buffer-mule4 (with-temp-buffer (unless (gpg-sign-encrypt @@ -185,10 +185,10 @@ (while (re-search-forward "\r+$" nil t) (replace-match "" t t)) (set-buffer text) - (kill-region (point-min) (point-max)) + (kill-region (point-min) (point-max)) ;;(insert "Content-Type: application/pgp-encrypted\n\n") ;;(insert "Version: 1\n\n") - (insert "\n") + (insert "\n") (insert-buffer cipher) (goto-char (point-max)))))) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 4654ae4..b86a2e1 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -391,9 +391,9 @@ by you.") (defun mml2015-gpg-pretty-print-fpr (fingerprint) (let* ((result "") - (fpr-length (string-width fingerprint)) - (n-slice 0) - slice) + (fpr-length (string-width fingerprint)) + (n-slice 0) + slice) (setq fingerprint (string-to-list fingerprint)) (while fingerprint (setq fpr-length (- fpr-length 4)) @@ -401,13 +401,13 @@ by you.") (setq fingerprint (nthcdr 4 fingerprint)) (setq n-slice (1+ n-slice)) (setq result - (concat - result - (case n-slice - (1 slice) - (otherwise (concat " " slice)))))) + (concat + result + (case n-slice + (1 slice) + (otherwise (concat " " slice)))))) result)) - + (defun mml2015-gpg-extract-signature-details () (goto-char (point-min)) (if (boundp 'gpg-unabbrev-trust-alist) @@ -415,14 +415,14 @@ by you.") "^\\[GNUPG:\\] GOODSIG [0-9A-Za-z]* \\(.*\\)$" nil t) (match-string 1))) - (fprint (and (re-search-forward - "^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) " + (fprint (and (re-search-forward + "^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) " nil t) - (match-string 1))) - (trust (and (re-search-forward "^\\[GNUPG:\\] \\(TRUST_.*\\)$" nil t) - (match-string 1))) - (trust-good-enough-p - (cdr (assoc (cdr (assoc trust gpg-unabbrev-trust-alist)) + (match-string 1))) + (trust (and (re-search-forward "^\\[GNUPG:\\] \\(TRUST_.*\\)$" nil t) + (match-string 1))) + (trust-good-enough-p + (cdr (assoc (cdr (assoc trust gpg-unabbrev-trust-alist)) mml2015-trust-boundaries-alist)))) (if (and signer trust fprint) (concat signer @@ -476,20 +476,20 @@ by you.") (error (mm-set-handle-multipart-parameter mm-security-handle 'gnus-details (mml2015-format-error err)) - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "Error.") - (setq info-is-set-p t) + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-info "Error.") + (setq info-is-set-p t) nil) (quit (mm-set-handle-multipart-parameter mm-security-handle 'gnus-details "Quit.") - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "Quit.") - (setq info-is-set-p t) + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-info "Quit.") + (setq info-is-set-p t) nil)) - (unless info-is-set-p - (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-info "Failed")) + (unless info-is-set-p + (mm-set-handle-multipart-parameter + mm-security-handle 'gnus-info "Failed")) (throw 'error handle))) (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 9ff83b4..6740e65 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -174,7 +174,7 @@ group/function elements." (nnimap-strict-function :tag "User-defined function")) (repeat :menu-tag "Multi-server (extended)" :tag "Multi-server list" - (list (regexp :tag "Server regexp") + (list (regexp :tag "Server regexp") (list (regexp :tag "Incoming Mailbox regexp") (repeat :tag "Rules for matching server(s) and mailbox(es)" (list (string :tag "Destination mailbox") diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 78305fa..7e85b91 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -188,7 +188,7 @@ The return value should be `delete' or a group name (a string)." (function :format "%v" nnmail-) string)) -(defcustom nnmail-fancy-expiry-targets nil +(defcustom nnmail-fancy-expiry-targets nil "Determine expiry target based on articles using fancy techniques. This is a list of (\"HEADER\" \"REGEXP\" \"TARGET\") entries. If @@ -218,8 +218,8 @@ everything else will be expired to \"nnfolder:Archive-YYYY\"." :type '(repeat (list (choice :tag "Match against" (string :tag "Header") (const to-from)) - regexp - (string :tag "Target group format string")))) + regexp + (string :tag "Target group format string")))) (defcustom nnmail-cache-accepted-message-ids nil "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache. diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index f135150..b03fc3b 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -95,7 +95,7 @@ (entry (assoc group nnslashdot-groups)) (sid (nth 2 entry)) (first-comments t) - headers article subject score from date lines parent point cid + headers article subject score from date lines parent point cid s startats changed) (save-excursion (set-buffer nnslashdot-buffer) @@ -186,7 +186,7 @@ from date (concat "<" (nnslashdot-sid-strip sid) "%" cid "@slashdot>") (if parent - (concat "<" (nnslashdot-sid-strip sid) "%" + (concat "<" (nnslashdot-sid-strip sid) "%" parent "@slashdot>") "") 0 lines nil nil)) @@ -194,7 +194,7 @@ (while (and articles (<= (car articles) article)) (pop articles)) (setq article (1+ article))) - (if nnslashdot-threaded + (if nnslashdot-threaded (progn (setq start (pop startats)) (if start (setq start (+ start 2)))) @@ -249,7 +249,7 @@ (when (numberp article) (if (= article 1) (progn - (re-search-forward + (re-search-forward "Posted by") (search-forward "
") (setq contents @@ -259,7 +259,7 @@ (re-search-forward "< [ \t\r\n]*" cid)) (setq contents diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 40dbfc1..7ca4f7a 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -1,7 +1,7 @@ ;;; nnspool.el --- spool access for GNU Emacs ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2002 +;; 2000, 2002 ;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA diff --git a/lisp/nntp.el b/lisp/nntp.el index 2576e0c..e01317b 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -1,5 +1,5 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, +;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, ;; 1997, 1998, 2000, 2001, 2002 ;; Free Software Foundation, Inc. diff --git a/lisp/nnwfm.el b/lisp/nnwfm.el index b361c6d..17f2656 100644 --- a/lisp/nnwfm.el +++ b/lisp/nnwfm.el @@ -298,7 +298,7 @@ (when (re-search-forward "href=\"\\(Thread.*DateLast=\\([^\"]+\\)\\)" nil t) (setq url (match-string 1) - time (nnwfm-date-to-time (gnus-url-unhex-string + time (nnwfm-date-to-time (gnus-url-unhex-string (match-string 2)))) (when (and (nnwfm-new-threads-p group time) (not (member diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 8054b6a..7814864 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -184,7 +184,7 @@ Should be called narrowed to the head of the message." ;; left the old code commented out below. ;; -- Per Abrahamsen Date: 2001-10-07. ((null method) - (when (delq 'ascii + (when (delq 'ascii (mm-find-charset-region (point-min) (point-max))) (rfc2047-encode-region (point-min) (point-max)))) ;;; ((null method) @@ -543,7 +543,7 @@ The buffer may be narrowed." (inline (rfc2047-decode-region (point-min) (point-max))) (buffer-string)) - (if (and m + (if (and m mail-parse-charset (not (eq mail-parse-charset 'us-ascii)) (not (eq mail-parse-charset 'gnus-decoded))) diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el index e004d62..acd5c32 100644 --- a/lisp/sieve-manage.el +++ b/lisp/sieve-manage.el @@ -65,7 +65,7 @@ ;; ;; 2001-10-31 Committed to Oort Gnus. ;; -;; $Id: sieve-manage.el,v 1.1.2.2 2001-11-29 00:15:39 yamaoka Exp $ +;; $Id: sieve-manage.el,v 1.1.2.3 2002-01-08 08:06:01 yamaoka Exp $ ;;; Code: @@ -116,7 +116,7 @@ stream.") (defcustom sieve-manage-authenticators '(cram-md5 plain) "Priority of authenticators to consider when authenticating to server.") -(defcustom sieve-manage-authenticator-alist +(defcustom sieve-manage-authenticator-alist '((cram-md5 sieve-manage-cram-md5-p sieve-manage-cram-md5-auth) (plain sieve-manage-plain-p sieve-manage-plain-auth)) "Definition of authenticators. @@ -196,13 +196,13 @@ Returns t if login was successful, nil otherwise." ;; (condition-case () (while (or (not user) (not passwd)) (setq user (or sieve-manage-username - (read-from-minibuffer + (read-from-minibuffer (concat "Managesieve username for " sieve-manage-server ": ") (or user sieve-manage-default-user)))) (setq passwd (or sieve-manage-password (sieve-manage-read-passwd - (concat "Managesieve password for " user "@" + (concat "Managesieve password for " user "@" sieve-manage-server ": ")))) (when (and user passwd) (if (funcall loginfunc user passwd) @@ -319,7 +319,7 @@ Returns t if login was successful, nil otherwise." (sieve-manage-send (concat "AUTHENTICATE \"PLAIN\" \"" (base64-encode-string (concat (char-to-string 0) - user + user (char-to-string 0) passwd)) "\"")) @@ -395,7 +395,7 @@ to work in." (if (funcall (nth 1 (assq stream sieve-manage-stream-alist)) buffer) (setq stream-changed - (not (eq (or sieve-manage-stream + (not (eq (or sieve-manage-stream sieve-manage-default-stream) stream)) sieve-manage-stream stream @@ -409,14 +409,14 @@ to work in." (if (sieve-manage-open-1 buffer) (message "sieve: Reconnecting with stream `%s'...done" sieve-manage-stream) - (message "sieve: Reconnecting with stream `%s'...failed" + (message "sieve: Reconnecting with stream `%s'...failed" sieve-manage-stream)) (setq sieve-manage-capability nil)) (if (sieve-manage-opened buffer) ;; Choose authenticator (when (and (null sieve-manage-auth) (not (eq sieve-manage-state 'auth))) - (let ((auths sieve-manage-authenticators)) + (let ((auths sieve-manage-authenticators)) (while (setq auth (pop auths)) (if (funcall (nth 1 (assq auth diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el index 0445c02..640ae6b 100644 --- a/lisp/sieve-mode.el +++ b/lisp/sieve-mode.el @@ -45,7 +45,7 @@ ;; added keymap and menubar to hook into sieve-manage ;; 2001-10-31 version 1.2 committed to Oort Gnus ;; -;; $Id: sieve-mode.el,v 1.1.2.2 2001-11-08 00:10:42 yamaoka Exp $ +;; $Id: sieve-mode.el,v 1.1.2.3 2002-01-08 08:06:01 yamaoka Exp $ ;;; Code: @@ -69,7 +69,7 @@ (defvar sieve-control-commands-face 'sieve-control-commands-face "Face name used for Sieve Control Commands.") -(defface sieve-control-commands-face +(defface sieve-control-commands-face '((((type tty) (class color)) (:foreground "blue" :weight light)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) @@ -91,7 +91,7 @@ (defvar sieve-test-commands-face 'sieve-test-commands-face "Face name used for Sieve Test Commands.") -(defface sieve-test-commands-face +(defface sieve-test-commands-face '((((type tty) (class color)) (:foreground "magenta")) (((class grayscale) (background light)) (:foreground "LightGray" :bold t :underline t)) @@ -128,7 +128,7 @@ (cons (regexp-opt '("address" "allof" "anyof" "exists" "false" "true" "header" "not" "size" "envelope")) 'sieve-test-commands-face) - (cons "\\Sw+:\\sw+" + (cons "\\Sw+:\\sw+" 'sieve-tagged-arguments-face)))) ;; Syntax table @@ -158,7 +158,7 @@ ;; Key map definition -(defvar sieve-mode-map +(defvar sieve-mode-map (let ((map (make-sparse-keymap))) (define-key map "\C-c\C-l" 'sieve-upload) (define-key map "\C-c\C-m" 'sieve-manage) @@ -188,7 +188,7 @@ Turning on Sieve mode runs `sieve-mode-hook'." (set (make-local-variable 'comment-start-skip) "#+ *") (unless (featurep 'xemacs) (set (make-local-variable 'font-lock-defaults) - '(sieve-font-lock-keywords nil nil ((?_ . "w"))))) + '(sieve-font-lock-keywords nil nil ((?_ . "w"))))) (easy-menu-add-item nil nil sieve-mode-menu)) ;; Menu diff --git a/lisp/sieve.el b/lisp/sieve.el index d40efa2..0b4aa35 100644 --- a/lisp/sieve.el +++ b/lisp/sieve.el @@ -142,7 +142,7 @@ require \"fileinto\"; ["Activate script" sieve-activate t] ["Deactivate script" sieve-deactivate t])) -;; This is necessary to allow correct handling of \\[cvs-mode-diff-map] +;; This is necessary to allow correct handling of \\[cvs-mode-diff-map] ;; in substitute-command-keys. ;(fset 'sieve-manage-mode-map sieve-manage-mode-map) diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el index 3822fe1..ea15c7d 100644 --- a/lisp/smiley-ems.el +++ b/lisp/smiley-ems.el @@ -95,7 +95,7 @@ regexp to replace with IMAGE. IMAGE is the name of a PBM file in smiley-data-directory))) (setq file nil))) (when type - (let ((image (find-image (list (list :type (intern type) + (let ((image (find-image (list (list :type (intern type) :file file :ascent 'center))))) (when image diff --git a/lisp/smime.el b/lisp/smime.el index ce69cd5..eb10aa7 100644 --- a/lisp/smime.el +++ b/lisp/smime.el @@ -459,7 +459,7 @@ in the buffer specified by `smime-details-buffer'." "Get email addresses contained in certificate between points B and E. A string or a list of strings is returned." (smime-new-details-buffer) - (when (smime-call-openssl-region + (when (smime-call-openssl-region b e smime-details-buffer "x509" "-email" "-noout") (delete-region b e) (insert-buffer-substring smime-details-buffer) diff --git a/lisp/uudecode.el b/lisp/uudecode.el index 5962094..2030b9f 100644 --- a/lisp/uudecode.el +++ b/lisp/uudecode.el @@ -48,7 +48,7 @@ input and write the converted data to its standard output." :group 'gnus-extract :type '(repeat string)) -(defcustom uudecode-use-external +(defcustom uudecode-use-external (executable-find uudecode-decoder-program) "*Use external uudecode program." :group 'gnus-extract @@ -166,8 +166,8 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (setq counter (1+ counter) inputpos (1+ inputpos)) (cond ((= counter 4) - (setq result (cons - (concat + (setq result (cons + (concat (char-to-string (lsh bits -16)) (char-to-string (logand (lsh bits -8) 255)) (char-to-string (logand bits 255))) @@ -183,13 +183,13 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." ;;(error "uucode ends unexpectly") (setq done t)) ((= counter 3) - (setq result (cons - (concat + (setq result (cons + (concat (char-to-string (logand (lsh bits -16) 255)) (char-to-string (logand (lsh bits -8) 255))) result))) ((= counter 2) - (setq result (cons + (setq result (cons (char-to-string (logand (lsh bits -10) 255)) result)))) (skip-chars-forward non-data-chars end)) @@ -206,7 +206,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (defun uudecode-decode-region (start end &optional file-name) "Uudecode region between START and END. If FILE-NAME is non-nil, save the result to FILE-NAME." - (if uudecode-use-external + (if uudecode-use-external (uudecode-decode-region-external start end file-name) (uudecode-decode-region-internal start end file-name))) -- 1.7.10.4