From: yamaoka <yamaoka>
Date: Wed, 25 Jul 2001 11:54:40 +0000 (+0000)
Subject: Cleaning up more.
X-Git-Tag: t-gnus-6_15_4-04-quimby-last-~13
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e319b544eb439c3afd135775d6deaebdea3b49;p=elisp%2Fgnus.git-

Cleaning up more.
---

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 49105b5..3a37088 100644
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -53,14 +53,14 @@
 
 (eval-and-compile
   (defalias 'fill-flowed-point-at-bol
-	(if (fboundp 'point-at-bol)
-	    'point-at-bol
-	  'line-beginning-position))
+    (if (fboundp 'point-at-bol)
+	'point-at-bol
+      'line-beginning-position))
 
-   (defalias 'fill-flowed-point-at-eol
-	(if (fboundp 'point-at-eol)
-	    'point-at-eol
-	  'line-end-position)))
+  (defalias 'fill-flowed-point-at-eol
+    (if (fboundp 'point-at-eol)
+	'point-at-eol
+      'line-end-position)))
 
 (defun fill-flowed (&optional buffer)
   (save-excursion
@@ -86,7 +86,8 @@
 		      (save-excursion
 			(unless (eobp)
 			  (forward-char 1)
-			  (looking-at (format "^\\(%s\\)\\([^>]\\)" (or quote " ?"))))))
+			  (looking-at (format "^\\(%s\\)\\([^>]\\)"
+					      (or quote " ?"))))))
 	    (save-excursion
 	      (replace-match (if (string= (match-string 2) " ")
 				 "" "\\2")))
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 666ba7f..9485bf8 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -634,7 +634,8 @@ Obsolete; use the face `gnus-signature-face' for customizations instead."
       (background light))
      (:foreground "indianred4" :italic t))
     (t
-     (:italic t)))  "Face used for displaying header content."
+     (:italic t)))
+  "Face used for displaying header content."
   :group 'gnus-article-headers
   :group 'gnus-article-highlight)
 
@@ -1308,65 +1309,65 @@ Initialized from `text-mode-syntax-table.")
 	(gnus-article-show-hidden-text 'boring-headers)
 	(when (eq 1 (point-min))
 	  (set-window-start (get-buffer-window (current-buffer)) 1)))
-  (unless gnus-inhibit-hiding
-    (save-excursion
-      (save-restriction
-	(let ((inhibit-read-only t)
-	      (case-fold-search t)
-	      (max (1+ (length gnus-sorted-header-list)))
-	      (ignored (when (not gnus-visible-headers)
-			 (cond ((stringp gnus-ignored-headers)
-				gnus-ignored-headers)
-			       ((listp gnus-ignored-headers)
-				(mapconcat 'identity gnus-ignored-headers
-					   "\\|")))))
-	      (visible
-	       (cond ((stringp gnus-visible-headers)
-		      gnus-visible-headers)
-		     ((and gnus-visible-headers
-			   (listp gnus-visible-headers))
-		      (mapconcat 'identity gnus-visible-headers "\\|"))))
-	      (inhibit-point-motion-hooks t)
-	      beg)
-	  ;; First we narrow to just the headers.
-	  (article-narrow-to-head)
-	  ;; Hide any "From " lines at the beginning of (mail) articles.
-	  (while (looking-at "From ")
-	    (forward-line 1))
-	  (unless (bobp)
-	    (if delete
-		(delete-region (point-min) (point))
-	      (gnus-article-hide-text (point-min) (point)
-				      (nconc (list 'article-type 'headers)
-					     gnus-hidden-properties))))
-	  ;; Then treat the rest of the header lines.
-	  ;; Then we use the two regular expressions
-	  ;; `gnus-ignored-headers' and `gnus-visible-headers' to
-	  ;; select which header lines is to remain visible in the
-	  ;; article buffer.
-	  (while (re-search-forward "^[^ \t:]*:" nil t)
-	    (beginning-of-line)
-	    ;; Mark the rank of the header.
-	    (put-text-property
-	     (point) (1+ (point)) 'message-rank
-	     (if (or (and visible (looking-at visible))
-		     (and ignored
-			  (not (looking-at ignored))))
-		 (gnus-article-header-rank)
-	       (+ 2 max)))
-	    (forward-line 1))
-	  (message-sort-headers-1)
-	  (when (setq beg (text-property-any
-			   (point-min) (point-max) 'message-rank (+ 2 max)))
-	    ;; We delete or make invisible the unwanted headers.
-	    (push 'headers gnus-article-wash-types)
-	    (if delete
-		(progn
-		  (add-text-properties
-		   (point-min) (+ 5 (point-min))
-		   '(article-type headers dummy-invisible t))
-		  (delete-region beg (point-max)))
-	      (gnus-article-hide-text-type beg (point-max) 'headers))))))))
+    (unless gnus-inhibit-hiding
+      (save-excursion
+	(save-restriction
+	  (let ((inhibit-read-only t)
+		(case-fold-search t)
+		(max (1+ (length gnus-sorted-header-list)))
+		(ignored (when (not gnus-visible-headers)
+			   (cond ((stringp gnus-ignored-headers)
+				  gnus-ignored-headers)
+				 ((listp gnus-ignored-headers)
+				  (mapconcat 'identity gnus-ignored-headers
+					     "\\|")))))
+		(visible
+		 (cond ((stringp gnus-visible-headers)
+			gnus-visible-headers)
+		       ((and gnus-visible-headers
+			     (listp gnus-visible-headers))
+			(mapconcat 'identity gnus-visible-headers "\\|"))))
+		(inhibit-point-motion-hooks t)
+		beg)
+	    ;; First we narrow to just the headers.
+	    (article-narrow-to-head)
+	    ;; Hide any "From " lines at the beginning of (mail) articles.
+	    (while (looking-at "From ")
+	      (forward-line 1))
+	    (unless (bobp)
+	      (if delete
+		  (delete-region (point-min) (point))
+		(gnus-article-hide-text (point-min) (point)
+					(nconc (list 'article-type 'headers)
+					       gnus-hidden-properties))))
+	    ;; Then treat the rest of the header lines.
+	    ;; Then we use the two regular expressions
+	    ;; `gnus-ignored-headers' and `gnus-visible-headers' to
+	    ;; select which header lines is to remain visible in the
+	    ;; article buffer.
+	    (while (re-search-forward "^[^ \t:]*:" nil t)
+	      (beginning-of-line)
+	      ;; Mark the rank of the header.
+	      (put-text-property
+	       (point) (1+ (point)) 'message-rank
+	       (if (or (and visible (looking-at visible))
+		       (and ignored
+			    (not (looking-at ignored))))
+		   (gnus-article-header-rank)
+		 (+ 2 max)))
+	      (forward-line 1))
+	    (message-sort-headers-1)
+	    (when (setq beg (text-property-any
+			     (point-min) (point-max) 'message-rank (+ 2 max)))
+	      ;; We delete or make invisible the unwanted headers.
+	      (push 'headers gnus-article-wash-types)
+	      (if delete
+		  (progn
+		    (add-text-properties
+		     (point-min) (+ 5 (point-min))
+		     '(article-type headers dummy-invisible t))
+		    (delete-region beg (point-max)))
+		(gnus-article-hide-text-type beg (point-max) 'headers))))))))
   )
 
 (defun article-hide-boring-headers (&optional arg)
@@ -1845,38 +1846,38 @@ If PROMPT (the prefix), prompt for a coding system to use."
 			   (error))
 			 gnus-newsgroup-ignored-charsets))
 	ct cte ctl charset format)
-  (save-excursion
-    (save-restriction
-      (article-narrow-to-head)
-      (setq ct (message-fetch-field "Content-Type" t)
-	    cte (message-fetch-field "Content-Transfer-Encoding" t)
-	    ctl (and ct (ignore-errors
-			  (mail-header-parse-content-type ct)))
-	    charset (cond
-		     (prompt
-		      (mm-read-coding-system "Charset to decode: "))
-		     (ctl
-		      (mail-content-type-get ctl 'charset)))
-	    format (and ctl (mail-content-type-get ctl 'format)))
-      (when cte
-	(setq cte (mail-header-strip cte)))
-      (if (and ctl (not (string-match "/" (car ctl))))
-	  (setq ctl nil))
-      (goto-char (point-max)))
-    (forward-line 1)
-    (save-restriction
-      (narrow-to-region (point) (point-max))
-      (when (and (eq mail-parse-charset 'gnus-decoded)
-		 (eq (mm-body-7-or-8) '8bit))
-	;; The text code could have been decoded.
-	(setq charset mail-parse-charset))
-      (when (and (or (not ctl)
-		     (equal (car ctl) "text/plain"))
-		 (not format)) ;; article with format will decode later.
-	(mm-decode-body
-	 charset (and cte (intern (downcase
-				   (gnus-strip-whitespace cte))))
-	 (car ctl)))))))
+    (save-excursion
+      (save-restriction
+	(article-narrow-to-head)
+	(setq ct (message-fetch-field "Content-Type" t)
+	      cte (message-fetch-field "Content-Transfer-Encoding" t)
+	      ctl (and ct (ignore-errors
+			    (mail-header-parse-content-type ct)))
+	      charset (cond
+		       (prompt
+			(mm-read-coding-system "Charset to decode: "))
+		       (ctl
+			(mail-content-type-get ctl 'charset)))
+	      format (and ctl (mail-content-type-get ctl 'format)))
+	(when cte
+	  (setq cte (mail-header-strip cte)))
+	(if (and ctl (not (string-match "/" (car ctl))))
+	    (setq ctl nil))
+	(goto-char (point-max)))
+      (forward-line 1)
+      (save-restriction
+	(narrow-to-region (point) (point-max))
+	(when (and (eq mail-parse-charset 'gnus-decoded)
+		   (eq (mm-body-7-or-8) '8bit))
+	  ;; The text code could have been decoded.
+	  (setq charset mail-parse-charset))
+	(when (and (or (not ctl)
+		       (equal (car ctl) "text/plain"))
+		   (not format)) ;; article with format will decode later.
+	  (mm-decode-body
+	   charset (and cte (intern (downcase
+				     (gnus-strip-whitespace cte))))
+	   (car ctl)))))))
 
 (defun article-decode-encoded-words ()
   "Remove encoded-word encoding from headers."
@@ -2382,8 +2383,8 @@ should replace the \"Date:\" one, or should be added below it."
 		    (re-search-forward "^X-Sent:[ \t]" nil t))
 	    (setq bface (get-text-property (gnus-point-at-bol) 'face)
 		  date (or (get-text-property (gnus-point-at-bol)
-						'original-date)
-			     date)
+					      'original-date)
+			   date)
 		  eface (get-text-property (1- (gnus-point-at-eol))
 					   'face)))
 	  (let ((buffer-read-only nil))
@@ -2539,8 +2540,8 @@ should replace the \"Date:\" one, or should be added below it."
 	     (format "%02d" (nth 2 dtime))
 	     ":"
 	     (format "%02d" (nth 1 dtime)))))))
-	(error
-	 (format "Date: %s (from Oort)" date))))
+    (error
+     (format "Date: %s (from Oort)" date))))
 
 (defun article-date-local (&optional highlight)
   "Convert the current article date to the local timezone."
@@ -2797,7 +2798,7 @@ This format is defined by the `gnus-article-time-format' variable."
 			 (car (push result file-name-history)))))))
 	       ;; Create the directory.
 	       (gnus-make-directory (file-name-directory file))
-      ;; If we have read a directory, we append the default file name.
+	       ;; If we have read a directory, we append the default file name.
 	       (when (file-directory-p file)
 		 (setq file (expand-file-name (file-name-nondirectory
 					       default-name)
@@ -3070,14 +3071,14 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 	       gfunc (intern (format "gnus-%s" func))))
        (defalias gfunc
 	 (if (fboundp afunc)
-	   `(lambda (&optional interactive &rest args)
-	      ,(documentation afunc t)
-	      (interactive (list t))
-	      (save-excursion
-		(set-buffer gnus-article-buffer)
-		(if interactive
-		    (call-interactively ',afunc)
-		  (apply ',afunc args))))))))
+	     `(lambda (&optional interactive &rest args)
+		,(documentation afunc t)
+		(interactive (list t))
+		(save-excursion
+		  (set-buffer gnus-article-buffer)
+		  (if interactive
+		      (call-interactively ',afunc)
+		    (apply ',afunc args))))))))
    '(article-hide-headers
      article-verify-x-pgp-sig
      article-hide-boring-headers
@@ -3718,24 +3719,24 @@ value of the variable `gnus-show-mime' is non-nil."
       (set-buffer gnus-summary-buffer)
       (gnus-article-edit-article
        `(lambda ()
-	   (erase-buffer)
-	   (let ((mail-parse-charset (or gnus-article-charset
-					 ',gnus-newsgroup-charset))
-		 (mail-parse-ignored-charsets
-		  (or gnus-article-ignored-charsets
-		      ',gnus-newsgroup-ignored-charsets))
-		 (mbl mml-buffer-list))
-	     (setq mml-buffer-list nil)
-	     (insert-buffer gnus-original-article-buffer)
-	     (mime-to-mml gnus-article-mime-handles)
-	     (setq gnus-article-mime-handles nil)
-	     (let ((mbl1 mml-buffer-list))
-	       (setq mml-buffer-list mbl)
-	       (set (make-local-variable 'mml-buffer-list) mbl1))
-	     ;; LOCAL argument of add-hook differs between GNU Emacs
-	     ;; and XEmacs. make-local-hook makes sure they are local.
-	     (make-local-hook 'kill-buffer-hook)
-	     (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t)))
+	  (erase-buffer)
+	  (let ((mail-parse-charset (or gnus-article-charset
+					',gnus-newsgroup-charset))
+		(mail-parse-ignored-charsets
+		 (or gnus-article-ignored-charsets
+		     ',gnus-newsgroup-ignored-charsets))
+		(mbl mml-buffer-list))
+	    (setq mml-buffer-list nil)
+	    (insert-buffer gnus-original-article-buffer)
+	    (mime-to-mml gnus-article-mime-handles)
+	    (setq gnus-article-mime-handles nil)
+	    (let ((mbl1 mml-buffer-list))
+	      (setq mml-buffer-list mbl)
+	      (set (make-local-variable 'mml-buffer-list) mbl1))
+	    ;; LOCAL argument of add-hook differs between GNU Emacs
+	    ;; and XEmacs. make-local-hook makes sure they are local.
+	    (make-local-hook 'kill-buffer-hook)
+	    (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t)))
        `(lambda (no-highlight)
 	  (let ((mail-parse-charset (or gnus-article-charset
 					',gnus-newsgroup-charset))
@@ -3744,11 +3745,11 @@ value of the variable `gnus-show-mime' is non-nil."
 		(mail-parse-ignored-charsets
 		 (or gnus-article-ignored-charsets
 		     ',gnus-newsgroup-ignored-charsets)))
-	   (mml-to-mime)
-	   (mml-destroy-buffers)
-	   (remove-hook 'kill-buffer-hook
-			'mml-destroy-buffers t)
-	   (kill-local-variable 'mml-buffer-list))
+	    (mml-to-mime)
+	    (mml-destroy-buffers)
+	    (remove-hook 'kill-buffer-hook
+			 'mml-destroy-buffers t)
+	    (kill-local-variable 'mml-buffer-list))
 	  (gnus-summary-edit-article-done
 	   ,(or (mail-header-references gnus-current-headers) "")
 	   ,(gnus-group-read-only-p)
@@ -3889,7 +3890,7 @@ specified charset."
 	     (or (cdr (assq arg
 			    gnus-summary-show-article-charset-alist))
 		 (mm-read-coding-system "Charset: ")))
-	  (gnus-newsgroup-ignored-charsets 'gnus-all))
+	    (gnus-newsgroup-ignored-charsets 'gnus-all))
 	(gnus-article-press-button)))))
 
 (defun gnus-mime-externalize-part (&optional handle)
@@ -5657,7 +5658,7 @@ specified by `gnus-button-alist'."
       (setq cur (car pairs)
 	    pairs (cdr pairs))
       (if (not (string-match "=" cur))
-	  nil                           ; Grace
+	  nil				; Grace
 	(setq key (gnus-url-unhex-string (substring cur 0 (match-beginning 0)))
 	      val (gnus-url-unhex-string (substring cur (match-end 0) nil)))
 	(if downcase
@@ -5854,7 +5855,7 @@ For example:
 			 (string-match (car x) gnus-newsgroup-name))
 		    (nconc gnus-decode-header-methods-cache
 			   (list (cdr x))))))
-	  gnus-decode-header-methods))
+	    gnus-decode-header-methods))
   (let ((xlist gnus-decode-header-methods-cache))
     (pop xlist)
     (save-restriction
@@ -5983,7 +5984,7 @@ For example:
 	    (error "The current newsgroup does not support article encrypt"))
 	  (gnus-summary-show-article t)
 	  (setq references
-	      (or (mail-header-references gnus-current-headers) ""))
+		(or (mail-header-references gnus-current-headers) ""))
 	  (set-buffer gnus-article-buffer)
 	  (let* ((buffer-read-only nil)
 		 (headers
@@ -6089,7 +6090,7 @@ For example:
 	    (let ((gnus-mime-security-button-pressed t)
 		  (gnus-mime-security-button-line-format
 		   (get-text-property (point) 'gnus-line-format))
-		buffer-read-only)
+		  buffer-read-only)
 	      (forward-char -1)
 	      (while (eq (get-text-property (point) 'gnus-line-format)
 			 gnus-mime-security-button-line-format)
@@ -6098,8 +6099,8 @@ For example:
 	      (delete-region (point)
 			     (or (text-property-not-all
 				  (point) (point-max)
-				'gnus-line-format
-				gnus-mime-security-button-line-format)
+				  'gnus-line-format
+				  gnus-mime-security-button-line-format)
 				 (point-max)))
 	      (gnus-insert-mime-security-button handle))
 	  (if (gnus-buffer-live-p gnus-mime-security-details-buffer)
diff --git a/lisp/gnus-audio.el b/lisp/gnus-audio.el
index 8906745..daa5cf4 100644
--- a/lisp/gnus-audio.el
+++ b/lisp/gnus-audio.el
@@ -99,12 +99,12 @@
 		      (expand-file-name file gnus-audio-directory))))
     (when (file-exists-p sound-file)
       (cond ((and gnus-audio-inline-sound
-		 (condition-case nil
-		     ;; Even if we have audio, we may fail with the
-		     ;; wrong sort of sound file.
-		     (progn (play-sound-file sound-file)
-			    t)
-		   (error nil))))
+		  (condition-case nil
+		      ;; Even if we have audio, we may fail with the
+		      ;; wrong sort of sound file.
+		      (progn (play-sound-file sound-file)
+			     t)
+		    (error nil))))
 	    ;; If we don't have built-in sound, or playing it failed,
 	    ;; try with external program.
 	    ((equal "wav" (file-name-extension sound-file))
diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el
index 0af0435..1bd2cdc 100644
--- a/lisp/gnus-bbdb.el
+++ b/lisp/gnus-bbdb.el
@@ -103,7 +103,7 @@ This buffer will be in bbdb-mode, with associated keybindings."
   (let ((record (gnus-bbdb/update-record t)))
     (if record
 	(bbdb-display-records (list record))
-	(error "unperson"))))
+      (error "unperson"))))
 
 
 (defun gnus-bbdb/pop-up-bbdb-buffer (&optional offer-to-create)
@@ -336,7 +336,8 @@ strings.  In the future this should change."
 	 (name (car data))
 	 (net (car (cdr data)))
 	 (record (and data
-		      (bbdb-search-simple name
+		      (bbdb-search-simple
+		       name
 		       (if (and net bbdb-canonicalize-net-hook)
 			   (bbdb-canonicalize-address net)
 			 net))))
@@ -357,22 +358,22 @@ strings.  In the future this should change."
 			    net)
 		       name))
 	      net from "**UNKNOWN**"))
-      ;; GNUS can't cope with extra square-brackets appearing in the summary.
-      (if (and name (string-match "[][]" name))
-	  (progn (setq name (copy-sequence name))
-		 (while (string-match "[][]" name)
-		   (aset name (match-beginning 0) ? ))))
-      (setq string (format "%s%3d:%s"
-			   (if (and record gnus-bbdb/summary-mark-known-posters)
-			       (or (bbdb-record-getprop
-				    record bbdb-message-marker-field)
-				   "*")
-			     " ")
-			   lines (or name from))
-	    L (length string))
-      (cond ((> L length) (substring string 0 length))
-	    ((< L length) (concat string (make-string (- length L) ? )))
-	    (t string))))
+    ;; GNUS can't cope with extra square-brackets appearing in the summary.
+    (if (and name (string-match "[][]" name))
+	(progn (setq name (copy-sequence name))
+	       (while (string-match "[][]" name)
+		 (aset name (match-beginning 0) ? ))))
+    (setq string (format "%s%3d:%s"
+			 (if (and record gnus-bbdb/summary-mark-known-posters)
+			     (or (bbdb-record-getprop
+				  record bbdb-message-marker-field)
+				 "*")
+			   " ")
+			 lines (or name from))
+	  L (length string))
+    (cond ((> L length) (substring string 0 length))
+	  ((< L length) (concat string (make-string (- length L) ? )))
+	  (t string))))
 
 (defun gnus-bbdb/summary-get-author (header)
   "Given a Gnus message header, returns the appropriate piece of
@@ -393,7 +394,8 @@ This function is meant to be used with the user function defined in
 	 (name (car data))
 	 (net (car (cdr data)))
 	 (record (and data
-		      (bbdb-search-simple name
+		      (bbdb-search-simple
+		       name
 		       (if (and net bbdb-canonicalize-net-hook)
 			   (bbdb-canonicalize-address net)
 			 net)))))
@@ -486,12 +488,12 @@ field.  This allows the BBDB to serve as a supplemental global score
 file, with the advantage that it can keep up with multiple and changing
 addresses better than the traditionally static global scorefile."
   (list (list
-   (condition-case nil
-       (read (gnus-bbdb/score-as-text group))
-     (error (setq gnus-bbdb/score-rebuild-alist t)
-	    (message "Problem building BBDB score table.")
-	    (ding) (sit-for 2)
-	    nil)))))
+	 (condition-case nil
+	     (read (gnus-bbdb/score-as-text group))
+	   (error (setq gnus-bbdb/score-rebuild-alist t)
+		  (message "Problem building BBDB score table.")
+		  (ding) (sit-for 2)
+		  nil)))))
 
 (defun gnus-bbdb/score-as-text (group)
   "Returns a SCORE file format string built from the BBDB."
@@ -500,24 +502,25 @@ addresses better than the traditionally static global scorefile."
 		    (setq gnus-bbdb/score-default-internal
 			  gnus-bbdb/score-default)
 		    t))
-	    (not gnus-bbdb/score-alist)
-	    gnus-bbdb/score-rebuild-alist)
-    (setq gnus-bbdb/score-rebuild-alist nil)
-    (setq gnus-bbdb/score-alist
-	  (concat "((touched nil) (\"from\"\n"
-		  (mapconcat
-		   (lambda (rec)
-		     (let ((score (or (bbdb-record-getprop rec
-							   gnus-bbdb/score-field)
-				      gnus-bbdb/score-default))
-			   (net (bbdb-record-net rec)))
-		       (if (not (and score net)) nil
-			 (mapconcat
-			  (lambda (addr)
-			    (concat "(\"" addr "\" " score ")\n"))
-			  net ""))))
-		   (bbdb-records) "")
-		  "))"))))
+	     (not gnus-bbdb/score-alist)
+	     gnus-bbdb/score-rebuild-alist)
+	 (setq gnus-bbdb/score-rebuild-alist nil)
+	 (setq gnus-bbdb/score-alist
+	       (concat "((touched nil) (\"from\"\n"
+		       (mapconcat
+			(lambda (rec)
+			  (let ((score (or (bbdb-record-getprop
+					    rec
+					    gnus-bbdb/score-field)
+					   gnus-bbdb/score-default))
+				(net (bbdb-record-net rec)))
+			    (if (not (and score net)) nil
+			      (mapconcat
+			       (lambda (addr)
+				 (concat "(\"" addr "\" " score ")\n"))
+			       net ""))))
+			(bbdb-records) "")
+		       "))"))))
   gnus-bbdb/score-alist)
 
 (defun gnus-bbdb/extract-field-value-init ()
diff --git a/lisp/gnus-bcklg.el b/lisp/gnus-bcklg.el
index 3fca805..b04a47c 100644
--- a/lisp/gnus-bcklg.el
+++ b/lisp/gnus-bcklg.el
@@ -69,10 +69,10 @@
 	  b)
       (if (memq ident gnus-backlog-articles)
 	  ()				; It's already kept.
-      ;; Remove the oldest article, if necessary.
+	;; Remove the oldest article, if necessary.
 	(and (numberp gnus-keep-backlog)
 	     (>= (length gnus-backlog-articles) gnus-keep-backlog)
-	   (gnus-backlog-remove-oldest-article))
+	     (gnus-backlog-remove-oldest-article))
 	(push ident gnus-backlog-articles)
 	;; Insert the new article.
 	(save-excursion
@@ -85,7 +85,7 @@
 	    (insert-buffer-substring buffer)
 	    ;; Tag the beginning of the article with the ident.
 	    (if (> (point-max) b)
-	      (gnus-put-text-property b (1+ b) 'gnus-backlog ident)
+		(gnus-put-text-property b (1+ b) 'gnus-backlog ident)
 	      (gnus-error 3 "Article %d is blank" number))))))))
 
 (defun gnus-backlog-remove-oldest-article ()
diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 4fd933b..f3d93a6 100644
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -486,8 +486,8 @@ Returns the list of articles removed."
 		      ?. ?_)))
 	  ;; Translate the first colon into a slash.
 	  (when (string-match ":" group)
-		  (setq group (concat (substring group 0 (match-beginning 0))
-				      "/" (substring group (match-end 0)))))
+	    (setq group (concat (substring group 0 (match-beginning 0))
+				"/" (substring group (match-end 0)))))
 	  (nnheader-replace-chars-in-string group ?. ?/)))
       t)
      gnus-cache-directory))))
diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 2a593c7..657313b 100644
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -465,63 +465,63 @@ always hide."
   (gnus-set-format 'cited-closed-text-button t)
   (save-excursion
     (set-buffer gnus-article-buffer)
-      (let ((buffer-read-only nil)
-	    marks
-	    (inhibit-point-motion-hooks t)
-	    (props (nconc (list 'article-type 'cite)
-			  gnus-hidden-properties))
-	    (point (point-min))
-	    found beg end start)
-	(while (setq point
-		     (text-property-any point (point-max)
-					'gnus-callback
-					'gnus-article-toggle-cited-text))
-	  (setq found t)
-	  (goto-char point)
-	  (gnus-article-toggle-cited-text
-	   (get-text-property point 'gnus-data) arg)
-	  (forward-line 1)
-	  (setq point (point)))
-	(unless found
-	  (setq marks (gnus-dissect-cited-text))
-	  (while marks
-	    (setq beg nil
-		  end nil)
-	    (while (and marks (string= (cdar marks) ""))
-	      (setq marks (cdr marks)))
-	    (when marks
-	      (setq beg (caar marks)))
-	    (while (and marks (not (string= (cdar marks) "")))
-	      (setq marks (cdr marks)))
-	    (when marks
+    (let ((buffer-read-only nil)
+	  marks
+	  (inhibit-point-motion-hooks t)
+	  (props (nconc (list 'article-type 'cite)
+			gnus-hidden-properties))
+	  (point (point-min))
+	  found beg end start)
+      (while (setq point
+		   (text-property-any point (point-max)
+				      'gnus-callback
+				      'gnus-article-toggle-cited-text))
+	(setq found t)
+	(goto-char point)
+	(gnus-article-toggle-cited-text
+	 (get-text-property point 'gnus-data) arg)
+	(forward-line 1)
+	(setq point (point)))
+      (unless found
+	(setq marks (gnus-dissect-cited-text))
+	(while marks
+	  (setq beg nil
+		end nil)
+	  (while (and marks (string= (cdar marks) ""))
+	    (setq marks (cdr marks)))
+	  (when marks
+	    (setq beg (caar marks)))
+	  (while (and marks (not (string= (cdar marks) "")))
+	    (setq marks (cdr marks)))
+	  (when marks
 	    (setq end (caar marks)))
-	    ;; Skip past lines we want to leave visible.
-	    (when (and beg end gnus-cited-lines-visible)
-	      (goto-char beg)
-	      (forward-line (if (consp gnus-cited-lines-visible)
-				(car gnus-cited-lines-visible)
-			      gnus-cited-lines-visible))
-	      (if (>= (point) end)
-		  (setq beg nil)
-		(setq beg (point-marker))
-		(when (consp gnus-cited-lines-visible)
-		  (goto-char end)
-		  (forward-line (- (cdr gnus-cited-lines-visible)))
-		  (if (<= (point) beg)
-		      (setq beg nil)
+	  ;; Skip past lines we want to leave visible.
+	  (when (and beg end gnus-cited-lines-visible)
+	    (goto-char beg)
+	    (forward-line (if (consp gnus-cited-lines-visible)
+			      (car gnus-cited-lines-visible)
+			    gnus-cited-lines-visible))
+	    (if (>= (point) end)
+		(setq beg nil)
+	      (setq beg (point-marker))
+	      (when (consp gnus-cited-lines-visible)
+		(goto-char end)
+		(forward-line (- (cdr gnus-cited-lines-visible)))
+		(if (<= (point) beg)
+		    (setq beg nil)
 		  (setq end (point-marker))))))
-	    (when (and beg end)
-	      ;; We use markers for the end-points to facilitate later
-	      ;; wrapping and mangling of text.
-	      (setq beg (set-marker (make-marker) beg)
-		    end (set-marker (make-marker) end))
-	      (gnus-add-text-properties-when 'article-type nil beg end props)
-	      (goto-char beg)
-	      (unless (save-excursion (search-backward "\n\n" nil t))
-		(insert "\n"))
-	      (put-text-property
-	       (setq start (point-marker))
-	       (progn
+	  (when (and beg end)
+	    ;; We use markers for the end-points to facilitate later
+	    ;; wrapping and mangling of text.
+	    (setq beg (set-marker (make-marker) beg)
+		  end (set-marker (make-marker) end))
+	    (gnus-add-text-properties-when 'article-type nil beg end props)
+	    (goto-char beg)
+	    (unless (save-excursion (search-backward "\n\n" nil t))
+	      (insert "\n"))
+	    (put-text-property
+	     (setq start (point-marker))
+	     (progn
 	       (gnus-article-add-button
 		(point)
 		(progn (eval gnus-cited-closed-text-button-line-format-spec)
@@ -529,8 +529,8 @@ always hide."
 		`gnus-article-toggle-cited-text
 		(list (cons beg end) start))
 	       (point))
-	       'article-type 'annotation)
-	      (set-marker beg (point))))))))
+	     'article-type 'annotation)
+	    (set-marker beg (point))))))))
 
 (defun gnus-article-toggle-cited-text (args &optional arg)
   "Toggle hiding the text in REGION.
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 64be543..f395607 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -341,7 +341,7 @@ variable."
     ((and (= unread 0)) .
      gnus-group-news-low-empty-face)
     (t .
-     gnus-group-news-low-face))
+       gnus-group-news-low-face))
   "*Controls the highlighting of group buffer lines.
 
 Below is a list of `Form'/`Face' pairs.  When deciding how a a
@@ -737,7 +737,7 @@ simple manner.")
 	(gnus-group-group-name)]
        ["Kill" gnus-group-kill-group :active (gnus-group-group-name)
 	,@(if (featurep 'xemacs) nil
-	      '(:help "Kill (remove) current group"))]
+	    '(:help "Kill (remove) current group"))]
        ["Yank" gnus-group-yank-group gnus-list-of-killed-groups]
        ["Describe" gnus-group-describe-group :active (gnus-group-group-name)
 	,@(if (featurep 'xemacs) nil
@@ -3552,7 +3552,7 @@ This command may read the active file."
 	     (> (prefix-numeric-value level) gnus-level-killed))
     (gnus-get-killed-groups))
   (funcall gnus-group-prepare-function
-   (or level gnus-level-subscribed) (and all t) (or lowest 1) regexp)
+	   (or level gnus-level-subscribed) (and all t) (or lowest 1) regexp)
   (goto-char (point-min))
   (gnus-group-position-point))
 
@@ -3690,8 +3690,8 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting."
     (gnus-configure-windows 'group t)
     (when (and (gnus-buffer-live-p gnus-dribble-buffer)
 	       (not (zerop (save-excursion
-			    (set-buffer gnus-dribble-buffer)
-			    (buffer-size)))))
+			     (set-buffer gnus-dribble-buffer)
+			     (buffer-size)))))
       (gnus-dribble-enter
        ";;; Gnus was exited on purpose without saving the .newsrc files."))
     (gnus-dribble-save)
diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index df35f7a..9c9919f 100644
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -381,7 +381,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus
 		 (file-regular-p fname))
 	    (mailcap-parse-mailcap fname))
 	(setq fnames (cdr fnames))))
-      (setq mailcap-parsed-p t)))
+    (setq mailcap-parsed-p t)))
 
 (defun mailcap-parse-mailcap (fname)
   "Parse out the mailcap file specified by FNAME."
@@ -636,7 +636,7 @@ to supply to the test."
 	(setq mailcap-mime-data
 	      (cons (cons major (list (cons minor info)))
 		    mailcap-mime-data))
-       (let ((cur-minor (assoc minor old-major)))
+      (let ((cur-minor (assoc minor old-major)))
 	(cond
 	 ((or (null cur-minor)		; New minor area, or
 	      (assq 'test info))	; Has a test, insert at beginning
@@ -749,7 +749,7 @@ this type is returned."
 ;;;
 
 (defvar mailcap-mime-extensions
-  '((""        . "text/plain")
+  '((""       . "text/plain")
     (".abs"   . "audio/x-mpeg")
     (".aif"   . "audio/aiff")
     (".aifc"  . "audio/aiff")
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 3955179..b74b1ca 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -127,18 +127,20 @@ nil (always encode using quoted-printable) or t (always use 8bit).
 Note that any value other than nil for HEADER infringes some RFCs, so
 use this option with care."
   :type '(repeat (list :tag "Permitted unencoded charsets"
-		  (choice :tag "Where"
-		   (regexp :tag "Group")
-		   (const :tag "Mail message" :value message-this-is-mail)
-		   (const :tag "News article" :value message-this-is-news))
-		  (choice :tag "Header"
-		   (const :tag "None" nil)
-		   (symbol :tag "Charset"))
-		  (choice :tag "Body"
-			  (const :tag "Any" :value t)
-			  (const :tag "None" :value nil)
-			  (repeat :tag "Charsets"
-				  (symbol :tag "Charset")))))
+		       (choice :tag "Where"
+			       (regexp :tag "Group")
+			       (const :tag "Mail message"
+				      :value message-this-is-mail)
+			       (const :tag "News article"
+				      :value message-this-is-news))
+		       (choice :tag "Header"
+			       (const :tag "None" nil)
+			       (symbol :tag "Charset"))
+		       (choice :tag "Body"
+			       (const :tag "Any" :value t)
+			       (const :tag "None" :value nil)
+			       (repeat :tag "Charsets"
+				       (symbol :tag "Charset")))))
   :group 'gnus-charset)
 
 ;;; Internal variables.
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index e0d1d83..fd97d06 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -101,7 +101,7 @@
 ;;  "A matter of trust"
 ;;  "Modern Woman"
 ;;  "Ahhhhhhh!!"		; 2.10b1
-  "Cup of life"                 ; 2.20
+  "Cup of life"			; 2.20
 ;;  "Code of silence"
   )
 
@@ -515,7 +515,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; fetch only mail for gnus-agent
   (if (and (eq gnus-offline-news-fetch-method 'nnagent)
 	   (eq gnus-offline-articles-to-fetch 'mail))
-	  (setq gnus-agent-handle-level gnus-offline-mail-group-level)))
+      (setq gnus-agent-handle-level gnus-offline-mail-group-level)))
 
 ;;
 ;; Change mail group level to handle only mail.
@@ -618,8 +618,8 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 		    nnagent-version
 		  nnspool-version))
 	   (str (format "\n                        with %s" ver)))
-    (gnus-offline-add-custom-header
-     "X-Gnus-Offline-Backend:" (concat gnus-offline-header-string str)))))
+      (gnus-offline-add-custom-header
+       "X-Gnus-Offline-Backend:" (concat gnus-offline-header-string str)))))
 
 
 ;;
diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 8f4d55f..4125f8a 100644
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -629,7 +629,7 @@ mail source specifier とか上記のようなキーワードについてもっとよく
      (choice :tag ,(gnus-ofsetup-gettext 'param-save-passwd-1)
 	     :value ,(if (memq 'mail-source-password-cache gnus-variable-list)
 			 t
-			 nil)
+		       nil)
 	     (const :tag ,(gnus-ofsetup-gettext 'param-save-passwd-2) t)
 	     (const :tag ,(gnus-ofsetup-gettext 'param-save-passwd-3) nil))
      ,(gnus-ofsetup-gettext 'param-save-passwd-4))
@@ -651,36 +651,36 @@ mail source specifier とか上記のようなキーワードについてもっとよく
 				   (const :format "" ,(nth 0 entry))
 				   ,(nth 1 entry)))
 			params)))
-  (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
-  (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
-  (gnus-custom-mode)
-  (widget-insert (gnus-ofsetup-gettext 'customize-1))
-  (widget-create 'push-button
+    (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+    (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+    (gnus-custom-mode)
+    (widget-insert (gnus-ofsetup-gettext 'customize-1))
+    (widget-create 'push-button
 		   :tag (gnus-ofsetup-gettext 'customize-2)
 		   :help-echo (gnus-ofsetup-gettext 'customize-3)
 		   :action 'gnus-ofsetup-customize-done)
-  (widget-insert "\n\n")
-  (make-local-variable 'gnus-ofsetup-params)
-  (setq gnus-ofsetup-params
-	(widget-create 'group
-		       `(set :inline t
-			     :greedy t
-			     :tag ,(gnus-ofsetup-gettext 'customize-4)
-			     :format "%t:\n%h%v"
-			     :doc ,(gnus-ofsetup-gettext 'customize-5)
-			     ,@types)))
-
-  (widget-create 'info-link
-		 :help-echo (gnus-ofsetup-gettext 'customize-6)
-		 :tag "<Info> mail sources"
-		 (if (string-match "^ja" gnus-offline-lang)
-		     "(gnus-ja)Mail Sources"
-		   "(gnus)Mail Sources"))
-
-  (use-local-map widget-keymap)
-  (local-set-key "q" 'bury-buffer)
-  (widget-setup)
-  (goto-char (point-min))))
+    (widget-insert "\n\n")
+    (make-local-variable 'gnus-ofsetup-params)
+    (setq gnus-ofsetup-params
+	  (widget-create 'group
+			 `(set :inline t
+			       :greedy t
+			       :tag ,(gnus-ofsetup-gettext 'customize-4)
+			       :format "%t:\n%h%v"
+			       :doc ,(gnus-ofsetup-gettext 'customize-5)
+			       ,@types)))
+
+    (widget-create 'info-link
+		   :help-echo (gnus-ofsetup-gettext 'customize-6)
+		   :tag "<Info> mail sources"
+		   (if (string-match "^ja" gnus-offline-lang)
+		       "(gnus-ja)Mail Sources"
+		     "(gnus)Mail Sources"))
+
+    (use-local-map widget-keymap)
+    (local-set-key "q" 'bury-buffer)
+    (widget-setup)
+    (goto-char (point-min))))
 
 (defun gnus-ofsetup-customize-done (&rest ignore)
   "Apply changes and bury the buffer."
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 7476aa5..f79d627 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1697,7 +1697,7 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
 	       entries alist ofunc article last)
 	  (when articles
 	    (setq last (mail-header-number (caar (last articles))))
-	  ;; Not all backends support partial fetching.  In that case,
+	    ;; Not all backends support partial fetching.  In that case,
 	    ;; we just fetch the entire article.
 	    (unless (gnus-check-backend-function
 		     (and (string-match "^gnus-" (symbol-name request-func))
@@ -1712,8 +1712,8 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
 	      (widen)
 	      (when (funcall request-func article gnus-newsgroup-name)
 		(goto-char (point-min))
-	    ;; If just parts of the article is to be searched, but the
-	    ;; backend didn't support partial fetching, we just narrow
+		;; If just parts of the article is to be searched, but the
+		;; backend didn't support partial fetching, we just narrow
 		;; to the relevant parts.
 		(when ofunc
 		  (if (eq ofunc 'gnus-request-head)
@@ -1868,7 +1868,7 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
 	    ;; Update expire date
 	    (cond ((null date))		;Permanent entry.
 		  ((and found gnus-update-score-entry-dates)
-					;Match, update date.
+		   ;Match, update date.
 		   (gnus-score-set 'touched '(t) alist)
 		   (setcar (nthcdr 2 kill) now))
 		  ((and expire (< date expire))	;Old entry, remove.
diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index b734504..1ccb572 100644
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -668,11 +668,11 @@ The following commands are available:
 				 (gnus-group-level
 				  (gnus-group-prefixed-name (car group)
 							    method)))))
-			      (cond
-			       ((<= level gnus-level-subscribed) ? )
-			       ((<= level gnus-level-unsubscribed) ?U)
-			       ((= level gnus-level-zombie) ?Z)
-			       (t ?K)))
+			  (cond
+			   ((<= level gnus-level-subscribed) ? )
+			   ((<= level gnus-level-unsubscribed) ?U)
+			   ((= level gnus-level-zombie) ?Z)
+			   (t ?K)))
 			(max 0 (- (1+ (cddr group)) (cadr group)))
 			(gnus-group-name-decode (car group) charset))))
 	     (list 'gnus-group (car group)))
@@ -839,7 +839,7 @@ buffer.
 	(gnus-get-function (gnus-server-to-method server)
 			   'request-regenerate)
       (error
-	(error "This backend doesn't support regeneration")))
+       (error "This backend doesn't support regeneration")))
     (gnus-message 5 "Requesting regeneration of %s..." server)
     (unless (gnus-open-server server)
       (error "Couldn't open server"))
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 68785da..6df184e 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -857,7 +857,7 @@ cautiously -- unloading may cause trouble."
 		    (gnus-y-or-n-p
 		     (if purpose
 			 "Gnus exited on purpose without saving; read auto-save file anyway? "
-		     "Gnus auto-save file exists.  Do you want to read it? ")))
+		       "Gnus auto-save file exists.  Do you want to read it? ")))
 	    (setq gnus-dribble-eval-file t)))))))
 
 (defun gnus-dribble-eval-file ()
@@ -2611,9 +2611,9 @@ The backup file \".newsrc.eld_\" will be created before re-reading."
     (while variables
       (when (and (boundp (setq variable (pop variables)))
 		 (symbol-value variable))
-	  (insert "(setq " (symbol-name variable) " '")
-	  (gnus-prin1 (symbol-value variable))
-	  (insert ")\n")))))
+	(insert "(setq " (symbol-name variable) " '")
+	(gnus-prin1 (symbol-value variable))
+	(insert ")\n")))))
 
 (defun gnus-strip-killed-list ()
   "Return the killed list minus the groups that match `gnus-save-killed-list'."
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 808c8c9..64d940b 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -866,10 +866,10 @@ automatically when it is selected."
     ((= mark gnus-unread-mark)
      . gnus-summary-normal-unread-face)
     ((and (> score default-high) (memq mark (list gnus-downloadable-mark
-					     gnus-undownloaded-mark)))
+						  gnus-undownloaded-mark)))
      . gnus-summary-high-unread-face)
     ((and (< score default-low) (memq mark (list gnus-downloadable-mark
-					     gnus-undownloaded-mark)))
+						 gnus-undownloaded-mark)))
      . gnus-summary-low-unread-face)
     ((and (memq mark (list gnus-downloadable-mark gnus-undownloaded-mark))
 	  (memq article gnus-newsgroup-unreads))
@@ -1943,8 +1943,8 @@ increase the score of each group you read."
 
       (if (not (keymapp gnus-summary-article-menu))
 	  (easy-menu-define
-	    gnus-article-commands-menu gnus-article-mode-map ""
-	    (cons "Commands" innards))
+	   gnus-article-commands-menu gnus-article-mode-map ""
+	   (cons "Commands" innards))
 	;; in Emacs, don't share menu.
 	(setq gnus-article-commands-menu
 	      (copy-keymap gnus-summary-article-menu))
@@ -6872,10 +6872,10 @@ article."
 		   (gnus-id-to-thread (gnus-root-id id)))))
     (prog1
 	(gnus-summary-limit (nconc articles gnus-newsgroup-limit))
-	(gnus-summary-limit-include-matching-articles
-	 "subject"
-	 (regexp-quote (gnus-simplify-subject-re
-			(mail-header-subject (gnus-id-to-header id)))))
+      (gnus-summary-limit-include-matching-articles
+       "subject"
+       (regexp-quote (gnus-simplify-subject-re
+		      (mail-header-subject (gnus-id-to-header id)))))
       (gnus-summary-position-point))))
 
 (defun gnus-summary-limit-include-matching-articles (header regexp)
@@ -7991,7 +7991,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 	 (error "The current group does not support article editing")))
   (let ((articles (gnus-summary-work-articles n))
 	(prefix (if (gnus-check-backend-function
-		    'request-move-article gnus-newsgroup-name)
+		     'request-move-article gnus-newsgroup-name)
 		    (gnus-group-real-prefix gnus-newsgroup-name)
 		  ""))
 	(names '((move "Move" "Moving")
@@ -8671,8 +8671,8 @@ number of articles marked is returned."
       (while (and
 	      (> n 0)
 	      (if unmark
-		(gnus-summary-remove-process-mark
-		 (gnus-summary-article-number))
+		  (gnus-summary-remove-process-mark
+		   (gnus-summary-article-number))
 		(gnus-summary-set-process-mark (gnus-summary-article-number)))
 	      (zerop (gnus-summary-next-subject (if backward -1 1) nil t)))
 	(setq n (1- n)))
@@ -9112,7 +9112,7 @@ The difference between N and the number of marks cleared is returned."
       (gnus-summary-mark-article gnus-current-article gnus-read-mark))))
 
 (defun gnus-summary-mark-unread-as-ticked ()
-   "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-summary-mark-article-hook'."
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))
 
@@ -10680,7 +10680,7 @@ returned."
     (when (and gnus-fetch-old-headers
 	       (eq gnus-headers-retrieved-by 'nov))
       (if (eq gnus-fetch-old-headers 'invisible)
-	(gnus-build-all-threads)
+	  (gnus-build-all-threads)
 	(gnus-build-old-threads)))
     ;; Let the Gnus agent mark articles as read.
     (when gnus-agent
diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 88dc4eb..4084abc 100644
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -419,8 +419,8 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
        regexp))
 
     (when (or gnus-group-listed-groups
-	       (and (>= level gnus-level-killed)
-		    (<= lowest gnus-level-killed)))
+	      (and (>= level gnus-level-killed)
+		   (<= lowest gnus-level-killed)))
       (gnus-group-prepare-flat-list-dead
        (setq gnus-killed-list (sort gnus-killed-list 'string<))
        gnus-level-killed ?K regexp)
diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index e77393a..07819de 100644
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -167,8 +167,8 @@
 	       (article 0.5)
 	       (message 1.0 point)))
     (display-term
-      (vertical 1.0
-		("*display*" 1.0))))
+     (vertical 1.0
+	       ("*display*" 1.0))))
   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 
diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 9e24273..f691cb7 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -466,11 +466,11 @@ call it with the value of the `gnus-data' text property."
   (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
   (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
   (defalias 'gnus-appt-select-lowest-window
-	'gnus-xmas-appt-select-lowest-window)
+    'gnus-xmas-appt-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'character-to-event)
   (defalias 'gnus-mode-line-buffer-identification
-	'gnus-xmas-mode-line-buffer-identification)
+    'gnus-xmas-mode-line-buffer-identification)
   (defalias 'gnus-key-press-event-p 'key-press-event-p)
   (defalias 'gnus-region-active-p 'region-active-p)
   (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
@@ -958,7 +958,7 @@ XEmacs compatibility workaround."
 
 (defun gnus-xmas-mailing-list-menu-add ()
   (gnus-xmas-menu-add mailing-list
-		      gnus-mailing-list-menu))
+    gnus-mailing-list-menu))
 
 (provide 'gnus-xmas)
 
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 59a0eea..0d64fa9 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1231,9 +1231,9 @@ If the default site is too slow, try one of these:
 		  ftp.seas.gwu.edu		 /pub/rtfm
 		  rtfm.mit.edu			 /pub/usenet
    Europe:	  ftp.uni-paderborn.de		 /pub/FAQ
-		  src.doc.ic.ac.uk               /usenet/news-FAQS
+		  src.doc.ic.ac.uk		 /usenet/news-FAQS
 		  ftp.sunet.se			 /pub/usenet
-	          sunsite.auc.dk                 /pub/usenet
+		  sunsite.auc.dk		 /pub/usenet
    Asia:	  nctuccca.edu.tw		 /USENET/FAQ
 		  hwarang.postech.ac.kr		 /pub/usenet
 		  ftp.hk.super.net		 /mirror/faqs"
@@ -1510,9 +1510,9 @@ to be desirable; see the manual for further details."
  :function-document
  "Return GROUP's to-address."
  :variable-document
-  "*Alist of group regexps and correspondent to-addresses."
-  :parameter-type '(gnus-email-address :tag "To Address")
-  :parameter-document "\
+ "*Alist of group regexps and correspondent to-addresses."
+ :parameter-type '(gnus-email-address :tag "To Address")
+ :parameter-document "\
 This will be used when doing followups and posts.
 
 This is primarily useful in mail groups that represent closed
@@ -1557,15 +1557,15 @@ address was listed in gnus-group-split Addresses (see below).")
  :variable gnus-auto-expirable-newsgroups
  :variable-default nil
  :variable-document
-  "*Groups in which to automatically mark read articles as expirable.
+ "*Groups in which to automatically mark read articles as expirable.
 If non-nil, this should be a regexp that should match all groups in
 which to perform auto-expiry.  This only makes sense for mail groups."
-  :variable-group nnmail-expire
-  :variable-type '(choice (const nil)
-			  regexp)
-  :parameter-type '(const :tag "Automatic Expire" t)
-  :parameter-document
-  "All articles that are read will be marked as expirable.")
+ :variable-group nnmail-expire
+ :variable-type '(choice (const nil)
+			 regexp)
+ :parameter-type '(const :tag "Automatic Expire" t)
+ :parameter-document
+ "All articles that are read will be marked as expirable.")
 
 (gnus-define-group-parameter
  total-expire
@@ -1581,12 +1581,12 @@ Use with extreme caution.  All groups that match this regexp will be
 expiring - which means that all read articles will be deleted after
 \(say) one week.	 (This only goes for mail groups and the like, of
 course.)"
-  :variable-group nnmail-expire
-  :variable-type '(choice (const nil)
-			  regexp)
-  :parameter-type '(const :tag "Total Expire" t)
-  :parameter-document
-  "All read articles will be put through the expiry process
+ :variable-group nnmail-expire
+ :variable-type '(choice (const nil)
+			 regexp)
+ :parameter-type '(const :tag "Total Expire" t)
+ :parameter-document
+ "All read articles will be put through the expiry process
 
 This happens even if they are not marked as expirable.
 Use with caution.")
@@ -1611,12 +1611,12 @@ Use with caution.")
    ("\\(^\\|:\\)\\(comp\\|rec\\|alt\\|sci\\|soc\\|news\\|gnu\\|bofh\\)\\>" iso-8859-1)
    (".*" iso-8859-1))
  :variable-document
-  "Alist of regexps (to match group names) and default charsets to be used when reading."
-  :variable-group gnus-charset
-  :variable-type '(repeat (list (regexp :tag "Group")
-				(symbol :tag "Charset")))
-  :parameter-type '(symbol :tag "Charset")
-  :parameter-document "\
+ "Alist of regexps (to match group names) and default charsets to be used when reading."
+ :variable-group gnus-charset
+ :variable-type '(repeat (list (regexp :tag "Group")
+			       (symbol :tag "Charset")))
+ :parameter-type '(symbol :tag "Charset")
+ :parameter-document "\
 The default charset to use in the group.")
 
 (defcustom gnus-group-uncollapsed-levels 1
diff --git a/lisp/imap.el b/lisp/imap.el
index 592a035..d171c23 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -606,7 +606,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	(progn
 	  (message "imap: Opening SSL connection with `%s'...done" cmd)
 	  done)
-	  (message "imap: Opening SSL connection with `%s'...failed" cmd)
+      (message "imap: Opening SSL connection with `%s'...failed" cmd)
       nil)))
 
 (defun imap-network-p (buffer)
@@ -1862,13 +1862,13 @@ Return nil if no complete line has arrived."
 ;;   resp-cond-bye   = "BYE" SP resp-text
 ;;
 ;;   mailbox-data    =  "FLAGS" SP flag-list /
-;;		        "LIST" SP mailbox-list /
+;;                      "LIST" SP mailbox-list /
 ;;                      "LSUB" SP mailbox-list /
-;;		        "SEARCH" *(SP nz-number) /
+;;                      "SEARCH" *(SP nz-number) /
 ;;                      "STATUS" SP mailbox SP "("
-;;	                      [status-att SP number *(SP status-att SP number)] ")" /
+;;                            [status-att SP number *(SP status-att SP number)] ")" /
 ;;                      number SP "EXISTS" /
-;;		        number SP "RECENT"
+;;                      number SP "RECENT"
 ;;
 ;;   message-data    = nz-number SP ("EXPUNGE" / ("FETCH" SP msg-att))
 ;;
@@ -1958,14 +1958,14 @@ Return nil if no complete line has arrived."
 ;;   resp-text-code  = "ALERT" /
 ;;                     "BADCHARSET [SP "(" astring *(SP astring) ")" ] /
 ;;                     "NEWNAME" SP string SP string /
-;;		       "PARSE" /
+;;                     "PARSE" /
 ;;                     "PERMANENTFLAGS" SP "("
 ;;                               [flag-perm *(SP flag-perm)] ")" /
 ;;                     "READ-ONLY" /
-;;		       "READ-WRITE" /
-;;		       "TRYCREATE" /
+;;                     "READ-WRITE" /
+;;                     "TRYCREATE" /
 ;;                     "UIDNEXT" SP nz-number /
-;;		       "UIDVALIDITY" SP nz-number /
+;;                     "UIDVALIDITY" SP nz-number /
 ;;                     "UNSEEN" SP nz-number /
 ;;                     resp-text-atom [SP 1*<any TEXT-CHAR except "]">]
 ;;
@@ -2170,7 +2170,7 @@ Return nil if no complete line has arrived."
 
 ;;   mailbox-data    =  ...
 ;;                      "STATUS" SP mailbox SP "("
-;;	                      [status-att SP number
+;;                            [status-att SP number
 ;;                            *(SP status-att SP number)] ")"
 ;;                      ...
 ;;
diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index ebee4e9..18adf81 100644
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -47,12 +47,12 @@
   (eval-when-compile
     (mapcar (lambda (a)
 	      (list 'const (car a)))
-     imap-authenticator-alist)))
+	    imap-authenticator-alist)))
 (defconst mail-source-imap-streams
   (eval-when-compile
     (mapcar (lambda (a)
 	      (list 'const (car a)))
-     imap-stream-alist)))
+	    imap-stream-alist)))
 
 (defcustom mail-sources nil
   "*Where the mail backends will look for incoming mail.
@@ -192,17 +192,17 @@ See Info node `(gnus)Mail Source Specifiers'."
 			(const :format "" webmail)
 			(checklist :tag "Options" :greedy t
 				   (group :inline t
-					 (const :format "" :value :subtype)
-					 ;; Should be generated from
-					 ;; `webmail-type-definition', but we
-					 ;; can't require webmail without W3.
-					 (choice :tag "Subtype"
-						 :value hotmail
-						 (const hotmail)
-						 (const yahoo)
-						 (const netaddress)
-						 (const netscape)
-						 (const my-deja)))
+					  (const :format "" :value :subtype)
+					  ;; Should be generated from
+					  ;; `webmail-type-definition', but we
+					  ;; can't require webmail without W3.
+					  (choice :tag "Subtype"
+						  :value hotmail
+						  (const hotmail)
+						  (const yahoo)
+						  (const netaddress)
+						  (const netscape)
+						  (const my-deja)))
 				   (group :inline t
 					  (const :format "" :value :user)
 					  (string :tag "User"))
@@ -841,13 +841,13 @@ This only works when `display-time' is enabled."
 				(with-temp-file mail-source-crash-box
 				  (insert-file-contents file)
 				  (goto-char (point-min))
-;;;                               ;; Unix mail format
+;;;				  ;; Unix mail format
 ;;;				  (unless (looking-at "\n*From ")
 ;;;				    (insert "From maildir "
 ;;;					    (current-time-string) "\n"))
 ;;;				  (while (re-search-forward "^From " nil t)
 ;;;				    (replace-match ">From "))
-;;;                               (goto-char (point-max))
+;;;				  (goto-char (point-max))
 ;;;				  (insert "\n\n")
 				  ;; MMDF mail format
 				  (insert "\001\001\001\001\n"))
diff --git a/lisp/message.el b/lisp/message.el
index 2483196..5764e60 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2101,7 +2101,7 @@ Prefix arg means justify as well."
     (if not-break
 	(while (and (not (eobp))
 		    (not (looking-at message-cite-prefix-regexp))
-		(looking-at paragraph-start))
+		    (looking-at paragraph-start))
 	  (forward-line 1)))
     ;; Find the prefix
     (when (looking-at message-cite-prefix-regexp)
@@ -2164,7 +2164,7 @@ Prefix arg means justify as well."
 	  (insert quoted leading-space)))
       (if quoted
 	  (let* ((adaptive-fill-regexp
-		 (regexp-quote (concat quoted leading-space)))
+		  (regexp-quote (concat quoted leading-space)))
 		 (adaptive-fill-first-line-regexp
 		  adaptive-fill-regexp ))
 	    (fill-paragraph arg))
@@ -3488,95 +3488,95 @@ This sub function is for exclusive use of `message-send-news'."
 	   (if (= (length errors) 1) "this" "these")
 	   (if (= (length errors) 1) "" "s")
 	   (mapconcat 'identity errors ", ")))))))
-     ;; Check the Newsgroups & Followup-To headers for syntax errors.
-     (message-check 'valid-newsgroups
-       (let ((case-fold-search t)
-	     (headers '("Newsgroups" "Followup-To"))
-	     header error)
-	 (while (and headers (not error))
-	   (when (setq header (mail-fetch-field (car headers)))
-	     (if (or
-		  (not
-		   (string-match
-		    "\\`\\([-+_&.a-zA-Z0-9]+\\)?\\(,[-+_&.a-zA-Z0-9]+\\)*\\'"
-		    header))
-		  (memq
-		   nil (mapcar
-			(lambda (g)
-			  (not (string-match "\\.\\'\\|\\.\\." g)))
-			(message-tokenize-header header ","))))
-		 (setq error t)))
-	   (unless error
-	     (pop headers)))
-	 (if (not error)
-	     t
-	   (y-or-n-p
-	    (format "The %s header looks odd: \"%s\".  Really post? "
-		    (car headers) header)))))
-     (message-check 'repeated-newsgroups
-       (let ((case-fold-search t)
-	     (headers '("Newsgroups" "Followup-To"))
-	     header error groups group)
-	 (while (and headers
-		     (not error))
-	   (when (setq header (mail-fetch-field (pop headers)))
-	     (setq groups (message-tokenize-header header ","))
-	     (while (setq group (pop groups))
-	       (when (member group groups)
-		 (setq error group
-		       groups nil)))))
-	 (if (not error)
-	     t
-	   (y-or-n-p
-	    (format "Group %s is repeated in headers.  Really post? " error)))))
-     ;; Check the From header.
-     (message-check 'from
-       (let* ((case-fold-search t)
-	      (from (message-fetch-field "from"))
-	      ad)
-	 (cond
-	  ((not from)
-	   (message "There is no From line.  Posting is denied.")
-	   nil)
-	  ((or (not (string-match
-		     "@[^\\.]*\\."
-		     (setq ad (nth 1 (mail-extract-address-components
-				      from))))) ;larsi@ifi
-	       (string-match "\\.\\." ad) ;larsi@ifi..uio
-	       (string-match "@\\." ad)	;larsi@.ifi.uio
-	       (string-match "\\.$" ad)	;larsi@ifi.uio.
-	       (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
-	       (string-match "(.*).*(.*)" from)) ;(lars) (lars)
-	   (message
-	    "Denied posting -- the From looks strange: \"%s\"." from)
-	   nil)
-	  (t t))))
-     ;; Check the Reply-To header.
-     (message-check 'reply-to
-       (let* ((case-fold-search t)
-	      (reply-to (message-fetch-field "reply-to"))
-	      ad)
-	 (cond
-	  ((not reply-to)
-	   t)
-	  ((string-match "," reply-to)
-	   (y-or-n-p
-	    (format "Multiple Reply-To addresses: \"%s\". Really post? "
-		    reply-to)))
-	  ((or (not (string-match
-		     "@[^\\.]*\\."
-		     (setq ad (nth 1 (mail-extract-address-components
-				      reply-to))))) ;larsi@ifi
-	       (string-match "\\.\\." ad) ;larsi@ifi..uio
-	       (string-match "@\\." ad)	;larsi@.ifi.uio
-	       (string-match "\\.$" ad)	;larsi@ifi.uio.
-	       (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
-	       (string-match "(.*).*(.*)" reply-to)) ;(lars) (lars)
-	   (y-or-n-p
-	    (format
-	     "The Reply-To looks strange: \"%s\". Really post? "
-	     reply-to)))
-	  (t t))))))
+   ;; Check the Newsgroups & Followup-To headers for syntax errors.
+   (message-check 'valid-newsgroups
+     (let ((case-fold-search t)
+	   (headers '("Newsgroups" "Followup-To"))
+	   header error)
+       (while (and headers (not error))
+	 (when (setq header (mail-fetch-field (car headers)))
+	   (if (or
+		(not
+		 (string-match
+		  "\\`\\([-+_&.a-zA-Z0-9]+\\)?\\(,[-+_&.a-zA-Z0-9]+\\)*\\'"
+		  header))
+		(memq
+		 nil (mapcar
+		      (lambda (g)
+			(not (string-match "\\.\\'\\|\\.\\." g)))
+		      (message-tokenize-header header ","))))
+	       (setq error t)))
+	 (unless error
+	   (pop headers)))
+       (if (not error)
+	   t
+	 (y-or-n-p
+	  (format "The %s header looks odd: \"%s\".  Really post? "
+		  (car headers) header)))))
+   (message-check 'repeated-newsgroups
+     (let ((case-fold-search t)
+	   (headers '("Newsgroups" "Followup-To"))
+	   header error groups group)
+       (while (and headers
+		   (not error))
+	 (when (setq header (mail-fetch-field (pop headers)))
+	   (setq groups (message-tokenize-header header ","))
+	   (while (setq group (pop groups))
+	     (when (member group groups)
+	       (setq error group
+		     groups nil)))))
+       (if (not error)
+	   t
+	 (y-or-n-p
+	  (format "Group %s is repeated in headers.  Really post? " error)))))
+   ;; Check the From header.
+   (message-check 'from
+     (let* ((case-fold-search t)
+	    (from (message-fetch-field "from"))
+	    ad)
+       (cond
+	((not from)
+	 (message "There is no From line.  Posting is denied.")
+	 nil)
+	((or (not (string-match
+		   "@[^\\.]*\\."
+		   (setq ad (nth 1 (mail-extract-address-components
+				    from))))) ;larsi@ifi
+	     (string-match "\\.\\." ad) ;larsi@ifi..uio
+	     (string-match "@\\." ad)	;larsi@.ifi.uio
+	     (string-match "\\.$" ad)	;larsi@ifi.uio.
+	     (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
+	     (string-match "(.*).*(.*)" from)) ;(lars) (lars)
+	 (message
+	  "Denied posting -- the From looks strange: \"%s\"." from)
+	 nil)
+	(t t))))
+   ;; Check the Reply-To header.
+   (message-check 'reply-to
+     (let* ((case-fold-search t)
+	    (reply-to (message-fetch-field "reply-to"))
+	    ad)
+       (cond
+	((not reply-to)
+	 t)
+	((string-match "," reply-to)
+	 (y-or-n-p
+	  (format "Multiple Reply-To addresses: \"%s\". Really post? "
+		  reply-to)))
+	((or (not (string-match
+		   "@[^\\.]*\\."
+		   (setq ad (nth 1 (mail-extract-address-components
+				    reply-to))))) ;larsi@ifi
+	     (string-match "\\.\\." ad) ;larsi@ifi..uio
+	     (string-match "@\\." ad)	;larsi@.ifi.uio
+	     (string-match "\\.$" ad)	;larsi@ifi.uio.
+	     (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
+	     (string-match "(.*).*(.*)" reply-to)) ;(lars) (lars)
+	 (y-or-n-p
+	  (format
+	   "The Reply-To looks strange: \"%s\". Really post? "
+	   reply-to)))
+	(t t))))))
 
 (defun message-check-news-body-syntax ()
   (and
@@ -4300,7 +4300,7 @@ Headers already prepared in the buffer are not modified."
   (insert (capitalize (symbol-name header))
 	  ": "
 	  (std11-fill-msg-id-list-string
-	  (if (consp value) (car value) value))
+	   (if (consp value) (car value) value))
 	  "\n"))
 
 (defun message-fill-header (header value)
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index e315b5b..84eb07b 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -387,14 +387,14 @@ The original alist is not modified.  See also `destructive-alist-to-plist'."
 	  (throw 'found t))))))
 
 (defun mm-handle-set-external-undisplayer (handle function)
- "Set the undisplayer for this handle; postpone undisplaying of viewers
+  "Set the undisplayer for this handle; postpone undisplaying of viewers
 for types in mm-keep-viewer-alive-types."
- (if (mm-keep-viewer-alive-p handle)
-     (let ((new-handle (copy-sequence handle)))
-       (mm-handle-set-undisplayer new-handle function)
-       (mm-handle-set-undisplayer handle nil)
-       (push new-handle mm-postponed-undisplay-list))
-   (mm-handle-set-undisplayer handle function)))
+  (if (mm-keep-viewer-alive-p handle)
+      (let ((new-handle (copy-sequence handle)))
+	(mm-handle-set-undisplayer new-handle function)
+	(mm-handle-set-undisplayer handle nil)
+	(push new-handle mm-postponed-undisplay-list))
+    (mm-handle-set-undisplayer handle function)))
 
 (defun mm-destroy-postponed-undisplay-list ()
   (message "Destroying external MIME viewers")
@@ -1045,8 +1045,8 @@ like underscores."
 	  (prog1
 	      (setq spec
 		    (ignore-errors
-		     ;; Avoid testing `make-glyph' since W3 may define
-		     ;; a bogus version of it.
+		      ;; Avoid testing `make-glyph' since W3 may define
+		      ;; a bogus version of it.
 		      (if (fboundp 'create-image)
 			  (create-image (buffer-string) (intern type) 'data-p)
 			(cond
@@ -1064,7 +1064,7 @@ like underscores."
 				  (write-region (point-min) (point-max) file)
 				  (make-glyph (list (cons 'x file))))
 			      (ignore-errors
-			       (delete-file file)))))
+				(delete-file file)))))
 			 (t
 			  (make-glyph
 			   (vector (intern type) :data (buffer-string))))))))
@@ -1246,8 +1246,8 @@ If RECURSIVE, search recursively."
     parts))
 
 (defun mm-multiple-handles (handles)
-   (and (listp (car handles))
-	(> (length handles) 1)))
+  (and (listp (car handles))
+       (> (length handles) 1)))
 
 (defun mm-merge-handles (handles1 handles2)
   (append
diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index 4579a55..4a18d0e 100644
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -157,8 +157,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
 		(condition-case nil
 		    ;; This is only valid on XEmacs.
 		    (mapcar (lambda (prop)
-			    (remove-specifier
-			     (face-property 'default prop) (current-buffer)))
+			      (remove-specifier
+			       (face-property 'default prop) (current-buffer)))
 			    '(background background-pixmap foreground))
 		  (error nil))
 		(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
diff --git a/lisp/mm-partial.el b/lisp/mm-partial.el
index 706f52e..d3346ba 100644
--- a/lisp/mm-partial.el
+++ b/lisp/mm-partial.el
@@ -95,7 +95,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
 	  (if ntotal
 	      (if total
 		  (unless (eq total ntotal)
-		  (error "The numbers of total are different"))
+		    (error "The numbers of total are different"))
 		(setq total ntotal)))
 	  (unless (< nn n)
 	    (unless (eq nn n)
@@ -142,8 +142,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
 		(condition-case nil
 		    ;; This is only valid on XEmacs.
 		    (mapcar (lambda (prop)
-			    (remove-specifier
-			     (face-property 'default prop) (current-buffer)))
+			      (remove-specifier
+			       (face-property 'default prop) (current-buffer)))
 			    '(background background-pixmap foreground))
 		  (error nil))
 		(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 02e2a8d..38da083 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -312,10 +312,10 @@ If the charset is `composition', return the actual one."
 	   (progn
 	     (setq mail-parse-mule-charset
 		   (and (boundp 'current-language-environment)
-		      (car (last
-			    (assq 'charset
-				  (assoc current-language-environment
-					 language-info-alist))))))
+			(car (last
+			      (assq 'charset
+				    (assoc current-language-environment
+					   language-info-alist))))))
 	     (if (or (not mail-parse-mule-charset)
 		     (eq mail-parse-mule-charset 'ascii))
 		 (setq mail-parse-mule-charset
@@ -412,13 +412,13 @@ Mule4 only."
 	      (fboundp 'set-buffer-multibyte)
 	      (fboundp 'charsetp)
 	      (not (charsetp 'eight-bit-control))) ;; For Emacs Mule 4 only.
-       (let ((,buffer (current-buffer)))
-	 (unwind-protect
-	     (let (default-enable-multibyte-characters)
-	       (set-buffer-multibyte nil)
-	       ,@forms)
-	   (set-buffer ,buffer)
-	   (set-buffer-multibyte t)))
+	 (let ((,buffer (current-buffer)))
+	   (unwind-protect
+	       (let (default-enable-multibyte-characters)
+		 (set-buffer-multibyte nil)
+		 ,@forms)
+	     (set-buffer ,buffer)
+	     (set-buffer-multibyte t)))
        (let (default-enable-multibyte-characters)
 	 ,@forms))))
 (put 'mm-with-unibyte-current-buffer-mule4 'lisp-indent-function 0)
diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index f6c7563..0a78298 100644
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -58,7 +58,7 @@ decoder, such as hexbin."
   :group 'gnus-article-mime)
 
 (defvar mm-uu-pgp-beginning-signature
-     "^-----BEGIN PGP SIGNATURE-----")
+  "^-----BEGIN PGP SIGNATURE-----")
 
 (defvar mm-uu-beginning-regexp nil)
 
@@ -173,12 +173,12 @@ Return that buffer."
   (if symbol (set-default symbol value))
   (setq mm-uu-beginning-regexp nil)
   (mapcar (lambda (entry)
-	     (if (mm-uu-configure-p (mm-uu-type entry) 'disabled)
-		 nil
-	       (setq mm-uu-beginning-regexp
-		     (concat mm-uu-beginning-regexp
-			     (if mm-uu-beginning-regexp "\\|")
-			     (mm-uu-beginning-regexp entry)))))
+	    (if (mm-uu-configure-p (mm-uu-type entry) 'disabled)
+		nil
+	      (setq mm-uu-beginning-regexp
+		    (concat mm-uu-beginning-regexp
+			    (if mm-uu-beginning-regexp "\\|")
+			    (mm-uu-beginning-regexp entry)))))
 	  mm-uu-type-alist))
 
 (mm-uu-configure)
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index ccdd4fe..524b815 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -105,13 +105,13 @@
 			 (re-search-forward
 			  w3-meta-charset-content-type-regexp nil t)))
 		(setq charset
-		     (or (let ((bsubstr (buffer-substring-no-properties
-					 (match-beginning 2)
-					 (match-end 2))))
-			   (if (fboundp 'w3-coding-system-for-mime-charset)
-			       (w3-coding-system-for-mime-charset bsubstr)
-			     (mm-charset-to-coding-system bsubstr)))
-			 charset)))
+		      (or (let ((bsubstr (buffer-substring-no-properties
+					  (match-beginning 2)
+					  (match-end 2))))
+			    (if (fboundp 'w3-coding-system-for-mime-charset)
+				(w3-coding-system-for-mime-charset bsubstr)
+			      (mm-charset-to-coding-system bsubstr)))
+			  charset)))
 	    (delete-region (point-min) (point-max))
 	    (insert (mm-decode-string text charset))
 	    (save-window-excursion
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 53ed8d4..f9edf14 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -302,8 +302,8 @@
       (mc-encrypt-generic
        (or (message-options-get 'message-recipients)
 	   (message-options-set 'message-recipients
-			      (mc-cleanup-recipient-headers
-			       (read-string "Recipients: "))))
+				(mc-cleanup-recipient-headers
+				 (read-string "Recipients: "))))
        nil nil nil
        (message-options-get 'message-sender))))
   (goto-char (point-min))
diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index 2da2990..60c26cc 100644
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -128,61 +128,61 @@
 
 (deffoo nnagent-request-group (group &optional server dont-check)
   (nnoo-parent-function 'nnagent 'nnml-request-group
-		    (list group (nnagent-server server) dont-check)))
+			(list group (nnagent-server server) dont-check)))
 
 (deffoo nnagent-close-group (group &optional server)
   (nnoo-parent-function 'nnagent 'nnml-close-group
-		    (list group (nnagent-server server))))
+			(list group (nnagent-server server))))
 
 (deffoo nnagent-request-accept-article (group &optional server last)
   (nnoo-parent-function 'nnagent 'nnml-request-accept-article
-		    (list group (nnagent-server server) last)))
+			(list group (nnagent-server server) last)))
 
 (deffoo nnagent-request-article (id &optional group server buffer)
   (nnoo-parent-function 'nnagent 'nnml-request-article
-		    (list id group (nnagent-server server) buffer)))
+			(list id group (nnagent-server server) buffer)))
 
 (deffoo nnagent-request-create-group (group &optional server args)
   (nnoo-parent-function 'nnagent 'nnml-request-create-group
-		    (list group (nnagent-server server) args)))
+			(list group (nnagent-server server) args)))
 
 (deffoo nnagent-request-delete-group (group &optional force server)
   (nnoo-parent-function 'nnagent 'nnml-request-delete-group
-		    (list group force (nnagent-server server))))
+			(list group force (nnagent-server server))))
 
 (deffoo nnagent-request-expire-articles (articles group &optional server force)
   (nnoo-parent-function 'nnagent 'nnml-request-expire-articles
-		    (list articles group (nnagent-server server) force)))
+			(list articles group (nnagent-server server) force)))
 
 (deffoo nnagent-request-list (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-request-list
-		    (list (nnagent-server server))))
+			(list (nnagent-server server))))
 
 (deffoo nnagent-request-list-newsgroups (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-request-list-newsgroups
-		    (list (nnagent-server server))))
+			(list (nnagent-server server))))
 
 (deffoo nnagent-request-move-article
     (article group server accept-form &optional last)
   (nnoo-parent-function 'nnagent 'nnml-request-move-article
-		    (list article group (nnagent-server server)
-			  accept-form last)))
+			(list article group (nnagent-server server)
+			      accept-form last)))
 
 (deffoo nnagent-request-rename-group (group new-name &optional server)
   (nnoo-parent-function 'nnagent 'nnml-request-rename-group
-		    (list group new-name (nnagent-server server))))
+			(list group new-name (nnagent-server server))))
 
 (deffoo nnagent-request-scan (&optional group server)
   (nnoo-parent-function 'nnagent 'nnml-request-scan
-		    (list group (nnagent-server server))))
+			(list group (nnagent-server server))))
 
 (deffoo nnagent-retrieve-headers (sequence &optional group server fetch-old)
   (nnoo-parent-function 'nnagent 'nnml-retrieve-headers
-		    (list sequence group (nnagent-server server) fetch-old)))
+			(list sequence group (nnagent-server server) fetch-old)))
 
 (deffoo nnagent-set-status (article name value &optional group server)
   (nnoo-parent-function 'nnagent 'nnml-set-status
-		    (list article name value group (nnagent-server server))))
+			(list article name value group (nnagent-server server))))
 
 (deffoo nnagent-server-opened (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-server-opened
diff --git a/lisp/nneething.el b/lisp/nneething.el
index b913628..7b713c4 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -352,7 +352,7 @@ included.")
 		 (progn
 		   (goto-char (point-min))
 		   (or (and (search-forward "\n\n" nil t)
-		      (1- (point)))
+			    (1- (point)))
 		       (point-max)))
 		 (point-max))
 	      (goto-char (point-min))
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 0bc23f1..2218bd8 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -912,7 +912,7 @@ deleted.  Point is left where the deleted region was."
 			   (nnfolder-active-number nnfolder-current-group))))
 	      (when novbuf
 		(let ((headers (nnfolder-parse-head newnum (point-min)
-						      (point-max))))
+						    (point-max))))
 		  (with-current-buffer novbuf
 		    (goto-char (point-max))
 		    (nnheader-insert-nov headers))))
