From b45b2336349c705db3da0ec22e51411badfa6be9 Mon Sep 17 00:00:00 2001
From: wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Wed, 21 Sep 2011 17:49:11 +0000
Subject: [PATCH] Fix ex "modeline" so it works;  See
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39081 f5534014-38df-0310-8fa8-9805f1628bb7
---
 capture_wpcap_packet.c                          | 2 +-
 conditions.c                                    | 2 +-
 epan/crypt/airpdcap.c                           | 2 +-
 epan/dissectors/packet-2dparityfec.c            | 2 +-
 epan/dissectors/packet-banana.c                 | 2 +-
 epan/dissectors/packet-bittorrent.c             | 2 +-
 epan/dissectors/packet-bjnp.c                   | 6 +++---
 epan/dissectors/packet-bt-utp.c                 | 2 +-
 epan/dissectors/packet-cip.c                    | 2 +-
 epan/dissectors/packet-db-lsp.c                 | 2 +-
 epan/dissectors/packet-dmp.c                    | 2 +-
 epan/dissectors/packet-dnp.c                    | 2 +-
 epan/dissectors/packet-esio.c                   | 2 +-
 epan/dissectors/packet-gtpv2.c                  | 2 +-
 epan/dissectors/packet-h223.c                   | 2 +-
 epan/dissectors/packet-hdfs.c                   | 2 +-
 epan/dissectors/packet-hdfsdata.c               | 2 +-
 epan/dissectors/packet-iax2.c                   | 2 +-
 epan/dissectors/packet-ieee80211.c              | 2 +-
 epan/dissectors/packet-memcache.c               | 2 +-
 epan/dissectors/packet-mongo.c                  | 2 +-
 epan/dissectors/packet-nat-pmp.c                | 2 +-
 epan/dissectors/packet-netflow.c                | 2 +-
 epan/dissectors/packet-p_mul.c                  | 2 +-
 epan/dissectors/packet-packetlogger.c           | 2 +-
 epan/dissectors/packet-pflog.c                  | 2 +-
 epan/dissectors/packet-ppi-antenna.c            | 2 +-
 epan/dissectors/packet-ppi-geolocation-common.c | 2 +-
 epan/dissectors/packet-ppi-geolocation-common.h | 2 +-
 epan/dissectors/packet-ppi-gps.c                | 2 +-
 epan/dissectors/packet-ppi-sensor.c             | 2 +-
 epan/dissectors/packet-ppi-vector.c             | 2 +-
 epan/dissectors/packet-ppi.c                    | 2 +-
 epan/dissectors/packet-rpc.c                    | 2 +-
 epan/dissectors/packet-rpcap.c                  | 2 +-
 epan/dissectors/packet-sbus.c                   | 2 +-
 epan/dissectors/packet-tcp.c                    | 2 +-
 epan/dissectors/packet-vuze-dht.c               | 2 +-
 epan/dissectors/packet-wbxml.c                  | 2 +-
 epan/dissectors/packet-wifi-p2p.c               | 2 +-
 epan/dissectors/packet-wps.c                    | 2 +-
 epan/dissectors/packet-wsp.c                    | 2 +-
 epan/emem.c                                     | 2 +-
 epan/frequency-utils.c                          | 2 +-
 epan/frequency-utils.h                          | 2 +-
 epan/nstime.c                                   | 2 +-
 epan/oids.c                                     | 2 +-
 epan/uat.c                                      | 2 +-
 file.c                                          | 2 +-
 gtk/conversations_table.c                       | 2 +-
 gtk/filter_dlg.c                                | 2 +-
 gtk/hostlist_table.c                            | 2 +-
 gtk/iax2_analysis.c                             | 2 +-
 gtk/main_menubar.c                              | 2 +-
 gtk/menus.c                                     | 2 +-
 gtk/prefs_dlg.c                                 | 2 +-
 gtk/proto_hier_stats_dlg.c                      | 2 +-
 rawshark.c                                      | 2 +-
 version_info.c                                  | 2 +-
 win32/file_dlg_win32.c                          | 2 +-
 wiretap/wtap-int.h                              | 2 +-
 wsutil/privileges.c                             | 4 ++--
 62 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c
