[Qemacs-commit] qemacs archive.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/08/09 17:27:22

Modified files:
        .              : archive.c 

Log message:
        small fixes in 
        
        * clear mode_name in modes derived from text_mode
        * improved probing function for man-mode

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/archive.c?cvsroot=qemacs&r1=1.16&r2=1.17

Patches:
Index: archive.c
===================================================================
RCS file: /sources/qemacs/qemacs/archive.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- archive.c   1 Jun 2014 18:00:24 -0000       1.16
+++ archive.c   9 Aug 2014 17:27:21 -0000       1.17
@@ -183,6 +183,7 @@
     /* copy and patch text_mode */
     memcpy(&archive_mode, &text_mode, sizeof(ModeDef));
     archive_mode.name = "archive";
+    archive_mode.mode_name = NULL;
     archive_mode.mode_probe = archive_mode_probe;
     archive_mode.data_type = &archive_data_type;
 
@@ -282,6 +283,7 @@
     /* copy and patch text_mode */
     memcpy(&compress_mode, &text_mode, sizeof(ModeDef));
     compress_mode.name = "compress";
+    compress_mode.mode_name = NULL;
     compress_mode.mode_probe = compress_mode_probe;
     compress_mode.data_type = &compress_data_type;
 
@@ -358,6 +360,7 @@
     /* copy and patch text_mode */
     memcpy(&wget_mode, &text_mode, sizeof(ModeDef));
     wget_mode.name = "wget";
+    wget_mode.mode_name = NULL;
     wget_mode.mode_probe = wget_mode_probe;
     wget_mode.data_type = &wget_data_type;
 
@@ -398,6 +401,10 @@
         }
     }
 
+    if (!memcmp(p->buf, ".tr *\\(**", 9)
+    ||  !memcmp(p->buf, ".\\\" ", 4))
+        goto has_man;
+
     return 0;
 }
 
@@ -442,6 +449,7 @@
     /* copy and patch text_mode */
     memcpy(&man_mode, &text_mode, sizeof(ModeDef));
     man_mode.name = "man";
+    man_mode.mode_name = NULL;
     man_mode.mode_probe = man_mode_probe;
     man_mode.data_type = &man_data_type;