commit f33dcffb2cc9748710b6793331104ba5a8bb9db8
parent 6016e30bf5f76993506e0a95338686d2364cd555
Author: Iqbal Ansari <iqbal.ansari@ignitesol.com>
Date: Fri, 10 Jun 2016 13:41:19 +0530
Merge branch 'develop'
Diffstat:
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/emojify.el b/emojify.el
@@ -5,7 +5,7 @@
;; Author: Iqbal Ansari <iqbalansari02@yahoo.com>
;; Keywords: multimedia, convenience
;; URL: https://github.com/iqbalansari/emacs-emojify
-;; Version: 0.3
+;; Version: 0.4
;; Package-Requires: ((seq "1.11") (ht "2.0") (emacs "24.3"))
;; This program is free software; you can redistribute it and/or modify
@@ -378,28 +378,6 @@ Possible values are
(const :tag "Display emojis in code" code))
:group 'emojify)
-(defcustom emojify-prog-contexts
- 'both
- "Contexts where emojis can be displayed in programming modes.
-
-Possible values are
-`comments' - Display emojis only in comments
-`string' - Display emojis only in strings
-`both' - Display emojis in comments and strings
-`none' - Do not display emojis in programming modes"
- :type '(radio :tag "Contexts where emojis should be displayed in programming modes"
- (const :tag "Only in comments" comments)
- (const :tag "Only in string" string)
- (const :tag "Both in comments and string" both)
- (const :tag "Do not display emojis in programming modes" none))
- :set (lambda (_ value)
- (setq emojify-program-contexts (pcase value
- (`comments '(comments))
- (`string '(string))
- (`both '(comments string code))
- (`none '()))))
- :group 'emojify)
-
(defcustom emojify-inhibit-functions
'(emojify-in-org-tags-p emojify-in-org-list-p)
"Functions used to determine given emoji should displayed at current point.
@@ -523,7 +501,6 @@ the visible area."
(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")
-(define-obsolete-variable-alias 'emojify-prog-contexts 'emojify-program-contexts "0.3")