index 58e30ff42b..5b0f016d59 100644
--- a/capture_wpcap_packet.c
+++ b/capture_wpcap_packet.c
@@ -330,6 +330,6 @@ wpcap_packet_load(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/conditions.c b/conditions.c
index 831cd08154..f064587fea 100644
--- a/conditions.c
+++ b/conditions.c
@@ -218,6 +218,6 @@ void _cnd_find_hash_key_for_class_id(gpointer key,
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 1de4ade2a4..5ce1088531 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -2006,6 +2006,6 @@ get_key_string(decryption_key_t* dk)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index b347dab4f9..baa78ae1c8 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -357,6 +357,6 @@ void proto_reg_handoff_2dparityfec(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=3 tabstop=3 expandtab
+ * ex: set shiftwidth=3 tabstop=3 expandtab:
  * :indentSize=3:tabSize=3:noTabs=true:
  */
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index dc4cde4d07..bfb3b3508d 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -360,7 +360,7 @@ proto_reg_handoff_banana(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 8a16c8150d..961199982c 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -993,6 +993,6 @@ proto_reg_handoff_bittorrent(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=3 tabstop=3 expandtab
+ * ex: set shiftwidth=3 tabstop=3 expandtab:
  * :indentSize=3:tabSize=3:noTabs=true:
  */
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 9a6aa54af2..27028a45b9 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -77,7 +77,7 @@ static const value_string dev_type_vals[] = {
 static const value_string cmd_code_vals[] = {
   { CMD_DISCOVER,       "Discover"              },
   { CMD_PRINT_JOB_DET,  "Print Job Details"     },
-  { CMD_CLOSE,          "Request Closure"       }, 
+  { CMD_CLOSE,          "Request Closure"       },
   { CMD_GET_STATUS,     "Get Printer Status"    },
   { CMD_PRINT,          "Print"                 },
   { CMD_GET_ID,         "Get Printer Identity"  },
@@ -168,7 +168,7 @@ void proto_register_bjnp (void)
 
   proto_bjnp = proto_register_protocol (PNAME, PSNAME, PFNAME);
   register_dissector (PFNAME, dissect_bjnp, proto_bjnp);
-  
+
   proto_register_field_array (proto_bjnp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 }
@@ -193,6 +193,6 @@ void proto_reg_handoff_bjnp (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c
index 4bfcc28ef8..9353841091 100644
--- a/epan/dissectors/packet-bt-utp.c
+++ b/epan/dissectors/packet-bt-utp.c
@@ -511,7 +511,7 @@ proto_reg_handoff_bt_utp(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index a06c9dd59d..bb5ad930d7 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -3960,6 +3960,6 @@ proto_reg_handoff_cip(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=3 tabstop=8 expandtab
+ * ex: set shiftwidth=3 tabstop=8 expandtab:
  * :indentSize=3:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index a307596fd3..3905f7431b 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -262,6 +262,6 @@ proto_reg_handoff_db_lsp (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index d51f42e9c0..d6f64aaea8 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -5101,7 +5101,7 @@ void proto_reg_handoff_dmp (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 8699379a6f..6b48192f5b 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -3572,7 +3572,7 @@ proto_reg_handoff_dnp3(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c
index d43c069021..13af51a842 100644
--- a/epan/dissectors/packet-esio.c
+++ b/epan/dissectors/packet-esio.c
@@ -427,6 +427,6 @@ proto_reg_handoff_esio(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=7 tabstop=8 expandtab
+ * ex: set shiftwidth=7 tabstop=8 expandtab:
  * :indentSize=7:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index adcad3bd3d..91d045c116 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -5067,6 +5067,6 @@ proto_reg_handoff_gtpv2(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 56f7cef3ee..7fa16f888b 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1630,6 +1630,6 @@ void proto_reg_handoff_h223(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index 69487acce4..d062e4b19c 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -1089,6 +1089,6 @@ proto_reg_handoff_hdfs(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c
index e845e21ba3..b940caac72 100644
--- a/epan/dissectors/packet-hdfsdata.c
+++ b/epan/dissectors/packet-hdfsdata.c
@@ -816,6 +816,6 @@ proto_reg_handoff_hdfsdata(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index b65e979412..3fe37d3571 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -2820,6 +2820,6 @@ proto_reg_handoff_iax2 (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 75315bface..23e3ef5a4a 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -16861,6 +16861,6 @@ weak_iv(guchar *iv)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 617cd3beba..778c3a82a4 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -2178,6 +2178,6 @@ proto_reg_handoff_memcache (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index cd97a0975c..70f788f2b3 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -704,6 +704,6 @@ proto_reg_handoff_mongo(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index 419f203163..c12e5349e1 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -231,6 +231,6 @@ void proto_reg_handoff_nat_pmp (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 84af334269..4e551d08d1 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -8185,6 +8185,6 @@ proto_reg_handoff_netflow(void)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index a46aad9231..d3fa01966c 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1665,6 +1665,6 @@ void proto_reg_handoff_p_mul (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 1c53c075d6..441e6aab5a 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -175,6 +175,6 @@ void proto_reg_handoff_packetlogger (void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 6d1b10c845..08a11694de 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -543,6 +543,6 @@ proto_reg_handoff_old_pflog(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index 268e47bfbc..194a83389b 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -561,6 +561,6 @@ proto_register_ppi_antenna(void) {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ppi-geolocation-common.c b/epan/dissectors/packet-ppi-geolocation-common.c
index cd4d8784be..5c1b9a0e74 100644
--- a/epan/dissectors/packet-ppi-geolocation-common.c
+++ b/epan/dissectors/packet-ppi-geolocation-common.c
@@ -70,6 +70,6 @@ gdouble ppi_ns_counter_to_gdouble(guint32 in) {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ppi-geolocation-common.h b/epan/dissectors/packet-ppi-geolocation-common.h
index 77176de3a3..efe60d9e72 100644
--- a/epan/dissectors/packet-ppi-geolocation-common.h
+++ b/epan/dissectors/packet-ppi-geolocation-common.h
@@ -84,7 +84,7 @@ typedef enum {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c
index 3b20245ec1..bb241ef11c 100644
--- a/epan/dissectors/packet-ppi-gps.c
+++ b/epan/dissectors/packet-ppi-gps.c
@@ -633,6 +633,6 @@ proto_register_ppi_gps(void) {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c
index f8ffe58188..c9520bf1ab 100644
--- a/epan/dissectors/packet-ppi-sensor.c
+++ b/epan/dissectors/packet-ppi-sensor.c
@@ -568,7 +568,7 @@ proto_register_ppi_sensor(void) {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index c988005cae..cfc3e7b03b 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -1404,7 +1404,7 @@ proto_register_ppi_vector(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 0c5b977977..8ca904b89f 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -1378,6 +1378,6 @@ proto_reg_handoff_ppi(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 7435a7fdbe..afd00a3a3f 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3862,7 +3862,7 @@ proto_reg_handoff_rpc(void)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
 
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 98fd56009f..1ded94652b 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -1485,6 +1485,6 @@ proto_reg_handoff_rpcap (void)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 noexpandtab
+ * ex: set shiftwidth=2 tabstop=8 noexpandtab:
  * :indentSize=2:tabSize=8:noTabs=false:
  */
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index ab1602bdee..f332c4c764 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -2340,6 +2340,6 @@ proto_reg_handoff_sbus(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=7 tabstop=8 expandtab
+ * ex: set shiftwidth=7 tabstop=8 expandtab:
  * :indentSize=7:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index acf4e52775..c9dcfedcea 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -5199,6 +5199,6 @@ proto_reg_handoff_tcp(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c
index 15ddc7c50b..0532c202d5 100644
--- a/epan/dissectors/packet-vuze-dht.c
+++ b/epan/dissectors/packet-vuze-dht.c
@@ -1467,7 +1467,7 @@ proto_reg_handoff_vuze_dht(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index db96366154..ff1b68154b 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -8422,6 +8422,6 @@ proto_reg_handoff_wbxml(void)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index 939adb9657..73b512fd58 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -1507,6 +1507,6 @@ proto_register_p2p(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c
index dfde10786e..98b7c8bc99 100644
--- a/epan/dissectors/packet-wps.c
+++ b/epan/dissectors/packet-wps.c
@@ -2279,6 +2279,6 @@ proto_register_wps(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index a473b91a16..6b655ec37b 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7545,6 +7545,6 @@ proto_reg_handoff_sir(void)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/emem.c b/epan/emem.c
index cf622714c4..29f1e2960d 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -2344,6 +2344,6 @@ ep_strbuf_truncate(emem_strbuf_t *strbuf, gsize len)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/epan/frequency-utils.c b/epan/frequency-utils.c
index 1c8ebea4a3..bef8553805 100644
--- a/epan/frequency-utils.c
+++ b/epan/frequency-utils.c
@@ -106,6 +106,6 @@ ieee80211_mhz_to_str(guint freq){
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/frequency-utils.h b/epan/frequency-utils.h
index dc46612fd3..22179b6c56 100644
--- a/epan/frequency-utils.h
+++ b/epan/frequency-utils.h
@@ -66,7 +66,7 @@ ieee80211_mhz_to_str(guint freq);
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/nstime.c b/epan/nstime.c
index 3c00e8807c..490f0c35ae 100644
--- a/epan/nstime.c
+++ b/epan/nstime.c
@@ -196,7 +196,7 @@ double wtap_nstime_to_sec(const struct wtap_nstime *nstime)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/oids.c b/epan/oids.c
index 2df855581f..2f3f94aea5 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -1230,7 +1230,7 @@ void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree) {
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
 
diff --git a/epan/uat.c b/epan/uat.c
index 8283ea38f0..8219347ea5 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -680,6 +680,6 @@ CHK_STR_IS_DEF(isxdigit)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=4 expandtab
+ * ex: set shiftwidth=4 tabstop=4 expandtab:
  * :indentSize=4:tabSize=4:noTabs=true:
  */
diff --git a/file.c b/file.c
index bb103fe05a..ef9c24f6d3 100644
--- a/file.c
+++ b/file.c
@@ -4063,6 +4063,6 @@ cf_reload(capture_file *cf) {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 4dbb5fa39a..bd677d0b26 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -3011,6 +3011,6 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index 562168a545..c0a0781e52 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -1390,6 +1390,6 @@ filter_te_syntax_check_cb(GtkWidget *w, gpointer user_data _U_)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index eeb8c0ddee..6e45bceebc 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -1788,6 +1788,6 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index 75446ed115..3295f6f34c 100644
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -3750,6 +3750,6 @@ register_tap_listener_iax2_analysis(void)
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c
index bfe540f03f..ffec7fcdcf 100644
--- a/gtk/main_menubar.c
+++ b/gtk/main_menubar.c
@@ -5489,7 +5489,7 @@ void set_menus_for_profiles(gboolean default_profile)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 #endif /* MAIN_MENU_USE_UIMANAGER */
diff --git a/gtk/menus.c b/gtk/menus.c
index 218f07f800..b99fc86602 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -4790,7 +4790,7 @@ void set_menus_for_profiles(gboolean default_profile)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
 #endif /* MAIN_MENU_USE_UIMANAGER */
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index cec0e2d442..9f991ca5e0 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1829,6 +1829,6 @@ prefs_tree_select_cb(GtkTreeSelection *sel, gpointer dummy _U_)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=2 tabstop=8 expandtab
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
  * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 515f3f8feb..902219510b 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -583,6 +583,6 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/rawshark.c b/rawshark.c
index ce0e232339..70fe214724 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -1672,6 +1672,6 @@ cmdarg_err_cont(const char *fmt, ...)
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/version_info.c b/version_info.c
index 8f4c304484..791508f9b0 100644
--- a/version_info.c
+++ b/version_info.c
@@ -616,6 +616,6 @@ get_os_major_version()
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/win32/file_dlg_win32.c b/win32/file_dlg_win32.c
index 05f624cfdc..06a7ae4072 100644
--- a/win32/file_dlg_win32.c
+++ b/win32/file_dlg_win32.c
@@ -2112,6 +2112,6 @@ export_sslkeys_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_p
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=8 expandtab
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 313c6b768e..0a690806b1 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -345,6 +345,6 @@ extern gint wtap_num_file_types;
  * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index 12282837e1..64229a4c0d 100644
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -329,9 +329,9 @@ get_cur_groupname(void) {
  * Local Variables:
  * c-basic-offset: 8
  * tab-width: 8
- * indent-tabs-mode: tabs
+ * indent-tabs-mode: t
  * End:
  *
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
  * :indentSize=8:tabSize=8:noTabs=false:
  */
-- 
2.34.1