]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix negation in elements of OTF feature list
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sun, 30 Jun 2019 07:09:56 +0000 (16:09 +0900)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sun, 30 Jun 2019 07:09:56 +0000 (16:09 +0900)
* src/ftfont.c (ftfont_get_open_type_spec):
* src/macfont.m (macfont_get_open_type_spec): Take bitwise or instead of and.

src/ftfont.c
src/macfont.m

index 4380a48d8dc6c9b532c5b4eeef88386f12ad53d9..384279f616b21a4bbc55f1529344559f6b15d443 100644 (file)
@@ -613,7 +613,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
              unsigned int tag;
 
              OTF_SYM_TAG (XCAR (val), tag);
-             spec->features[i][j++] = negative ? tag & 0x80000000 : tag;
+             spec->features[i][j++] = negative ? tag | 0x80000000 : tag;
            }
        }
       spec->nfeatures[i] = j;
index abdf0ecfe594e61dd4d8f9bdf0932619ba42d2a0..f736fbf0e1ea7467bda2c9372041380e7c9f9c34 100644 (file)
@@ -1824,7 +1824,7 @@ macfont_get_open_type_spec (Lisp_Object otf_spec)
               unsigned int tag;
 
               OTF_SYM_TAG (XCAR (val), tag);
-              spec->features[i][j++] = negative ? tag & 0x80000000 : tag;
+              spec->features[i][j++] = negative ? tag | 0x80000000 : tag;
             }
         }
       spec->nfeatures[i] = j;