@@ -1061,29 +1061,29 @@ This command does not work if you use short group names."
   "Parse the head of the current buffer."
   (let ((buf (current-buffer))
 	chars)
-  (save-excursion
-    (unless b
-      (setq b (if (nnmail-search-unix-mail-delim-backward)
-		  (point) (point-min)))
-      (forward-line 1)
-      (setq e (if (nnmail-search-unix-mail-delim)
-		  (point) (point-max))))
-    (setq chars (- e b))
-    (unless (zerop chars)
-      (goto-char b)
-      (if (search-forward "\n\n" e t) (setq e (1- (point)))))
-    (with-temp-buffer
-      (insert-buffer-substring buf b e)
-      ;; Fold continuation lines.
-      (goto-char (point-min))
-      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-	(replace-match " " t t))
-      ;; Remove any tabs; they are too confusing.
-      (subst-char-in-region (point-min) (point-max) ?\t ? )
-      (let ((headers (nnheader-parse-head t)))
-	(mail-header-set-chars headers chars)
-	(mail-header-set-number headers number)
-	headers)))))
+    (save-excursion
+      (unless b
+	(setq b (if (nnmail-search-unix-mail-delim-backward)
+		    (point) (point-min)))
+	(forward-line 1)
+	(setq e (if (nnmail-search-unix-mail-delim)
+		    (point) (point-max))))
+      (setq chars (- e b))
+      (unless (zerop chars)
+	(goto-char b)
+	(if (search-forward "\n\n" e t) (setq e (1- (point)))))
+      (with-temp-buffer
+	(insert-buffer-substring buf b e)
+	;; Fold continuation lines.
+	(goto-char (point-min))
+	(while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
+	  (replace-match " " t t))
+	;; Remove any tabs; they are too confusing.
+	(subst-char-in-region (point-min) (point-max) ?\t ? )
+	(let ((headers (nnheader-parse-head t)))
+	  (mail-header-set-chars headers chars)
+	  (mail-header-set-number headers number)
+	  headers)))))
 
 (defun nnfolder-add-nov (group article headers)
   "Add a nov line for the GROUP base."
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 9580dc6..2e2fb81 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -825,9 +825,9 @@ function is generally only called when Gnus is shutting down."
 	      (let ((info (nnimap-find-minmax-uid mbx 'examine)))
 		(when info
 		  (with-current-buffer nntp-server-buffer
-		   (insert (format "\"%s\" %d %d y\n"
-				   mbx (or (nth 2 info) 0)
-				   (max 1 (or (nth 1 info) 1)))))))))))
+		    (insert (format "\"%s\" %d %d y\n"
+				    mbx (or (nth 2 info) 0)
+				    (max 1 (or (nth 1 info) 1)))))))))))
     (gnus-message 5 "nnimap: Generating active list%s...done"
 		  (if (> (length server) 0) (concat " for " server) ""))
     t))
