anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handling of libmagic for some mime-types leads to incorrect value 'text/plain'.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40873 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2012-03-06 09:41:41 +00:00
parent feff615302
commit 8c29d00e11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
po/diff_po.pl
View File

@ -42,7 +42,7 @@ my %newMessages = (); # new po-file
my %Untranslated = (); # inside new po-file my %Untranslated = (); # inside new po-file
my %Fuzzy = (); # inside new po-file my %Fuzzy = (); # inside new po-file
my $result = 0; # exit value my $result = 0; # exit value
my $printlines = 0; my $printlines = 1;
my @names = (); my @names = ();
# Check first, if called as standalone program for git # Check first, if called as standalone program for git
@ -146,7 +146,7 @@ sub diff_po($$)
} }
} }
if (1) { if (0) {
@MsgKeys = sort keys %Messages, keys %newMessages; @MsgKeys = sort keys %Messages, keys %newMessages;
for my $k (@MsgKeys) { for my $k (@MsgKeys) {
if (defined($Messages{$k})) { if (defined($Messages{$k})) {

2
src/Format.cpp
View File

@ -388,7 +388,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
filename.toFilesystemEncoding().c_str()); filename.toFilesystemEncoding().c_str());
mime = token(mime, ';', 0); mime = token(mime, ';', 0);
// we need our own ps/eps detection // we need our own ps/eps detection
if (mime != "application/postscript") { if ((mime != "application/postscript") && (mime != "text/plain")) {
Formats::const_iterator cit = Formats::const_iterator cit =
find_if(formatlist.begin(), formatlist.end(), find_if(formatlist.begin(), formatlist.end(),
FormatMimeEqual(mime)); FormatMimeEqual(mime));