update packages

lisp/emojify/data/emoji-sets.json

@@ -24,15 +24,21 @@
         "sha256" : "eb0ff5637924a2a04d3ab649b66d816a69c5d71eab2bf5274d292115e8178244"
     },
     "twemoji-v2": {
-        "description": "Emojis provided by Twitter (version 2)",
+        "description" : "Emojis provided by Twitter (version 2)",
         "website" : "https://twemoji.twitter.com/",
         "url": "https://raw.githubusercontent.com/iqbalansari/emacs-emojify/9e36d0e8c2a9c373a39728f837a507adfbb7b931/twemoji-fixed-v2.tar",
-        "sha256": "0991b1032a04d948835fba4249f43993b4ac88a66d2ae7f278f03be31884851d"
+        "sha256" : "0991b1032a04d948835fba4249f43993b4ac88a66d2ae7f278f03be31884851d"
     },
     "twemoji-v2-22": {
-        "description": "Emojis provided by Twitter (version 2), resized to 22px",
+        "description" : "Emojis provided by Twitter (version 2), resized to 22px",
         "website" : "https://twemoji.twitter.com/",
         "url": "https://raw.githubusercontent.com/iqbalansari/emacs-emojify/9e36d0e8c2a9c373a39728f837a507adfbb7b931/twemoji-fixed-v2-22.tar",
-        "sha256": "e3ae26d7ac111fe0be7b90f29afdab89676610a865353dfb672673efb5af044a"
+        "sha256" : "e3ae26d7ac111fe0be7b90f29afdab89676610a865353dfb672673efb5af044a"
+    },
+    "openmoji-v13-0": {
+        "description" : "Emojis provided by HfG Schwäbisch Gmünd (version 13.0) at 72px",
+        "website" : "https://openmoji.org",
+        "url": "https://raw.githubusercontent.com/iqbalansari/emacs-emojify/9161fd27f399944516e86d36c90c3b55f31427dd/openmoji-v13.0.tar",
+        "sha256" : "ccb0bce387e216a0c5f4ff54d53607dbfa1c62e7de9be95ee56af0cd39e42807"
     }
 }

lisp/emojify/emojify-pkg.el

@@ -1,13 +1,13 @@
-(define-package "emojify" "20200513.1627" "Display emojis in Emacs"
+(define-package "emojify" "20201130.1116" "Display emojis in Emacs"
   '((seq "1.11")
     (ht "2.0")
     (emacs "24.3"))
-  :commit "dfa3c6d060914c6082d6837da32df0c337330ee4" :keywords
-  '("multimedia" "convenience")
-  :authors
+  :commit "4b96f37f315182f95d4ea9ff33a9b5af9f1b1620" :authors
   '(("Iqbal Ansari" . "iqbalansari02@yahoo.com"))
   :maintainer
   '("Iqbal Ansari" . "iqbalansari02@yahoo.com")
+  :keywords
+  '("multimedia" "convenience")
   :url "https://github.com/iqbalansari/emacs-emojify")
 ;; Local Variables:
 ;; no-byte-compile: t

lisp/emojify/emojify.el

@@ -429,6 +429,13 @@ can customize `emojify-inhibit-major-modes' and
 
 
 
+;; Obsolete vars
+
+(define-obsolete-variable-alias 'emojify-emoji-style 'emojify-emoji-styles "0.2")
+(define-obsolete-function-alias 'emojify-set-emoji-style 'emojify-set-emoji-styles "0.2")
+
+
+
 ;; Customizations to control display of emojis
 
 (defvar emojify-emoji-style-change-hook nil
@@ -638,13 +645,6 @@ the visible area."
 
 
 
-;; Obsolete vars
-
-(define-obsolete-variable-alias 'emojify-emoji-style 'emojify-emoji-styles "0.2")
-(define-obsolete-function-alias 'emojify-set-emoji-style 'emojify-set-emoji-styles "0.2")
-
-
-
 ;; Customizations to control the behaviour when point enters emojified text
 
 (defcustom emojify-point-entered-behaviour 'echo
@@ -1824,16 +1824,16 @@ HIST, DEF, INHERIT-INPUT-METHOD correspond to the arguments for
 `emojify-completing-read-function' and are passed to
 ‘emojify-completing-read-function’ without any interpretation.
 
-For each possible emoji PREDICATE is called with emoji text and data about the
-emoji as a hash-table, the predate should return nil if it the emoji should
-not be displayed for selection.
+For each possible emoji PREDICATE is called with a string of the form
+'<emoji> - <name> (<style>)', the predicate should return nil if it the emoji should not be
+displayed for selection.
 
 For example the following can be used to display only github style emojis for
 selection
 
 \(emojify-completing-read \"Select a Github style emoji: \"
-                         (lambda (emoji data)
-                           (equal (gethash \"style\" data) \"github\")))
+                         (lambda (display-string)
+                           (s-suffix? display-string \"(github)\")))
 
 This function sets up `ido', `icicles', `helm', `ivy' and vanilla Emacs
 completion UI to display properly emojis."
@@ -2146,7 +2146,8 @@ displayed."
                      (overlay-get ov 'after-string)))
            (emojified-display (when disp
                                 (emojify-string disp '(unicode))))
-           (emojified-p (when emojified-display
+           (emojified-p (when (and (stringp emojified-display)
+                                   (not (zerop (length emojified-display))))
                           (text-property-any 0 (1- (length emojified-display))
                                              'emojified t
                                              emojified-display))))