Merge from mainline.

24 files changed, 0 insertions, 24 deletions

diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 0d2f017e6b9..43e5d14ee37 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -186,4 +186,3 @@ do not contain any text from preceding or following text."
 
 ;;; srecode/args.el ends here
 
-;; arch-tag: 645fc31e-30a9-469b-9215-fb320a46ee96
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index b404c4a8123..0abbcb3ac69 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -654,5 +654,4 @@ Argument INDENT specifies the indentation level for the list."
 ;; generated-autoload-load-name: "srecode/compile"
 ;; End:
 
-;; arch-tag: d993ffab-2704-4bb2-bd92-eafe803af3be
 ;;; srecode/compile.el ends here
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index ab9d4a5fe6d..62ee6be42ec 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -213,5 +213,4 @@ special behavior for tag of classes include, using and function."
 ;; generated-autoload-load-name: "srecode/cpp"
 ;; End:
 
-;; arch-tag: 4659755c-88b4-405e-818f-bb1f776a8e82
 ;;; srecode/cpp.el ends here
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index b951788bec3..ad42e1b5007 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -244,5 +244,4 @@ This might add the following:
 
 (provide 'srecode/ctxt)
 
-;; arch-tag: 5a004702-28e5-4e26-9b14-8a78eae49865
 ;;; srecode/ctxt.el ends here
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index e04aad33065..30052c07498 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -708,5 +708,4 @@ STATE is the current compiler state."
 
 (provide 'srecode/dictionary)
 
-;; arch-tag: c664179c-171c-4709-9b56-d5a2fd30e457
 ;;; srecode/dictionary.el ends here
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 6d4231f3967..210c303055b 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -837,5 +837,4 @@ not account for verb parts."
 ;; generated-autoload-load-name: "srecode/document"
 ;; End:
 
-;; arch-tag: 5ce9b30b-7862-4ab8-b3f8-a4df37a2e0fe
 ;;; srecode/document.el ends here
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index e8c585cca6c..9d051d6d200 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -109,5 +109,4 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first."
 ;; generated-autoload-load-name: "srecode/el"
 ;; End:
 
-;; arch-tag: c1852a36-d45b-4263-8f3e-03f4f3c795d9
 ;;; srecode/el.el ends here
diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el
index 92c5326a85a..9ff766ad52c 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -129,5 +129,4 @@
 ;; generated-autoload-load-name: "srecode/expandproto"
 ;; End:
 
-;; arch-tag: f0371b5f-9bec-46a1-9b5d-8dff0e897426
 ;;; srecode/expandproto.el ends here
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index df556b29e0e..4d3f533a35e 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -239,5 +239,4 @@ Return nil if nothing was extracted."
 
 (provide 'srecode/extract)
 
-;; arch-tag: 051f5901-46ae-4319-8c84-16daf971e226
 ;;; srecode/extract.el ends here
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 817bb93d2fd..ae9bf3502f0 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -447,5 +447,4 @@ PRE-LEN is used in the after mode for the length of the changed text."
 
 (provide 'srecode/fields)
 
-;; arch-tag: 00cea6f0-42ac-4b15-b778-46e6db0bfcb5
 ;;; srecode/fields.el ends here
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 0afd32bbb41..4b8a8abfec4 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -54,4 +54,3 @@
 
 ;;; srecode/filters.el ends here
 
-;; arch-tag: fcc95ddc-8d9a-4b15-bb51-2707ead986c7
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 39b7656d007..888e4b6bd9d 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -278,5 +278,4 @@ DEFAULT is what to use if the user presses RET."
 
 (provide 'srecode/find)
 
-;; arch-tag: 49d18e58-45a0-48f5-92e1-4a1dcd4e36a6
 ;;; srecode/find.el ends here
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index bf1a684c19a..b865b5ec626 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -363,5 +363,4 @@ Base selection on the field related to POINT."
 ;; generated-autoload-load-name: "srecode/getset"
 ;; End:
 
-;; arch-tag: c2098b7a-df7f-4e8a-a9e3-2be8798a7554
 ;;; srecode/getset.el ends here
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 1df08d2c74c..f69706370d6 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1020,5 +1020,4 @@ template where a ^ inserter occurs."
 ;; generated-autoload-load-name: "srecode/insert"
 ;; End:
 
-;; arch-tag: a5aa3401-924a-4617-8513-2f0f01256872
 ;;; srecode/insert.el ends here
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 97f4eb34597..5393b83aa62 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -58,5 +58,4 @@ FILENAME_AS_CLASS - file converted to a Java class name."
 ;; generated-autoload-load-name: "srecode/java"
 ;; End:
 
-;; arch-tag: d796b86c-3a0e-457c-a346-9f1ccfdc5e2c
 ;;; srecode/java.el ends here
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index e3f78ed9978..d6da232bd33 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -415,5 +415,4 @@ Return non-nil if the map changed."
 ;; generated-autoload-load-name: "srecode/map"
 ;; End:
 
-;; arch-tag: dc90c737-1e87-455a-bbd1-6b72cdbfb7fd
 ;;; srecode/map.el ends here
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bdb8172eb5e..30797453fb1 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -396,5 +396,4 @@ programming modes."
 ;; generated-autoload-load-name: "srecode/mode"
 ;; End:
 
-;; arch-tag: 56ad9d6b-899b-4a68-8636-1432b6bc149b
 ;;; srecode/mode.el ends here
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 0926ccf4da7..5991b0f9b6e 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -428,5 +428,4 @@ as `function' will leave point where code might be inserted."
 
 (provide 'srecode/semantic)
 
-;; arch-tag: b87ccbd6-bd87-48bc-8182-1043a9052d79
 ;;; srecode/semantic.el ends here
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 7df06a608f5..5e16303425e 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -740,5 +740,4 @@ When optional BUFFER is provided, search that buffer."
 ;; generated-autoload-load-name: "srecode/srt-mode"
 ;; End:
 
-;; arch-tag: 9c613c25-d885-417a-8f0d-1824b26b22a5
 ;;; srecode/srt-mode.el ends here
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 3dde065c2a6..9281451694a 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -274,5 +274,4 @@ It ignores whitespace, newlines and comments."
 
 (provide 'srecode/srt-wy)
 
-;; arch-tag: 1be4c0bc-2a79-4f75-a07a-1ac518f41271
 ;;; srecode/srt-wy.el ends here
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index 3fc5f4cb907..e070e59fd9c 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -104,5 +104,4 @@ MODE - The mode of this buffer.  If not declared yet, guess."
 
 (provide 'srecode/srt)
 
-;; arch-tag: fb69da04-0bd6-48fe-b935-f8668420ecaf
 ;;; srecode/srt.el ends here
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 8cba7aff7f3..c80c88c8fbc 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -259,4 +259,3 @@ Use PREDICATE is the same as for the `sort' function."
 
 ;;; srecode/table.el ends here
 
-;; arch-tag: 547d2f1d-2694-49b3-ab13-b2cda6b25b4d
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index d127375fbff..d61146e164f 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -72,5 +72,4 @@
 ;; generated-autoload-load-name: "srecode/template"
 ;; End:
 
-;; arch-tag: 037fbca7-e846-4521-b801-3463f50c3080
 ;;; srecode/template.el ends here
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 2ac2a240c01..e581a185cdd 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -285,5 +285,4 @@ that class.
 ;; generated-autoload-load-name: "srecode/texi"
 ;; End:
 
-;; arch-tag: 6f0e7f45-2281-49e4-b73c-680cba477094
 ;;; srecode/texi.el ends here