@@ -1362,65 +1362,65 @@ sure of changing the value of `foo'."
   (require 'trace)
   (buffer-disable-undo (get-buffer-create nnimap-debug))
   (mapcar (lambda (f) (trace-function-background f nnimap-debug))
-	'(
-	  nnimap-possibly-change-server
-	  nnimap-verify-uidvalidity
-	  nnimap-find-minmax-uid
-	  nnimap-before-find-minmax-bugworkaround
-	  nnimap-possibly-change-group
-	  ;;nnimap-replace-whitespace
-	  nnimap-retrieve-headers-progress
-	  nnimap-retrieve-which-headers
-	  nnimap-group-overview-filename
-	  nnimap-retrieve-headers-from-file
-	  nnimap-retrieve-headers-from-server
-	  nnimap-retrieve-headers
-	  nnimap-open-connection
-	  nnimap-open-server
-	  nnimap-server-opened
-	  nnimap-close-server
-	  nnimap-request-close
-	  nnimap-status-message
-	  ;;nnimap-demule
-	  nnimap-request-article-part
-	  nnimap-request-article
-	  nnimap-request-head
-	  nnimap-request-body
-	  nnimap-request-group
-	  nnimap-close-group
-	  nnimap-pattern-to-list-arguments
-	  nnimap-request-list
-	  nnimap-request-post
-	  nnimap-retrieve-groups
-	  nnimap-request-update-info-internal
-	  nnimap-request-type
-	  nnimap-request-set-mark
-	  nnimap-split-to-groups
-	  nnimap-split-find-rule
-	  nnimap-split-find-inbox
-	  nnimap-split-articles
-	  nnimap-request-scan
-	  nnimap-request-newgroups
-	  nnimap-request-create-group
-	  nnimap-time-substract
-	  nnimap-date-days-ago
-	  nnimap-request-expire-articles-progress
-	  nnimap-request-expire-articles
-	  nnimap-request-move-article
-	  nnimap-request-accept-article
-	  nnimap-request-delete-group
-	  nnimap-request-rename-group
-	  gnus-group-nnimap-expunge
-	  gnus-group-nnimap-edit-acl
-	  gnus-group-nnimap-edit-acl-done
-	  nnimap-group-mode-hook
-	  nnimap-mark-to-predicate
-	  nnimap-mark-to-flag-1
-	  nnimap-mark-to-flag
-	  nnimap-mark-permanent-p
-	  nnimap-remassoc
-	  nnimap-update-alist-soft
-	  )))
+	  '(
+	    nnimap-possibly-change-server
+	    nnimap-verify-uidvalidity
+	    nnimap-find-minmax-uid
+	    nnimap-before-find-minmax-bugworkaround
+	    nnimap-possibly-change-group
+	    ;;nnimap-replace-whitespace
+	    nnimap-retrieve-headers-progress
+	    nnimap-retrieve-which-headers
+	    nnimap-group-overview-filename
+	    nnimap-retrieve-headers-from-file
+	    nnimap-retrieve-headers-from-server
+	    nnimap-retrieve-headers
+	    nnimap-open-connection
+	    nnimap-open-server
+	    nnimap-server-opened
+	    nnimap-close-server
+	    nnimap-request-close
+	    nnimap-status-message
+	    ;;nnimap-demule
+	    nnimap-request-article-part
+	    nnimap-request-article
+	    nnimap-request-head
+	    nnimap-request-body
+	    nnimap-request-group
+	    nnimap-close-group
+	    nnimap-pattern-to-list-arguments
+	    nnimap-request-list
+	    nnimap-request-post
+	    nnimap-retrieve-groups
+	    nnimap-request-update-info-internal
+	    nnimap-request-type
+	    nnimap-request-set-mark
+	    nnimap-split-to-groups
+	    nnimap-split-find-rule
+	    nnimap-split-find-inbox
+	    nnimap-split-articles
+	    nnimap-request-scan
+	    nnimap-request-newgroups
+	    nnimap-request-create-group
+	    nnimap-time-substract
+	    nnimap-date-days-ago
+	    nnimap-request-expire-articles-progress
+	    nnimap-request-expire-articles
+	    nnimap-request-move-article
+	    nnimap-request-accept-article
+	    nnimap-request-delete-group
+	    nnimap-request-rename-group
+	    gnus-group-nnimap-expunge
+	    gnus-group-nnimap-edit-acl
+	    gnus-group-nnimap-edit-acl-done
+	    nnimap-group-mode-hook
+	    nnimap-mark-to-predicate
+	    nnimap-mark-to-flag-1
+	    nnimap-mark-to-flag
+	    nnimap-mark-permanent-p
+	    nnimap-remassoc
+	    nnimap-update-alist-soft
+	    )))
 
 (provide 'nnimap)
 
diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el
index 666cd70..bcbbf80 100644
--- a/lisp/nnlistserv.el
+++ b/lisp/nnlistserv.el
@@ -34,7 +34,7 @@
 (require 'nnoo)
 (eval-when-compile
   (ignore-errors
-   (require 'nnweb))			; requires W3
+    (require 'nnweb))			; requires W3
   (autoload 'url-insert-file-contents "nnweb"))
 
 (nnoo-declare nnlistserv
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 85404c5..eca08b6 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -175,10 +175,10 @@ called in a buffer narrowed to the message in question.  The function
 receives one argument, the name of the group the message comes from.
 The return value should be `delete' or a group name (a string)."
   :version "21.1"
