The following commit has been merged in the master branch:
commit 36a15fee663324bf98f7cc1a5658a0ecff88628e
Author: Guillem Jover <[email protected]>
Date: Tue Apr 16 20:33:19 2013 +0200
Remove Emacs and vim modelines
These just clutter the code base, as adding modelines for each possible
editor out there does not scale, and they are currently not exhaustive
anyway.
diff --git a/Makecheck.am b/Makecheck.am
index 443841b..6f2d2e7 100644
--- a/Makecheck.am
+++ b/Makecheck.am
@@ -1,5 +1,3 @@
-# vim:set syn=automake:
-
# Variables to be defined:
#
# TEST_VERBOSE - set to 0 or 1 to control test suite verbosity
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index e813f76..d8b9742 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -335,5 +335,3 @@ do_contents(const char *const *argv)
return 0;
}
-/* vi: sw=2
- */
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 7db8e60..cac9834 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -273,6 +273,3 @@ int main(int argc, const char *const *argv) {
return ret;
}
-
-/* vi: sw=2
- */
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 1ee0c90..3aa1110 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -368,6 +368,3 @@ void baselist::wordwrapinfo(int offset, const char *m) {
}
baselist::~baselist() { }
-
-/* vi: sw=2 ts=8
- */
diff --git a/dselect/bindings.h b/dselect/bindings.h
index ba84954..5c05407 100644
--- a/dselect/bindings.h
+++ b/dselect/bindings.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* dselect - Debian package maintenance user interface
* bindings.h - keybindings class header file
*
diff --git a/dselect/dselect-curses.h b/dselect/dselect-curses.h
index 6a3ffdb..1ef85eb 100644
--- a/dselect/dselect-curses.h
+++ b/dselect/dselect-curses.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* dselect - Debian package maintenance user interface
* dselect-curses.h - curses header wrapper
*
diff --git a/dselect/dselect.h b/dselect/dselect.h
index 004dca3..94912a1 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* dselect - Debian package maintenance user interface
* dselect.h - external definitions for this program
*
diff --git a/dselect/method.h b/dselect/method.h
index aba7656..ec0f8db 100644
--- a/dselect/method.h
+++ b/dselect/method.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* dselect - Debian package maintenance user interface
* method.h - access method handling declarations
*
diff --git a/dselect/methods/Debian/Dselect/Ftp.pm
b/dselect/methods/Debian/Dselect/Ftp.pm
index 70c60bb..37fe896 100644
--- a/dselect/methods/Debian/Dselect/Ftp.pm
+++ b/dselect/methods/Debian/Dselect/Ftp.pm
@@ -1,4 +1,3 @@
-# -*-perl-*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install
index 6036f8d..6c153b1 100755
--- a/dselect/methods/ftp/install
+++ b/dselect/methods/ftp/install
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-# -*-perl-*-
#
# Copyright © 1996 Andy Guy <[email protected]>
# Copyright © 1998 Martin Schulze <[email protected]>
diff --git a/dselect/methods/ftp/setup b/dselect/methods/ftp/setup
index 1dd9855..05ef294 100755
--- a/dselect/methods/ftp/setup
+++ b/dselect/methods/ftp/setup
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-# -*-perl-*-
#
# Copyright © 1996 Andy Guy <[email protected]>
# Copyright © 1998 Martin Schulze <[email protected]>
diff --git a/dselect/methods/ftp/update b/dselect/methods/ftp/update
index 713d11c..507b54a 100755
--- a/dselect/methods/ftp/update
+++ b/dselect/methods/ftp/update
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-# -*-perl-*-
#
# Copyright © 1996 Andy Guy <[email protected]>
# Copyright © 1998 Martin Schulze <[email protected]>
diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install
index 4872f28..2adbe89 100755
--- a/dselect/methods/multicd/install
+++ b/dselect/methods/multicd/install
@@ -305,5 +305,3 @@ echo -n 'Installation OK. Hit RETURN. '
read response
xit=0
-
-# vim:ts=4:sw=4:aw:ai:
diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup
index d463b4d..81564cc 100755
--- a/dselect/methods/multicd/setup
+++ b/dselect/methods/multicd/setup
@@ -681,5 +681,3 @@ outputparam p_multi_contentsfile "$multi_contentsfile"
mv shvar.$option.new shvar.$option
xit=0
-
-# vim:ts=4:sw=4:aw:ai:
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 4c363c3..a5ecc86 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -620,6 +620,3 @@ pkginfo **packagelist::display() {
return 0;
}
}
-
-/* vi: sw=2 ts=8
- */
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index 08deb9a..dd113fc 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
* dselect - Debian package maintenance user interface
* pkglist.h - external definitions for package list handling
*
diff --git a/scripts/Dpkg/Exit.pm b/scripts/Dpkg/Exit.pm
index 6bbf0fe..28de118 100644
--- a/scripts/Dpkg/Exit.pm
+++ b/scripts/Dpkg/Exit.pm
@@ -30,5 +30,4 @@ $SIG{'INT'} = \&exit_handler;
$SIG{'HUP'} = \&exit_handler;
$SIG{'QUIT'} = \&exit_handler;
-# vim: set et sw=4 ts=8
1;
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 31c8010..f84457f 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -117,5 +117,4 @@ sub is_binary($) {
return $result;
}
-# vim: set et sw=4 ts=8
1;
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index cbc35aa..041c470 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -571,5 +571,4 @@ Raphaël Hertzog, E<lt>[email protected]<gt>
=cut
-# vim: set et sw=4 ts=8
1;
diff --git a/scripts/Dpkg/Source/Package/V1.pm
b/scripts/Dpkg/Source/Package/V1.pm
index 35704c5..fd611c7 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -391,5 +391,4 @@ sub do_build {
}
}
-# vim: set et sw=4 ts=8
1;
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index aa381f4..4a8ea6d 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -732,5 +732,4 @@ sub get_seen_binaries {
return sort keys %{$self->{'seen_binaries'}};
}
-# vim:et:sw=4:ts=8
1;
diff --git a/scripts/Dpkg/Source/Package/V3/custom.pm
b/scripts/Dpkg/Source/Package/V3/custom.pm
index a1a9f99..e27cdc6 100644
--- a/scripts/Dpkg/Source/Package/V3/custom.pm
+++ b/scripts/Dpkg/Source/Package/V3/custom.pm
@@ -58,5 +58,4 @@ sub do_build {
}
}
-# vim:et:sw=4:ts=8
1;
diff --git a/scripts/Dpkg/Source/Package/V3/native.pm
b/scripts/Dpkg/Source/Package/V3/native.pm
index ba6539a..0e9574c 100644
--- a/scripts/Dpkg/Source/Package/V3/native.pm
+++ b/scripts/Dpkg/Source/Package/V3/native.pm
@@ -104,5 +104,4 @@ sub do_build {
$self->add_file($tarname);
}
-# vim: set et sw=4 ts=8
1;
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index f5875c1..45f2e87 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -280,5 +280,4 @@ sub register_patch {
return $patch;
}
-# vim:et:sw=4:ts=8
1;
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index da4f7c2..2e0dd92 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -613,4 +613,3 @@ sub get_type {
}
1;
-# vim: set et sw=4 ts=8
diff --git a/scripts/Dpkg/Source/Quilt.pm b/scripts/Dpkg/Source/Quilt.pm
index 5ca9fb7..543a760 100644
--- a/scripts/Dpkg/Source/Quilt.pm
+++ b/scripts/Dpkg/Source/Quilt.pm
@@ -304,5 +304,4 @@ sub restore_quilt_backup_files {
}, $patch_dir);
}
-# vim:et:sw=4:ts=8
1;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 53f2659..66153f2 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -1,5 +1,4 @@
#! /usr/bin/perl
-# vim: set et sw=4 ts=8
#
# dpkg-source
#
diff --git a/scripts/t/000_pod.t b/scripts/t/000_pod.t
index aab28b9..a6f2cec 100644
--- a/scripts/t/000_pod.t
+++ b/scripts/t/000_pod.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/100_Dpkg_Version.t
index 97bc7d2..c759be7 100644
--- a/scripts/t/100_Dpkg_Version.t
+++ b/scripts/t/100_Dpkg_Version.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/150_Dpkg_Package.t b/scripts/t/150_Dpkg_Package.t
index 94b1319..dbabb7b 100644
--- a/scripts/t/150_Dpkg_Package.t
+++ b/scripts/t/150_Dpkg_Package.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
index c8fa6f1..0a72961 100644
--- a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
+++ b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t
index 0e7fd41..1bedda2 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/200_Dpkg_Shlibs.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/300_Dpkg_BuildOptions.t
b/scripts/t/300_Dpkg_BuildOptions.t
index a715549..1fdc4e5 100644
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/400_Dpkg_Deps.t b/scripts/t/400_Dpkg_Deps.t
index 932d113..20a3d9c 100644
--- a/scripts/t/400_Dpkg_Deps.t
+++ b/scripts/t/400_Dpkg_Deps.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/500_Dpkg_Path.t b/scripts/t/500_Dpkg_Path.t
index 70c1a74..741b47a 100644
--- a/scripts/t/500_Dpkg_Path.t
+++ b/scripts/t/500_Dpkg_Path.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/600_Dpkg_Changelog.t b/scripts/t/600_Dpkg_Changelog.t
index 81130a7..229d77b 100644
--- a/scripts/t/600_Dpkg_Changelog.t
+++ b/scripts/t/600_Dpkg_Changelog.t
@@ -1,4 +1,3 @@
-# -*- perl -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/600_Dpkg_Changelog_Ubuntu.t
b/scripts/t/600_Dpkg_Changelog_Ubuntu.t
index 1034c2e..51d043a 100644
--- a/scripts/t/600_Dpkg_Changelog_Ubuntu.t
+++ b/scripts/t/600_Dpkg_Changelog_Ubuntu.t
@@ -1,4 +1,3 @@
-# -*- perl -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/700_Dpkg_Control.t
index 074e084..eef6436 100644
--- a/scripts/t/700_Dpkg_Control.t
+++ b/scripts/t/700_Dpkg_Control.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/750_Dpkg_Substvars.t b/scripts/t/750_Dpkg_Substvars.t
index 04f9334..7d740dc 100644
--- a/scripts/t/750_Dpkg_Substvars.t
+++ b/scripts/t/750_Dpkg_Substvars.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/800_Dpkg_IPC.t b/scripts/t/800_Dpkg_IPC.t
index 706c0ff..50ad109 100644
--- a/scripts/t/800_Dpkg_IPC.t
+++ b/scripts/t/800_Dpkg_IPC.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/850_Dpkg_Compression.t b/scripts/t/850_Dpkg_Compression.t
index a8054f6..32b702d 100644
--- a/scripts/t/850_Dpkg_Compression.t
+++ b/scripts/t/850_Dpkg_Compression.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/scripts/t/910_merge_changelogs.t b/scripts/t/910_merge_changelogs.t
index 79951a9..0e19323 100644
--- a/scripts/t/910_merge_changelogs.t
+++ b/scripts/t/910_merge_changelogs.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/archives.c b/src/archives.c
index a4ebe92..919f710 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -1750,6 +1750,3 @@ struct fileinlist *newconff_append(struct fileinlist
***newconffileslastp_io,
*newconffileslastp_io= &newconff->next;
return newconff;
}
-
-/* vi: ts=8 sw=2
- */
diff --git a/src/filesdb.c b/src/filesdb.c
index df46fa6..5fe0e76 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -660,6 +660,3 @@ struct filenamenode *findnamenode(const char *name, enum
fnnflags flags) {
return newnode;
}
-
-/* vi: ts=8 sw=2
- */
diff --git a/src/t/100_dpkg_divert.t b/src/t/100_dpkg_divert.t
index bfa7e73..572b062 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/100_dpkg_divert.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/utils/t/100_update_alternatives.t
b/utils/t/100_update_alternatives.t
index 4a78677..b5f3330 100644
--- a/utils/t/100_update_alternatives.t
+++ b/utils/t/100_update_alternatives.t
@@ -1,4 +1,3 @@
-# -*- mode: cperl;-*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
