Merge from mainline.

30 files changed, 8 insertions, 33 deletions

diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index 0f7ea3fea2c..16d860e2572 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -1,6 +1,7 @@
 ;;; ede/autoconf-edit.el --- Keymap for autoconf
 
-;; Copyright (C) 1998, 1999, 2000, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2009, 2010, 2011
+;;   Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 5665d283844..002d3d40276 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -538,5 +538,4 @@ Note: This needs some work."
 ;; generated-autoload-load-name: "ede/cpp-root"
 ;; End:
 
-;; arch-tag: c3ac8160-cba6-447e-8b9c-accb7e2d942e
 ;;; ede/cpp-root.el ends here
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 68a2899f3a5..a107dab6653 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -84,5 +84,4 @@ negative, force off."
 
 (provide 'ede/dired)
 
-;; arch-tag: 95d3e0a7-a8b7-43a9-b7df-ba647e4c56f6
 ;;; ede/dired.el ends here
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 1ea35ea8c2a..fc02bdc5a91 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -299,5 +299,4 @@ Knows about how the Emacs source tree is organized."
 ;; generated-autoload-load-name: "ede/emacs"
 ;; End:
 
-;; arch-tag: 7cd0be95-663d-4101-8799-2f8216fd8233
 ;;; ede/emacs.el ends here
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 595845a1907..c92275c583c 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -501,5 +501,4 @@ Argument DIR is the directory to trim upwards."
 ;; generated-autoload-load-name: "ede/files"
 ;; End:
 
-;; arch-tag: 28e17358-0208-4678-828c-23fb0e783fd6
 ;;; ede/files.el ends here
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index a9f87f3dcf6..ac70191434c 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -245,5 +245,4 @@ Knows about how the Linux source tree is organized."
 ;; generated-autoload-load-name: "ede/linux"
 ;; End:
 
-;; arch-tag: 41f310c8-b169-4259-8a2d-0ff4bd0a736d
 ;;; ede/linux.el ends here
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 79f6d636154..1acf4363088 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -348,5 +348,4 @@ that created this EDE locate object."
 ;; generated-autoload-load-name: "ede/locate"
 ;; End:
 
-;; arch-tag: a04cb356-d11c-4f69-bd72-5a8a2aff708c
 ;;; ede/locate.el ends here
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index fc1e7cc8a15..66ba721206e 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -105,5 +105,4 @@ If NOERROR is nil, then throw an error on failure.  Return t otherwise."
 ;; generated-autoload-load-name: "ede/make"
 ;; End:
 
-;; arch-tag: cc54abdb-7ca5-4902-9735-eda3c6a77852
 ;;; ede/make.el ends here
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 56c4c072364..562f346ccee 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -126,5 +126,4 @@ Return nil if it isn't a variable."
 
 (provide 'ede/makefile-edit)
 
-;; arch-tag: aba26b5f-4306-40d9-b63c-84a9590ac986
 ;;; ede/makefile-edit.el ends here
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index a2258c1d16f..add7da03e98 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -184,5 +184,4 @@ Results in --add-missing being passed to automake."
 
 (provide 'ede/pconf)
 
-;; arch-tag: 8d514f68-2abe-4b35-8b4e-bea4fd0c3eab
 ;;; ede/pconf.el ends here
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index a9575b69249..0212ee5c021 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -1,7 +1,7 @@
 ;;; ede-pmake.el --- EDE Generic Project Makefile code generator.
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 58499dfe8e1..0f4bbc943c9 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -61,5 +61,4 @@ This makes sure that the archive is removed with 'make clean'."
 
 (provide 'ede/proj-archive)
 
-;; arch-tag: a0b2cfe8-0d11-4a4f-8e47-ebfb11b6ac33
 ;;; ede/proj-archive.el ends here
diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el
index 7d469fe0971..bcec712d0e5 100644
--- a/lisp/cedet/ede/proj-aux.el
+++ b/lisp/cedet/ede/proj-aux.el
@@ -44,5 +44,4 @@
 
 (provide 'ede/proj-aux)
 
-;; arch-tag: 668e96e0-2b30-474e-ba3c-9fa4fa696922
 ;;; ede/proj-aux.el ends here
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 9ec5cc64306..bdcaa1cdbb7 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -355,5 +355,4 @@ compiler it decides to use after inserting in the rule."
 
 (provide 'ede/proj-comp)
 
-;; arch-tag: ade67766-1a5d-467a-826a-93e95594d717
 ;;; ede/proj-comp.el ends here
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 8e964d5379e..f442b1a071f 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -1,7 +1,7 @@
 ;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index da2264ffe8a..e0084f91e5a 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -183,5 +183,4 @@ files in the project."
 
 (provide 'ede/proj-info)
 
-;; arch-tag: e4b7ce51-ae46-4d7c-a5fb-073f435cdcbf
 ;;; ede/proj-info.el ends here
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 9b35d44daad..5833e37c100 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -93,5 +93,4 @@ All listed sources are included in the distribution.")
 
 (provide 'ede/proj-misc)
 
-;; arch-tag: e5e5f8d2-9897-4a1b-8a29-5944ec5a892d
 ;;; ede/proj-misc.el ends here
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index 897f3731859..fbca97a08ac 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -320,5 +320,4 @@ Optional argument MORESOURCE is not used."
 
 (provide 'ede/proj-obj)
 
-;; arch-tag: f521b89f-1a3f-4910-ba81-65de3f421698
 ;;; ede/proj-obj.el ends here
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index e68606f33ab..436b8f3503d 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -141,5 +141,4 @@ Optional COMMAND is the command to run in place of asking the user."
 
 (provide 'ede/proj-prog)
 
-;; arch-tag: 0bfa9364-f385-4745-a846-462146a79a25
 ;;; ede/proj-prog.el ends here
diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el
index 64a17503684..2ab9c85c6ed 100644
--- a/lisp/cedet/ede/proj-scheme.el
+++ b/lisp/cedet/ede/proj-scheme.el
@@ -46,5 +46,4 @@
 
 (provide 'ede/proj-scheme)
 
-;; arch-tag: 451081e6-0d45-4560-9821-8ee03e8401ab
 ;;; ede/proj-scheme.el ends here
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 2e422c640fb..ea8b919ef8f 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -207,5 +207,4 @@ We need to override -program which has an LDADD element."
 
 (provide 'ede/proj-shared)
 
-;; arch-tag: 05f22c3e-b269-4411-9425-65e8fe4ab74a
 ;;; ede/proj-shared.el ends here
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 36a73e02e7c..1a3574c00f4 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -676,5 +676,4 @@ Optional argument FORCE will force items to be regenerated."
 
 (provide 'ede/proj)
 
-;; arch-tag: eb8a40f8-0d2c-41c4-b273-af04101d1cdf
 ;;; ede/proj.el ends here
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index ac3e8bfc6eb..c4fd938f11f 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -1020,5 +1020,4 @@ per file or in .dir-locals.el or similar."
 
 (provide 'ede/project-am)
 
-;; arch-tag: 528db935-f186-4240-b647-e305c5b784a2
 ;;; ede/project-am.el ends here
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index c13ce392da9..039198b92bd 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -79,5 +79,4 @@ COMMAND is a text string representing the thing to be run."
 ;; generated-autoload-load-name: "ede/shell"
 ;; End:
 
-;; arch-tag: 71bb9dc4-ad1c-4ba3-a95e-531a90500ca9
 ;;; ede/shell.el ends here
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 14b3a043a6d..bea08178e32 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -117,5 +117,4 @@ Each directory needs a project file to control it.")
 
 (provide 'ede/simple)
 
-;; arch-tag: a0c4264a-89ce-4364-afab-2512acd3b22a
 ;;; ede/simple.el ends here
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index fa555c13faf..5e55f4df3b8 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -170,5 +170,4 @@ Used to guess header files, but uses the auxsource regular expression."
 
 (provide 'ede/source)
 
-;; arch-tag: 60165fe2-920e-4adf-8531-25655388467d
 ;;; ede/source.el ends here
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index c7ea005e6cb..12637b35d33 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -1,7 +1,7 @@
 ;;; ede/speedbar.el --- Speedbar viewing of EDE projects
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008,
+;;   2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, tags
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el
index 6cd288b534e..63fc5adcc84 100644
--- a/lisp/cedet/ede/srecode.el
+++ b/lisp/cedet/ede/srecode.el
@@ -91,5 +91,4 @@ Note: Just like `srecode-insert', but templates found in 'ede app."
 
 (provide 'ede/srecode)
 
-;; arch-tag: 75bec542-7cc8-41a4-b5a0-8fb247609f03
 ;;; ede/srecode.el ends here
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index e10e4686fd9..8e1513930f2 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -143,5 +143,4 @@ Download tramp, and use /r:machine: for names on remote sites w/out FTP access."
 ;; generated-autoload-load-name: "ede/system"
 ;; End:
 
-;; arch-tag: a974ea44-151e-488b-b5d4-df2c05be6fe6
 ;;; ede/system.el ends here
diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index 749fbd51fa1..27b2833023e 100644
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -101,5 +101,4 @@ If BUFFER isn't specified, use the current buffer."
 ;; generated-autoload-load-name: "ede/util"
 ;; End:
 
-;; arch-tag: 3cddf449-7f6a-4c76-86dd-04142c60eba2
 ;;; ede/util.el ends here