-    :group 'nnmail-expire
-    :type '(choice (const delete)
-		   (function :format "%v" nnmail-)
-		   string))
+  :group 'nnmail-expire
+  :type '(choice (const delete)
+		 (function :format "%v" nnmail-)
+		 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/nnmbox.el b/lisp/nnmbox.el
index cdec49d..37cd094 100644
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -272,8 +272,8 @@
 		(unless (eq nnmail-expiry-target 'delete)
 		  (with-temp-buffer
 		    (nnmbox-request-article (car articles)
-					     newsgroup server
-					     (current-buffer))
+					    newsgroup server
+					    (current-buffer))
 		    (let ((nnml-current-directory nil))
 		      (nnmail-expiry-target-group
 		       nnmail-expiry-target newsgroup))))
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 4bbf5e9..c76f4ff 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -476,15 +476,15 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 	(mm-with-unibyte-buffer
 	  (if (and nnrss-use-local
 		   (file-exists-p (setq file (expand-file-name
-					  (nnrss-translate-file-chars
-					   (concat group ".xml"))
-					  nnrss-directory))))
+					      (nnrss-translate-file-chars
+					       (concat group ".xml"))
+					      nnrss-directory))))
 	      (insert-file-contents file)
 	    (setq url (or (nth 2 (assoc group nnrss-server-data))
 			  (second (assoc group nnrss-group-alist))))
 	    (unless url
 	      (setq url
-		(read-string (format "RSS url of %s: " group "http://")))
+		    (read-string (format "RSS url of %s: " group "http://")))
 	      (let ((pair (assoc group nnrss-server-data)))
 		(if pair
 		    (setcdr (cdr pair) (list url))
@@ -504,29 +504,29 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
       (unless (listp (car (setq xml (cddar xml))))
 	(setq xml nil)))
     (dolist (item (nreverse xml))
-       (when (and (listp item)
-		  (eq 'item (car item))
-		  (setq url (nnrss-node-text (assq 'link (cddr item))))
-		  (setq url (nnrss-decode-entities-unibyte-string url))
-		  (not (gnus-gethash url nnrss-group-hashtb)))
-	 (setq subject (nnrss-node-text (assq 'title (cddr item))))
-	 (setq extra (or (nnrss-node-text (assq 'description (cddr item)))
-			 (nnrss-node-text (assq 'dc:description (cddr item)))))
-	 (setq author (nnrss-node-text (assq 'dc:creator (cddr item))))
-	 (setq date (or (nnrss-node-text (assq 'dc:date (cddr item)))
-			(message-make-date)))
-	 (push
-	  (list
-	   (incf nnrss-group-max)
-	   (current-time)
-	   url
-	   (and subject (nnrss-decode-entities-unibyte-string subject))
-	   (and author (nnrss-decode-entities-unibyte-string author))
-	   date
-	   (and extra (nnrss-decode-entities-unibyte-string extra)))
-	  nnrss-group-data)
-	 (gnus-sethash url (car nnrss-group-data) nnrss-group-hashtb)
-	 (setq changed t)))
+      (when (and (listp item)
+		 (eq 'item (car item))
+		 (setq url (nnrss-node-text (assq 'link (cddr item))))
+		 (setq url (nnrss-decode-entities-unibyte-string url))
+		 (not (gnus-gethash url nnrss-group-hashtb)))
+	(setq subject (nnrss-node-text (assq 'title (cddr item))))
+	(setq extra (or (nnrss-node-text (assq 'description (cddr item)))
+			(nnrss-node-text (assq 'dc:description (cddr item)))))
+	(setq author (nnrss-node-text (assq 'dc:creator (cddr item))))
+	(setq date (or (nnrss-node-text (assq 'dc:date (cddr item)))
+		       (message-make-date)))
+	(push
+	 (list
+	  (incf nnrss-group-max)
+	  (current-time)
+	  url
+	  (and subject (nnrss-decode-entities-unibyte-string subject))
+	  (and author (nnrss-decode-entities-unibyte-string author))
+	  date
+	  (and extra (nnrss-decode-entities-unibyte-string extra)))
+	 nnrss-group-data)
+	(gnus-sethash url (car nnrss-group-data) nnrss-group-hashtb)
+	(setq changed t)))
     (when changed
       (nnrss-save-group-data group server)
       (let ((pair (assoc group nnrss-server-data)))
@@ -545,9 +545,9 @@ It is useful when `(setq nnrss-use-local t)'."
   (dolist (elem nnrss-server-data)
     (let ((url (or (nth 2 elem)
 		   (second (assoc (car elem) nnrss-group-alist)))))
-    (insert "$WGET -q -O \"$RSSDIR\"/'"
-	    (nnrss-translate-file-chars (concat (car elem) ".xml"))
-	    "' '" url "'\n"))))
+      (insert "$WGET -q -O \"$RSSDIR\"/'"
+	      (nnrss-translate-file-chars (concat (car elem) ".xml"))
+	      "' '" url "'\n"))))
 
 (defun nnrss-translate-file-chars (name)
   (let ((nnheader-file-name-translation-alist
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 554afb7..4f8e6f6 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -201,8 +201,8 @@
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (mm-with-unibyte-current-buffer
-       (dolist (header nnslashdot-headers)
-	 (nnheader-insert-nov (cdr header)))))
+	(dolist (header nnslashdot-headers)
+	  (nnheader-insert-nov (cdr header)))))
     'nov))
 
 (deffoo nnslashdot-sane-retrieve-headers (articles group)
@@ -248,7 +248,7 @@
 	 t)
 	(goto-char point)
 	(while (re-search-forward
-		  "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
+		"<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
 		nil t)
 	  (setq article (string-to-number (match-string 1))
 		subject (match-string 3)
diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index 1abc4dd..7594b64 100644
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -105,7 +105,7 @@
   "Where nnwarchive will save its files.")
 
 (defvoo nnwarchive-type nil
-    "The type of nnwarchive.")
+  "The type of nnwarchive.")
 
 (defvoo nnwarchive-address ""
   "The address of nnwarchive.")
@@ -234,9 +234,9 @@
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (let (header)
-      (dolist (art articles)
-	(if (setq header (assq art nnwarchive-headers))
-	    (nnheader-insert-nov (cdr header))))))
+	(dolist (art articles)
+	  (if (setq header (assq art nnwarchive-headers))
+	      (nnheader-insert-nov (cdr header))))))
     (let ((elem (assoc group nnwarchive-headers-cache)))
       (if elem
 	  (setcdr elem nnwarchive-headers)
@@ -293,8 +293,8 @@
     (setq nnwarchive-login
 	  (or nnwarchive-login
 	      (read-string
-		 (format "Login at %s: " server)
-		 user-mail-address)))
+	       (format "Login at %s: " server)
+	       user-mail-address)))
     (setq nnwarchive-passwd
 	  (or nnwarchive-passwd
 	      (mail-source-read-passwd
diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index af1a756..90c9d5d 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -800,15 +800,15 @@ and `altavista'.")
     (set-buffer nnweb-buffer)
     (erase-buffer)
     (when (funcall (nnweb-definition 'search) nnweb-search)
-	(let ((more t))
-	  (while more
-	    (setq nnweb-articles
-		  (nconc nnweb-articles (nnweb-google-parse-1)))
-	    ;; FIXME: There is more.
-	    (setq more nil))
-	  ;; Return the articles in the right order.
+      (let ((more t))
+	(while more
 	  (setq nnweb-articles
-		(sort nnweb-articles 'car-less-than-car))))))
+		(nconc nnweb-articles (nnweb-google-parse-1)))
+	  ;; FIXME: There is more.
+	  (setq more nil))
+	;; Return the articles in the right order.
+	(setq nnweb-articles
+	      (sort nnweb-articles 'car-less-than-car))))))
 
 (defun nnweb-google-search (search)
   (nnweb-insert
@@ -877,13 +877,13 @@ and `altavista'.")
   (goto-char (point-min))
   (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
     (let ((elem (if (eq (aref (match-string 1) 0) ?\#)
-			(let ((c
-			       (string-to-number (substring
-						  (match-string 1) 1))))
-			  (if (mm-char-or-char-int-p c) c 32))
-		      (or (cdr (assq (intern (match-string 1))
-				     w3-html-entities))
-			  ?#))))
+		    (let ((c
+			   (string-to-number (substring
+					      (match-string 1) 1))))
+		      (if (mm-char-or-char-int-p c) c 32))
+		  (or (cdr (assq (intern (match-string 1))
+				 w3-html-entities))
+		      ?#))))
       (unless (stringp elem)
 	(setq elem (char-to-string elem)))
       (replace-match elem t t))))
diff --git a/lisp/nnwfm.el b/lisp/nnwfm.el
index 29cf92d..2de45b7 100644
--- a/lisp/nnwfm.el
+++ b/lisp/nnwfm.el
@@ -141,10 +141,10 @@
 		  (push (list from time bstuff) contents))))
 	    (setq contents (nreverse contents))
 	    (dolist (art (cdr elem))
-		(push (list (car art)
-			    (nth (1- (cdr art)) contents)
-			    subject)
-		      nnwfm-articles))))
+	      (push (list (car art)
+			  (nth (1- (cdr art)) contents)
+			  subject)
+		    nnwfm-articles))))
 	(setq nnwfm-articles
 	      (sort nnwfm-articles 'car-less-than-car))
 	;; Now we have all the articles, conveniently in an alist
@@ -351,7 +351,7 @@
   (unless nnwfm-groups-alist
     (nnwfm-read-groups)
     (setq nnwfm-groups (cdr (assoc nnwfm-address
-					nnwfm-groups-alist)))))
+				   nnwfm-groups-alist)))))
 
 (deffoo nnwfm-open-server (server &optional defs connectionless)
   (nnheader-init-server-buffer)
diff --git a/lisp/pop3.el b/lisp/pop3.el
index 933f133..86f045b 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -215,7 +215,8 @@ Argument PORT specifies connecting port."
   (let* ((ssl-program-name
 	  pop3-ssl-program-name)
 	 (ssl-program-arguments
-	  `(,@pop3-ssl-program-arguments ,extra-arg
+	  `(,@pop3-ssl-program-arguments
+	    ,extra-arg
 	    "-connect" ,(format "%s:%d" host service)))
 	 (process (open-ssl-stream name buffer host service)))
     (when process
@@ -243,8 +244,8 @@ Args are NAME BUFFER HOST SERVICE."
 	       (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
 	(t
 	 (as-binary-process
-	   (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
-	       (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))))
+	  (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+	      (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))))
 
 (defun pop3-open-tls-stream (name buffer host service)
   "Open a TLSv1 connection for a service to a host.
@@ -266,15 +267,15 @@ Args are NAME BUFFER HOST SERVICE."
     (insert output)))
 
 (defun pop3-send-command (process command)
-    (set-buffer (process-buffer process))
-    (goto-char (point-max))
-;;    (if (= (aref command 0) ?P)
-;;	(insert "PASS <omitted>\r\n")
-;;      (insert command "\r\n"))
-    (setq pop3-read-point (point))
-    (goto-char (point-max))
-    (process-send-string process (concat command "\r\n"))
-    )
+  (set-buffer (process-buffer process))
+  (goto-char (point-max))
+;;  (if (= (aref command 0) ?P)
+;;      (insert "PASS <omitted>\r\n")
+;;    (insert command "\r\n"))
+  (setq pop3-read-point (point))
+  (goto-char (point-max))
+  (process-send-string process (concat command "\r\n"))
+  )
 
 (defun pop3-read-response (process &optional return)
   "Read the response from the server PROCESS.
diff --git a/lisp/qp.el b/lisp/qp.el
index 8c3b828..75d6779 100644
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -137,7 +137,7 @@ encode lines starting with \"From\"."
 		(if (looking-at "From ")
 		    (replace-match "From=20" nil t)
 		  (if (looking-at "-")
-			(replace-match "=2D" nil t))))
+		      (replace-match "=2D" nil t))))
 	      (end-of-line)
 	      ;; Fold long lines.
 	      (while (> (current-column) 76) ; tab-width must be 1.
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index d8263bb..71ac476 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -128,15 +128,15 @@ Should be called narrowed to the head of the message."
 	  (rfc2047-narrow-to-field)
 	  (if (not (rfc2047-encodable-p))
 	      (prog1
-		(if (and (eq (mm-body-7-or-8) '8bit)
-			 (mm-multibyte-p)
-			 (mm-coding-system-p
-			  (car message-posting-charset)))
-		    ;; 8 bit must be decoded.
-		    ;; Is message-posting-charset a coding system?
-		    (mm-encode-coding-region
-		     (point-min) (point-max)
-		     (car message-posting-charset)))
+		  (if (and (eq (mm-body-7-or-8) '8bit)
+			   (mm-multibyte-p)
+			   (mm-coding-system-p
+			    (car message-posting-charset)))
+		      ;; 8 bit must be decoded.
+		      ;; Is message-posting-charset a coding system?
+		      (mm-encode-coding-region
+		       (point-min) (point-max)
+		       (car message-posting-charset)))
 		;; No encoding necessary, but folding is nice
 		(rfc2047-fold-region (save-excursion
 				       (goto-char (point-min))
@@ -373,9 +373,9 @@ The buffer may be narrowed."
 	(goto-char (or break qword-break))
 	(setq break nil
 	      qword-break nil)
-	  (if (looking-at "[ \t]")
-	      (insert "\n")
-	    (insert "\n "))
+	(if (looking-at "[ \t]")
+	    (insert "\n")
+	  (insert "\n "))
 	(setq bol (1- (point)))
 	;; Don't break before the first non-LWSP characters.
 	(skip-chars-forward " \t")
diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el
index 868f4c0..7ebd1ab 100644
--- a/lisp/smiley-ems.el
+++ b/lisp/smiley-ems.el
@@ -119,7 +119,7 @@ rgexp to replace with IMAGE.  IMAGE is the name of a PBM file in
 	      (overlay-put overlay
 			   'help-echo "mouse-2: toggle smilies in buffer")
 	      (overlay-put overlay 'keymap smiley-mouse-map))))))
-	(setq smiley-active t)))
+    (setq smiley-active t)))
 
 (defun smiley-toggle-buffer (&optional arg)
   "Toggle displaying smiley faces.
diff --git a/lisp/smime.el b/lisp/smime.el
index fb5ac73..d9d3722 100644
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -446,19 +446,19 @@ A string or a list of strings is returned."
 	 (certrr (with-current-buffer digbuf
 		   (dig-extract-rr (smime-mail-to-domain mail) "cert")))
 	 (cert (and certrr (dig-rr-get-pkix-cert certrr))))
-      (if cert
-	  (with-current-buffer retbuf
-	    (insert "-----BEGIN CERTIFICATE-----\n")
-	    (let ((i 0) (len (length cert)))
-	      (while (> (- len 64) i)
-		(insert (substring cert i (+ i 64)) "\n")
-		(setq i (+ i 64)))
-	      (insert (substring cert i len) "\n"))
-	    (insert "-----END CERTIFICATE-----\n"))
-	(kill-buffer retbuf)
-	(setq retbuf nil))
-      (kill-buffer digbuf)
-      retbuf))
+    (if cert
+	(with-current-buffer retbuf
+	  (insert "-----BEGIN CERTIFICATE-----\n")
+	  (let ((i 0) (len (length cert)))
+	    (while (> (- len 64) i)
+	      (insert (substring cert i (+ i 64)) "\n")
+	      (setq i (+ i 64)))
+	    (insert (substring cert i len) "\n"))
+	  (insert "-----END CERTIFICATE-----\n"))
+      (kill-buffer retbuf)
+      (setq retbuf nil))
+    (kill-buffer digbuf)
+    retbuf))
 
 ;; User interface.
 
diff --git a/lisp/utf7.el b/lisp/utf7.el
index 2a5e752..eea6afe 100644
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -156,7 +156,7 @@ Characters are in raw byte pairs in narrowed buffer."
   (while (not (eobp))
     (if (= 0 (following-char))
 	(delete-char 1)
-	(error "Unable to convert from Unicode"))
+      (error "Unable to convert from Unicode"))
     (forward-char)))
 
 (defun utf7-encode (string &optional for-imap)
diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index b7168c6..efd4166 100644
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -102,13 +102,13 @@ used is specified by `uudecode-decoder-program'."
 					       (match-string 1)))))
 	(setq tempfile (if file-name
 			   (expand-file-name file-name)
-			   (if (fboundp 'make-temp-file)
-			       (let ((temporary-file-directory
-				      uudecode-temporary-file-directory))
-				 (make-temp-file "uu"))
-			     (expand-file-name
-			      (make-temp-name "uu")
-			      uudecode-temporary-file-directory))))
+			 (if (fboundp 'make-temp-file)
+			     (let ((temporary-file-directory
+				    uudecode-temporary-file-directory))
+			       (make-temp-file "uu"))
+			   (expand-file-name
+			    (make-temp-name "uu")
+			    uudecode-temporary-file-directory))))
 	(let ((cdir default-directory)
 	      default-process-coding-system)
 	  (unwind-protect
diff --git a/lisp/webmail.el b/lisp/webmail.el
index 27fc0eb..0bd06e6 100644
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -422,7 +422,7 @@
     (unless (equal total "0")
       (goto-char (point-min))
       (if (re-search-forward
-	 "https?://\\([^/]+hotmail\\.msn\\.com\\)/cgi-bin/" nil t)
+	   "https?://\\([^/]+hotmail\\.msn\\.com\\)/cgi-bin/" nil t)
 	  (setq site (match-string 1))
 	(webmail-error "list@1"))
       (goto-char (point-min))
@@ -1120,7 +1120,7 @@
 		  "type=hidden name=\"\\([^\"]+\\)\" value=\"\\([^\"]+\\)"
 		  nil t)
 	    (setq url (concat url "&" (match-string 1) "="
-				  (match-string 2))))
+			      (match-string 2))))
 	  (delete-region (point-min) (point-max))
 	  (save-excursion
 	    (set-buffer (generate-new-buffer " *webmail-att*"))