Trailing whitepace deleted.

11 files changed, 94 insertions, 94 deletions

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 13c23245439..1ac2311e266 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -428,7 +428,7 @@
 ;; ange-ftp-bs2000-special-prefix because names starting with # or @
 ;; are reserved for temporary files.
 ;; This is especially important for auto-save files.
-;; Valid file generations are ending with ([+|-|*]0-9...) . 
+;; Valid file generations are ending with ([+|-|*]0-9...) .
 ;; File generations are not supported yet!
 ;; A filename must at least contain one character (A-Z) and cannot be longer
 ;; than 41 characters.
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index a434e96ffb0..1c20c7cc185 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -50,7 +50,7 @@
 
 (eudc-protocol-set 'eudc-query-function 'eudc-bbdb-query-internal 'bbdb)
 (eudc-protocol-set 'eudc-list-attributes-function nil 'bbdb)
-(eudc-protocol-set 'eudc-protocol-attributes-translation-alist 
+(eudc-protocol-set 'eudc-protocol-attributes-translation-alist
 		   'eudc-bbdb-attributes-translation-alist 'bbdb)
 (eudc-protocol-set 'eudc-bbdb-conversion-alist nil 'bbdb)
 (eudc-protocol-set 'eudc-protocol-has-default-query-attributes nil 'bbdb)
@@ -68,23 +68,23 @@
 	(notes (cdr (assq 'notes query)))
 	(phone (cdr (assq 'phone query))))
     (list name company net notes phone)))
-	
+
 
 (defun eudc-bbdb-filter-non-matching-record (record)
   "Return RECORD if it matches `eudc-bbdb-current-query', nil otherwise."
   (catch 'unmatch
     (progn
-      (mapcar 
-       (function 
+      (mapcar
+       (function
 	(lambda (condition)
 	  (let ((attr (car condition))
 		(val (cdr condition))
 		(case-fold-search t)
 		bbdb-val)
 	    (or (and (memq attr '(firstname lastname aka company phones addresses net))
-		     (progn 
-		       (setq bbdb-val 
-			     (eval (list (intern (concat "bbdb-record-" 
+		     (progn
+		       (setq bbdb-val
+			     (eval (list (intern (concat "bbdb-record-"
 							 (symbol-name attr)))
 					 'record)))
 		       (if (listp bbdb-val)
@@ -108,7 +108,7 @@
 	     (if eudc-bbdb-use-locations-as-attribute-names
 		 (cons (intern (bbdb-phone-location phone))
 		       (bbdb-phone-string phone))
-	       (cons 'phones (format "%s: %s" 
+	       (cons 'phones (format "%s: %s"
 				     (bbdb-phone-location phone)
 				     (bbdb-phone-string phone))))))
 	  (bbdb-record-phones record)))
@@ -123,7 +123,7 @@
 				   (concat s "\n"))
 				 (unless (= 0 (length (setq s (bbdb-address-street3 address))))
 				   (concat s "\n"))
-				 (progn 
+				 (progn
 				   (setq c (bbdb-address-city address))
 				   (setq s (bbdb-address-state address))
 				   (if (and (> (length c) 0) (> (length s) 0))
@@ -143,7 +143,7 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'"
 	attr
 	eudc-rec
 	val)
-    (while (prog1 
+    (while (prog1
 	       (setq attr (car attrs))
 	     (setq attrs (cdr attrs)))
       (cond
@@ -152,15 +152,15 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'"
        ((eq attr 'addresses)
 	(setq val (eudc-bbdb-extract-addresses record)))
        ((memq attr '(firstname lastname aka company net notes))
-	(setq val (eval 
-		   (list (intern 
-			  (concat "bbdb-record-" 
+	(setq val (eval
+		   (list (intern
+			  (concat "bbdb-record-"
 				  (symbol-name attr)))
 			 'record))))
        (t
 	(setq val "Unknown BBDB attribute")))
       (if val
-	(cond 
+	(cond
 	 ((memq attr '(phones addresses))
 	  (setq eudc-rec (append val eudc-rec)))
 	 ((and (listp val)
@@ -171,14 +171,14 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'"
 	 (t
 	  (error "Unexpected attribute value")))))
     (nreverse eudc-rec)))
-	
+
 
 
 (defun eudc-bbdb-query-internal (query &optional return-attrs)
   "Query BBDB  with QUERY.
-QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid 
-BBDB attribute names.  
-RETURN-ATTRS is a list of attributes to return, defaulting to 
+QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid
+BBDB attribute names.
+RETURN-ATTRS is a list of attributes to return, defaulting to
 `eudc-default-return-attributes'."
 
   (let ((eudc-bbdb-current-query query)
@@ -202,15 +202,15 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
 	       ;; If there were duplicate attributes reverse the order of the
 	       ;; record so the unique attributes appear first
 	       (if (> (length filtered) 1)
-		   (setq filtered (mapcar (function 
+		   (setq filtered (mapcar (function
 					   (lambda (rec)
 					     (reverse rec)))
 					  filtered)))
 	       (setq result (append result filtered))))
 	    (delq nil
-		  (mapcar 'eudc-bbdb-format-record-as-result 
-			  (delq nil 
-				(mapcar 'eudc-bbdb-filter-non-matching-record 
+		  (mapcar 'eudc-bbdb-format-record-as-result
+			  (delq nil
+				(mapcar 'eudc-bbdb-filter-non-matching-record
 					records)))))
     result))
 
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 47b49725563..42c4bca8bf8 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -208,7 +208,7 @@ there, then load the URL at or before point."
   (interactive)
   (save-excursion
     (let ((address (save-excursion (goto-address-find-address-at-point))))
-      (if (and address 
+      (if (and address
 	       (save-excursion
 		 (goto-char (previous-single-char-property-change
 			     (point) 'goto-address nil
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 0751aec4286..22794a41078 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -264,7 +264,7 @@ It also restores point after the `read'."
   (save-excursion
     (setf (point) (point-min))
     (setq quickurl-urls (funcall quickurl-sort-function (read buffer)))))
-                       
+
 (defun quickurl-load-urls ()
   "Load the contents of `quickurl-url-file' into `quickurl-urls'."
   (when (file-exists-p quickurl-url-file)
@@ -280,7 +280,7 @@ It also restores point after the `read'."
       (pp quickurl-urls)
       (princ quickurl-postfix)
       (write-region (point-min) (point-max) quickurl-url-file nil 0))))
-  
+
 (defun quickurl-find-url (lookup)
   "Return URL associated with key LOOKUP.
 
@@ -327,7 +327,7 @@ buffer, this default action can be modifed via
   (let ((url (quickurl-find-url lookup)))
     (when url
       (quickurl-insert url))))
-   
+
 (defun quickurl-grab-url ()
   "Attempt to grab a word/url pair from point in the current buffer.
 
@@ -370,7 +370,7 @@ is decided."
                        (read-string "URL: "     (quickurl-url-url word-url))
                        (read-string "Comment: " (quickurl-url-comment word-url)))))
   (if (zerop (length word))
-      (error "You must specify a WORD for lookup")  
+      (error "You must specify a WORD for lookup")
     (quickurl-load-urls)
     (let* ((current-url (quickurl-find-url word))
            (add-it      (if current-url
@@ -546,7 +546,7 @@ TYPE dictates what will be inserted, options are:
 (quickurl-list-make-inserter with-lookup)
 (quickurl-list-make-inserter with-desc)
 (quickurl-list-make-inserter lookup)
-  
+
 (provide 'quickurl)
 
 ;;; quickurl.el ends here
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index b9ee7658d52..8105593c758 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -58,7 +58,7 @@
 ;;
 ;; Will allow anyone access to your account without a password. I suggest you
 ;; read the rhosts(5) manual page before you edit this file (if you are not
-;; familiar with it already) 
+;; familiar with it already)
 
 ;;; Code:
 
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index abfd5b582ac..b75ff47220d 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -30,7 +30,7 @@
 ;; sessions are supported.
 ;;
 ;; Normally, input is sent to the remote telnet/rsh line-by-line, as you
-;; type RET or LFD.  C-c C-c sends a C-c to the remote immediately; 
+;; type RET or LFD.  C-c C-c sends a C-c to the remote immediately;
 ;; C-c C-z sends C-z immediately.  C-c C-q followed by any character
 ;; sends that character immediately.
 ;;
@@ -112,7 +112,7 @@ rejecting one login and prompting again for a username and password.")
   (define-key telnet-mode-map "\C-m" 'telnet-send-input)
 ;  (define-key telnet-mode-map "\C-j" 'telnet-send-input)
   (define-key telnet-mode-map "\C-c\C-q" 'send-process-next-char)
-  (define-key telnet-mode-map "\C-c\C-c" 'telnet-interrupt-subjob) 
+  (define-key telnet-mode-map "\C-c\C-c" 'telnet-interrupt-subjob)
   (define-key telnet-mode-map "\C-c\C-z" 'telnet-c-z))
 
 ;;maybe should have a flag for when have found type
@@ -214,7 +214,7 @@ Normally input is edited in Emacs and sent a line at a time."
 	 process)
     (if (and buffer (get-buffer-process buffer))
 	(pop-to-buffer (concat "*" name "*"))
-      (pop-to-buffer 
+      (pop-to-buffer
        (apply 'make-comint name telnet-program nil telnet-options))
       (setq process (get-buffer-process (current-buffer)))
       (set-process-filter process 'telnet-initial-filter)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index b24b53d421a..eebd84a2673 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -328,7 +328,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server."
      (cons x (file-attributes
 	(if full x (concat (file-name-as-directory directory) x)))))
    (directory-files directory full match nosort)))
- 
+
 (defun tramp-smb-handle-file-attributes (filename &optional nonnumeric)
   "Like `file-attributes' for tramp files.
 Optional argument NONNUMERIC means return user and group name
@@ -477,7 +477,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled."
 	     (entries (tramp-smb-get-file-entries user host share file)))
 
 	;; Delete dummy "" entry, useless entries
-	(setq entries 
+	(setq entries
 	      (if (file-directory-p filename)
 		  (delq (assoc "" entries) entries)
 		;; We just need the only and only entry FILENAME.
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index d59269680e5..4e96303a0fe 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -43,7 +43,7 @@
 ;; This used to blow away the file-name-handler-alist and reinstall
 ;; TRAMP into it. This was intended to let VC work remotely. It didn't,
 ;; at least not in my XEmacs 21.2 install.
-;; 
+;;
 ;; In any case, tramp-run-real-handler now deals correctly with disabling
 ;; the things that should be, making this a no-op.
 ;;
@@ -88,7 +88,7 @@ See `vc-do-command' for more information."
 	(set (make-local-variable 'vc-parent-buffer-name)
 	     (concat " from " (buffer-name camefrom)))
 	(setq default-directory olddir)
-    
+
 	(erase-buffer)
 
 	(mapcar
@@ -216,7 +216,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
         (if (or (and (stringp file)     (tramp-tramp-file-p file))
                 (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
             (setq ad-return-value
-                  (apply 'tramp-vc-do-command-new buffer okstatus command 
+                  (apply 'tramp-vc-do-command-new buffer okstatus command
                          file ;(or file (buffer-file-name))
                          flags))
           ad-do-it)))
@@ -229,7 +229,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
       (if (or (and (stringp file)     (tramp-tramp-file-p file))
               (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
           (setq ad-return-value
-                (apply 'tramp-vc-do-command buffer okstatus command 
+                (apply 'tramp-vc-do-command buffer okstatus command
                        (or file (buffer-file-name)) last flags))
         ad-do-it))))
 ;;-)
@@ -283,7 +283,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 	    (tramp-wait-for-output)
 	    (setq exec-status (read (current-buffer)))
 	    (message "Command %s returned status %d." command exec-status)))
-      
+
 	;; Maybe okstatus can be `async' here.  But then, maybe the
 	;; async thing is new in Emacs 21, but this function is only
 	;; used in Emacs 20.
@@ -304,7 +304,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
     (if (or (and (stringp file)     (tramp-tramp-file-p file))
             (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
         (setq ad-return-value
-              (apply 'tramp-vc-simple-command okstatus command 
+              (apply 'tramp-vc-simple-command okstatus command
                      (or file (buffer-file-name)) args))
       ad-do-it)))
 
@@ -362,17 +362,17 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 
 
 ;; Do we need to advise the vc-user-login-name function anyway?
-;; This will return the correct login name for the owner of a 
+;; This will return the correct login name for the owner of a
 ;; file. It does not deal with the default remote user name...
 ;;
-;; That is, when vc calls (vc-user-login-name), we return the 
+;; That is, when vc calls (vc-user-login-name), we return the
 ;; local login name, something that may be different to the remote
-;; default. 
+;; default.
 ;;
 ;; The remote VC operations will occur as the user that we logged
 ;; in with however - not always the same as the local user.
 ;;
-;; In the end, I did advise the function. This is because, well, 
+;; In the end, I did advise the function. This is because, well,
 ;; the thing didn't work right otherwise ;)
 ;;
 ;; Daniel Pittman <daniel@danann.net>
@@ -417,11 +417,11 @@ filename we are thinking about..."
 		     (tramp-handle-vc-user-login-name uid)))) ; get the owner name
         ad-do-it)))                     ; else call the original
 
-  
+
 ;; Determine the name of the user owning a file.
 (defun tramp-file-owner (filename)
   "Return who owns FILE (user name, as a string)."
-  (let ((v (tramp-dissect-file-name 
+  (let ((v (tramp-dissect-file-name
 	    (tramp-handle-expand-file-name filename))))
     (if (not (tramp-handle-file-exists-p filename))
         nil                             ; file cannot be opened
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 864fe35efe9..1efc50f0d6b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
-;; Author: Kai.Grossjohann@CS.Uni-Dortmund.DE 
+;; Author: Kai.Grossjohann@CS.Uni-Dortmund.DE
 ;; Keywords: comm, processes
 
 ;; This file is part of GNU Emacs.
@@ -34,7 +34,7 @@
 ;;
 ;; Notes:
 ;; -----
-;; 
+;;
 ;; This package only works for Emacs 20 and higher, and for XEmacs 21
 ;; and higher.  (XEmacs 20 is missing the `with-timeout' macro.  Emacs
 ;; 19 is reported to have other problems.  For XEmacs 21, you need the
@@ -95,7 +95,7 @@
 (unless (fboundp 'uudecode-decode-region)
   (autoload 'uudecode-decode-region "uudecode"))
 
-;; ;; It does not work to load EFS after loading TRAMP.  
+;; ;; It does not work to load EFS after loading TRAMP.
 ;; (when (fboundp 'efs-file-handler-function)
 ;;   (require 'efs))
 
@@ -483,7 +483,7 @@ This variable defaults to the value of `tramp-encoding-shell'."
 	      (tramp-su-args              nil)
 	      (tramp-telnet-program       nil)
               (tramp-telnet-args          nil))
-     ("fcp"   
+     ("fcp"
 	      (tramp-connection-function  tramp-open-connection-rsh)
               (tramp-rsh-program          "fsh")
               (tramp-rcp-program          "fcp")
@@ -1782,7 +1782,7 @@ target of the symlink differ."
 	(setq filename (tramp-file-name-path
 			(tramp-dissect-file-name
 			 (expand-file-name filename)))))
-    
+
       ;; Right, they are on the same host, regardless of user, method, etc.
       ;; We now make the link on the remote machine. This will occur as the user
       ;; that FILENAME belongs to.
@@ -1791,7 +1791,7 @@ target of the symlink differ."
 	l-multi-method l-method l-user l-host
 	(format "cd %s && %s -sf %s %s"
 		cwd ln
-		filename 
+		filename
 		l-path)
 	t)))))
 
@@ -2063,7 +2063,7 @@ is initially created and is kept cached by the remote shell."
 			     multi-method method user host path))
   (tramp-send-command
    multi-method method user host
-   (format "tramp_file_attributes %s" 
+   (format "tramp_file_attributes %s"
 	   (tramp-shell-quote-argument path)))
   (tramp-wait-for-output)
   (let ((result (read (current-buffer))))
@@ -2403,7 +2403,7 @@ if the remote host can't provide the modtime."
 	    (push (buffer-substring (point)
 				    (tramp-line-end-position))
 		  result))
-	
+
 	  (tramp-send-command multi-method method user host "cd")
 	  (tramp-wait-for-output)
 
@@ -2647,7 +2647,7 @@ This is like `dired-recursive-delete-directory' for tramp files."
 	 'file-error
 	 (list "Removing old file name" "no such directory" filename)))
     ;; Which is better, -r or -R? (-r works for me <daniel@danann.net>)
-    (tramp-send-command multi-method method user host 
+    (tramp-send-command multi-method method user host
 			(format "rm -r %s" (tramp-shell-quote-argument path)))
     ;; Wait for the remote system to return to us...
     ;; This might take a while, allow it plenty of time.
@@ -2655,7 +2655,7 @@ This is like `dired-recursive-delete-directory' for tramp files."
     ;; Make sure that it worked...
     (and (tramp-handle-file-exists-p filename)
 	 (error "Failed to recusively delete %s" filename))))
-	 
+
 
 (defun tramp-handle-dired-call-process (program discard &rest arguments)
   "Like `dired-call-process' for tramp files."
@@ -3505,7 +3505,7 @@ necessary anymore."
 ;; `tramp-completion-file-name-regexp-unified' aren't different.
 ;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to
 ;; `tramp-file-name-handler'). Otherwise, it takes `tramp-run-real-handler'.
-;; Using `last-input-event' is a little bit risky, because completing a file 
+;; Using `last-input-event' is a little bit risky, because completing a file
 ;; might require loading other files, like "~/.netrc", and for them it
 ;; shouldn't be decided based on that variable. On the other hand, those files
 ;; shouldn't have partial tramp file name syntax. Maybe another variable should
@@ -3594,7 +3594,7 @@ necessary anymore."
 			       (funcall (nth 0 x) (nth 1 x)))))
 	       (tramp-get-completion-function m))
 
-	      (setq result (append result 
+	      (setq result (append result
 	        (mapcar
 		 (lambda (x)
 		   (tramp-get-completion-user-host
@@ -3635,7 +3635,7 @@ necessary anymore."
 ;; [nil nil "x" nil nil]
 ;; [nil "x" nil nil nil]
 
-;; "/x:"                    "/x:y"                   "/x:y:"		      
+;; "/x:"                    "/x:y"                   "/x:y:"
 ;; [nil nil nil "x" ""]     [nil nil nil "x" "y"]    [nil "x" nil "y" ""]
 ;;       "/[x/"                   "/[x/y"
 ;; [nil "x" nil "" nil]     [nil "x" nil "y" nil]
@@ -4154,7 +4154,7 @@ file exists and nonzero exit status otherwise."
                   (tramp-handle-file-exists-p existing)
                   (not (tramp-handle-file-exists-p nonexisting))))
       (error "Couldn't find command to check if file exists."))))
-    
+
 
 ;; CCC test ksh or bash found for tilde expansion?
 (defun tramp-find-shell (multi-method method user host)
@@ -4253,9 +4253,9 @@ Returns nil if none was found, else the command is returned."
    (tramp-check-ls-commands multi-method method user host "gnuls" tramp-remote-path)
    (tramp-check-ls-commands multi-method method user host "gls" tramp-remote-path)))
 
-;; ------------------------------------------------------------ 
-;; -- Functions for establishing connection -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- Functions for establishing connection --
+;; ------------------------------------------------------------
 
 ;; The following functions are actions to be taken when seeing certain
 ;; prompts from the remote host.  See the variable
@@ -4454,7 +4454,7 @@ Maybe the different regular expressions need to be tuned.
     (when multi-method
       (error "Cannot multi-connect using telnet connection method"))
     (tramp-pre-connection multi-method method user host)
-    (tramp-message 7 "Opening connection for %s@%s using %s..." 
+    (tramp-message 7 "Opening connection for %s@%s using %s..."
 		   (or user (user-login-name)) host method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
@@ -4488,7 +4488,7 @@ Maybe the different regular expressions need to be tuned.
          p multi-method method user host)
         (tramp-post-connection multi-method method user host)))))
 
-	    
+
 (defun tramp-open-connection-rsh (multi-method method user host)
   "Open a connection using an rsh METHOD.
 This starts the command `rsh HOST -l USER'[*], then waits for a remote
@@ -4519,7 +4519,7 @@ arguments, and xx will be used as the host name to connect to.
       (error "Cannot multi-connect using rsh connection method"))
     (tramp-pre-connection multi-method method user host)
     (if (and user (not (string= user "")))
-	(tramp-message 7 "Opening connection for %s@%s using %s..." 
+	(tramp-message 7 "Opening connection for %s@%s using %s..."
 		       user host method)
       (tramp-message 7 "Opening connection at %s using %s..." host method))
     (let ((process-environment (copy-sequence process-environment))
@@ -4547,9 +4547,9 @@ arguments, and xx will be used as the host name to connect to.
                                                   (> emacs-major-version 20))
                                        tramp-dos-coding-system))
              (p (if (and user (not (string= user "")))
-                    (apply #'start-process bufnam buf rsh-program  
+                    (apply #'start-process bufnam buf rsh-program
                            host "-l" user rsh-args)
-                  (apply #'start-process bufnam buf rsh-program 
+                  (apply #'start-process bufnam buf rsh-program
                          host rsh-args)))
              (found nil))
         (process-kill-without-query p)
@@ -4619,10 +4619,10 @@ prompt than you do, so it is not at all unlikely that the variable
 			       tramp-actions-before-shell)
         (tramp-open-connection-setup-interactive-shell
          p multi-method method user host)
-        (tramp-post-connection multi-method method 
+        (tramp-post-connection multi-method method
                                user host)))))
 
-;; HHH: Not Changed.  Multi method.  It is not clear to me how this can 
+;; HHH: Not Changed.  Multi method.  It is not clear to me how this can
 ;;      handle not giving a user name in the "file name".
 ;;
 ;;      This is more difficult than for the single-hop method.  In the
@@ -4692,7 +4692,7 @@ log in as u2 to h2."
         (tramp-post-connection multi-method method user host)))))
 
 ;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
-;;      of no user name provided.  Hack to make it work as it did before:  
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-telnet (p method user host command)
@@ -4714,8 +4714,8 @@ If USER is nil, uses the return value of (user-login-name) instead."
     (tramp-process-multi-actions p method user host
 				 tramp-multi-actions)))
 
-;; HHH: Changed.  Multi method.  Don't know how to handle this in the case 
-;;      of no user name provided.  Hack to make it work as it did before:  
+;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-rlogin (p method user host command)
@@ -4740,8 +4740,8 @@ If USER is nil, uses the return value of (user-login-name) instead."
     (tramp-process-multi-actions p method user host
 				 tramp-multi-actions)))
 
-;; HHH: Changed.  Multi method.  Don't know how to handle this in the case 
-;;      of no user name provided.  Hack to make it work as it did before:  
+;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-su (p method user host command)
@@ -5700,9 +5700,9 @@ Not actually used.  Use `(format \"%o\" i)' instead?"
    ""))
 
 
-;; ------------------------------------------------------------ 
-;; -- TRAMP file names -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- TRAMP file names --
+;; ------------------------------------------------------------
 ;; Conversion functions between external representation and
 ;; internal data structure.  Convenience functions for internal
 ;; data structure.
@@ -5713,7 +5713,7 @@ Not actually used.  Use `(format \"%o\" i)' instead?"
   "Return t iff NAME is a tramp file."
   (save-match-data
     (string-match tramp-file-name-regexp name)))
- 
+
 ;; HHH: Changed.  Used to assign the return value of (user-login-name)
 ;;      to the `user' part of the structure if a user name was not
 ;;      provided, now it assigns nil.
@@ -5766,7 +5766,7 @@ This is MULTI-METHOD, if non-nil.  Otherwise, it is METHOD, if non-nil.
 If both MULTI-METHOD and METHOD are nil, do a lookup in
 `tramp-default-method-alist'."
   (or multi-method method (tramp-find-default-method user host)))
-    
+
 ;; HHH: Not Changed.  Multi method.  Will probably not handle the case where
 ;;      a user name is not provided in the "file name" very well.
 (defun tramp-dissect-multi-file-name (name)
@@ -6137,9 +6137,9 @@ If you want to use it for something else, you'll have to check whether
 it does the right thing."
   (delete "" (split-string string pattern)))
 
-;; ------------------------------------------------------------ 
-;; -- Kludges section -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- Kludges section --
+;; ------------------------------------------------------------
 
 ;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
 ;; does not deal well with newline characters.  Newline is replaced by
@@ -6394,7 +6394,7 @@ report.
 ;;   strange when doing zerop, we should kill the process and start
 ;;   again.  (Greg Stark)
 ;; * Add caching for filename completion.  (Greg Stark)
-;;   Of course, this has issues with usability (stale cache bites) 
+;;   Of course, this has issues with usability (stale cache bites)
 ;;      -- <daniel@danann.net>
 ;; * Provide a local cache of old versions of remote files for the rsync
 ;;   transfer method to use.  (Greg Stark)
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 3c2ae4c7d52..4c701b48ac5 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -1,5 +1,5 @@
 ;;; webjump.el --- programmable Web hotlist
-     
+
 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 
 ;; Author:    Neil W. Van Dyke <nwv@acm.org>
@@ -109,7 +109,7 @@
               "ftp://ftp.luth.se/pub/unix/gnu"
               "ftp://ftp.sunet.se/pub/gnu"
               "ftp://archive.eu.net"
-              ;; SOUTH AMERICA: 
+              ;; SOUTH AMERICA:
               "ftp://ftp.inf.utfsm.cl/pub/gnu"
               "ftp://ftp.unicamp.br/pub/gnu"
               ;; WESTERN CANADA:
@@ -133,7 +133,7 @@
      "ftp://ftp.emacs.org/pub/")
 
     ;; Internet search engines.
-    ("AltaVista" . 
+    ("AltaVista" .
      [simple-query
       "www.altavista.digital.com"
       "www.altavista.digital.com/cgi-bin/query?pg=aq&what=web&fmt=.&q="
@@ -144,12 +144,12 @@
     ("Lycos" .
      [simple-query "www.lycos.com"
                    "www.lycos.com/cgi-bin/pursuit?cat=lycos&query=" ""])
-    ("Yahoo" . 
+    ("Yahoo" .
      [simple-query "www.yahoo.com" "search.yahoo.com/bin/search?p=" ""])
 
     ;; Misc. general interest.
     ("Interactive Weather Information Network" . webjump-to-iwin)
-    ("Usenet FAQs" . 
+    ("Usenet FAQs" .
      [simple-query "www.cis.ohio-state.edu/hypertext/faq/usenet/FAQ-List.html"
 		   "www.cis.ohio-state.edu/htbin/search-usenet-faqs/form?find="
 		   ""])
@@ -287,7 +287,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 		       ((symbolp expr)
 			(if (fboundp expr)
 			    (funcall expr name)
-			  (error "WebJump URL function \"%s\" undefined" 
+			  (error "WebJump URL function \"%s\" undefined"
 				 expr)))
 		       (t (error "WebJump URL expression for \"%s\" invalid"
 				 name)))))))
@@ -343,11 +343,11 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
   ;; Note: I should make this more robust someday.
   (let ((input (webjump-read-string prompt)))
     (if input (string-to-number input))))
-  
+
 (defun webjump-read-string (prompt)
   (let ((input (read-string (concat prompt ": "))))
     (if (webjump-null-or-blank-string-p input) nil input)))
-  
+
 (defun webjump-read-url-choice (what urls &optional default)
   ;; Note: Convert this to use `webjump-read-choice' someday.
   (let* ((completions (mapcar (function (lambda (n) (cons n n)))
diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el
index bb8bacacc61..a58bc2dd54a 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -62,7 +62,7 @@
 	(if (string-lessp new-serial old-serial)
 	    (error (format "Serial numbers want to move backwards from %s to %s" old-serial new-serial))
 	  (replace-match (concat cur-date new-seq old-flag) t t))))))
-  
+
 ;;;###autoload
 (defun zone-mode-update-serial-hook ()
   "Update the serial number in a zone if the file was modified."