29 files changed, 9 insertions, 41 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 159b276716..a315482fd1 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1469,15 +1469,14 @@ only return the directory part of FILE."
 ;; Display the last chunk of output from the ftp process for the given HOST
 ;; USER pair, and signal an error including MSG in the text.
 (defun ange-ftp-error (host user msg)
-  (save-excursion  ;; Prevent pop-to-buffer from changing current buffer.
-    (let ((cur (selected-window))
-	  (pop-up-windows t))
-      (pop-to-buffer
-       (get-buffer-create
-	(ange-ftp-ftp-process-buffer host user)))
-      (goto-char (point-max))
-      (select-window cur))
-    (signal 'ftp-error (list (format "FTP Error: %s" msg)))))
+  (let ((cur (selected-window))
+	(pop-up-windows t))
+    (pop-to-buffer
+     (get-buffer-create
+      (ange-ftp-ftp-process-buffer host user)))
+    (goto-char (point-max))
+    (select-window cur))
+  (signal 'ftp-error (list (format "FTP Error: %s" msg))))
 
 (defun ange-ftp-set-buffer-mode ()
   "Set correct modes for the current buffer if visiting a remote file."
@@ -6049,5 +6048,4 @@ be recognized automatically (they are all valid BS2000 hosts too)."
 
 (provide 'ange-ftp)
 
-;;; arch-tag: 2987ef88-cb56-4ec1-87a9-79132572e316
 ;;; ange-ftp.el ends here
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 5a25801458..b97eda6472 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1355,5 +1355,4 @@ Default to the URL around or before point."
 
 (provide 'browse-url)
 
-;;; arch-tag: d2079573-5c06-4097-9598-f550fba19430
 ;;; browse-url.el ends here
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index df20007cfb..78593fe5c1 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -365,5 +365,4 @@ display a button."
   "Display a button for the JPEG DATA."
   (eudc-bob-display-jpeg data nil))
 
-;;; arch-tag: 8f1853df-c9b6-4c5a-bdb1-d94dbd651fb3
 ;;; eudc-bob.el ends here
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 704792f6b6..9bd3ad7ca7 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -215,5 +215,4 @@ This function can only be called from a directory query result buffer."
        (overlay-get (car (overlays-at (point))) 'eudc-record)
        (eudc-insert-record-at-point-into-bbdb)))
 
-;;; arch-tag: 8cbda7dc-3163-47e6-921c-6ec5083df2d7
 ;;; eudc-export.el ends here
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 9dc81ce2bc..c03cf0219f 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -194,5 +194,4 @@ These are the special commands of this mode:
 		      ""
 		      eudc-hotlist-menu))
 
-;;; arch-tag: 9b633ab3-6a6e-4b46-b12e-d96739a7e0e8
 ;;; eudc-hotlist.el ends here
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 1b9da92da6..b44f7f7460 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -406,5 +406,4 @@ Otherwise records must match queries exactly."
 
 (provide 'eudc-vars)
 
-;;; arch-tag: 80050575-b838-4246-8ebc-b2d7c5a2e482
 ;;; eudc-vars.el ends here
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 6d12d5e636..9d3e4aa9d3 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1284,5 +1284,4 @@ This does nothing except loading eudc by autoload side-effect."
 
 (provide 'eudc)
 
-;;; arch-tag: e18872b6-db83-400b-869d-be54e9a4160c
 ;;; eudc.el ends here
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 745d6e289a..1c20c7cc18 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -231,5 +231,4 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
 
 (provide 'eudcb-bbdb)
 
-;;; arch-tag: 38276208-75de-4dbc-ba6f-8db684c32e0a
 ;;; eudcb-bbdb.el ends here
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index a206578b77..fb97bc754e 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -208,5 +208,4 @@ attribute names are returned. Default to `person'"
 
 (provide 'eudcb-ldap)
 
-;;; arch-tag: 0f254dc0-7378-4fd4-ae26-18666184e96b
 ;;; eudcb-ldap.el ends here
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index efd89beaaa..68d03979f4 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -244,5 +244,4 @@ depending on RETURN-RESPONSE."
 
 (provide 'eudcb-ph)
 
-;;; arch-tag: 4365bbf5-af20-453e-b5b6-2e7118ebfcdb
 ;;; eudcb-ph.el ends here
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index b77be84deb..1449c9bcc3 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -248,5 +248,4 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 
 (provide 'goto-addr)
 
-;;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
 ;;; goto-addr.el ends here
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index d1a580f9c5..d539164e9f 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -607,5 +607,4 @@ an alist of attribute/value pairs."
 
 (provide 'ldap)
 
-;;; arch-tag: 47913a76-6155-42e6-ac58-6d28b5d50eb0
 ;;; ldap.el ends here
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 202dac361e..982923ed55 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -828,5 +828,4 @@ from SEARCH-STRING.  With argument, prompt for whois server."
 
 (provide 'net-utils)
 
-;;; arch-tag: 97119e91-9edb-4376-838b-bf7058fa1314
 ;;; net-utils.el ends here
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 713c036ce7..8062b4292d 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -125,5 +125,4 @@ Entries without port tokens default to DEFAULTPORT."
 
 (provide 'netrc)
 
-;;; arch-tag: af9929cc-2d12-482f-936e-eb4366f9fa55
 ;;; netrc.el ends here
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index fd13b3a0f5..22794a4107 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -549,5 +549,4 @@ TYPE dictates what will be inserted, options are:
 
 (provide 'quickurl)
 
-;;; arch-tag: a8183ea5-80c2-4082-a7d1-b0fdf2da467e
 ;;; quickurl.el ends here
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index c9078ac2d7..8105593c75 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -175,5 +175,4 @@ See \\[compile]."
       (set (make-local-variable 'comint-file-name-prefix)
 	   (concat "/" host ":")))))
 
-;;; arch-tag: 2866a132-ece4-4ce9-9f91-ec147f803f73
 ;;; rcompile.el ends here
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 772756033e..cc2defdf16 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Noah Friedman <[email protected]>
 ;; Keywords: unix, comm
 
-;; $Id: rlogin.el,v 1.4 2003/05/06 17:46:28 lektu Exp $
+;; $Id: rlogin.el,v 1.3 2002/03/14 11:51:47 miles Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -329,5 +329,4 @@ Delete ARG characters forward, or send a C-d to process if at end of buffer."
 
 (provide 'rlogin)
 
-;;; arch-tag: 6e20eabf-feda-40fa-ab40-0d156db447e4
 ;;; rlogin.el ends here
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 7fed47f6bf..cde6fb7c60 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -720,5 +720,4 @@ controls whether case is significant."
 
 (provide 'snmp-mode)
 
-;;; arch-tag: eb6cc0f9-1e47-4023-8625-bc9aae6c3527
 ;;; snmp-mode.el ends here
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index d4c6d6a37a..b75ff47220 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -262,5 +262,4 @@ Normally input is edited in Emacs and sent a line at a time."
 
 (provide 'telnet)
 
-;;; arch-tag: 98218821-d04a-48b6-9058-57d0d4677a56
 ;;; telnet.el ends here
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index dd161032d9..70270773a3 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -124,5 +124,4 @@ specifying a port number to connect to."
 
 (provide 'tls)
 
-;;; arch-tag: 5596d1c4-facc-4bc4-94a9-9863b928d7ac
 ;;; tls.el ends here
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 7c9484f0c4..07a756c352 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -138,5 +138,4 @@ pass to the OPERATION."
 ;;   Furthermore, there are no backup files on FTP hosts.
 ;;   Worth further investigations.
 
-;;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff
 ;;; tramp-ftp.el ends here
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index fd902cd61b..8474b7a88a 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1139,5 +1139,4 @@ Return the difference in the format of a time value."
 ;; * (RMS) Use unwind-protect to clean up the state so as to make the state
 ;;   regular again.
 
-;;; arch-tag: fcc9dbec-7503-4d73-b638-3c8aa59575f5
 ;;; tramp-smb.el ends here
diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el
index 2d828d27c5..44a24ca3ab 100644
--- a/lisp/net/tramp-util.el
+++ b/lisp/net/tramp-util.el
@@ -52,6 +52,4 @@
   (compilation-minor-mode 1))
 
 (provide 'tramp-util)
-
-;;; arch-tag: 500f9992-a44e-46d0-83a7-980799251808
 ;;; tramp-util.el ends here
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index 1047e62a3c..e307febc6f 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -87,6 +87,4 @@
       (insert "begin 600 xxx\n"))))
 
 (provide 'tramp-uu)
-
-;;; arch-tag: 7153f2c6-8be5-4cd2-8c06-0fbcf5190ef6
 ;;; tramp-uu.el ends here
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index af86cdcc98..cee13308d3 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -486,5 +486,4 @@ This makes remote VC work correctly at the cost of some processing time."
 ;; No need to load this again if anyone asks.
 (provide 'tramp-vc)
 
-;;; arch-tag: 27cc42ce-da19-468d-ad5c-a2690558db60
 ;;; tramp-vc.el ends here
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 3949027436..966d93b719 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6642,5 +6642,4 @@ report.
 ;; unhandled-file-name-directory
 ;; vc-registered
 
-;;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a
 ;;; tramp.el ends here
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 0e71fe45d9..f741da8275 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -38,5 +38,4 @@
 
 (provide 'trampver)
 
-;;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1
 ;;; trampver.el ends here
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 7c5e869a5d..4c701b48ac 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -400,5 +400,4 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 
 (provide 'webjump)
 
-;;; arch-tag: f1d20156-0a6f-488b-bd91-f69ee8b6d5cc
 ;;; webjump.el ends here
diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el
index 591deee314..a58bc2dd54 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -115,5 +115,4 @@ Zone-mode does two things:
 
 (provide 'zone-mode)
 
-;;; arch-tag: 6a2940ef-fd4f-4de7-b979-b027b09821fe
 ;;; zone-mode.el ends here