From 816d9427d9e5b5213c09d827ab5def4687368134 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 25 Feb 2002 11:17:29 +0000 Subject: [PATCH] * smiley.el (smiley-regexp-alist): Fix the order of faces. --- ChangeLog | 4 ++++ lisp/smiley.el | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98496b3..a8eec74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-02-25 Katsumi Yamaoka + * lisp/smiley.el (smiley-regexp-alist): Fix the order of faces. + +2002-02-25 Katsumi Yamaoka + * lisp/smiley.el (smiley-regexp-alist): Use faces which originate in etc-0.27.tar.gz if exist. (gnus-smiley-file-types): Add xbm if available. diff --git a/lisp/smiley.el b/lisp/smiley.el index 565ae01..c79a825 100644 --- a/lisp/smiley.el +++ b/lisp/smiley.el @@ -54,20 +54,22 @@ (if (file-exists-p (expand-file-name "WideFaceSmile.xbm" smiley-data-directory)) ;; Use faces in ftp://ftp.gnus.org/pub/gnus/etc-0.27.tar.gz - '(;; ^_^;;; ^^;;; - ("\\(\\^_?\\^;;;\\)\\W" 1 "WideFaceAse3") - ;; ^_^;; ^^;; - ("\\(\\^_?\\^;;\\)\\W" 1 "WideFaceAse2") + '(;; ^_^ ^^ + ("\\(\\^_?\\^\\)\\W" 1 "WideFaceSmile") + ;; ;-> ;-) ;-} ;> ;) :} + ("\\(;-?[>)}]+\\)\\W" 1 "FaceWinking") ;; ^_^; ^^; ("\\(\\^_?\\^;\\)\\W" 1 "WideFaceAse1") + ;; ^_^;; ^^;; + ("\\(\\^_?\\^;;\\)\\W" 1 "WideFaceAse2") + ;; ^_^;;; ^^;;; + ("\\(\\^_?\\^;;;\\)\\W" 1 "WideFaceAse3") ;; ;_; ("\\(;_;\\)\\W" 1 "WideFaceWeep") ;; T_T ("\\(T_T\\)\\W" 1 "WideFaceWeep") ;; >_< ("\\(>_<\\)\\W" 1 "WideFaceWeep") - ;; ^_^ ^^ - ("\\(\\^_?\\^\\)\\W" 1 "WideFaceSmile") ;; :-< :< ("\\(:-?<\\)\\W" 1 "FaceAngry") ;; :-] :] @@ -99,8 +101,6 @@ ("\\(:-?p\\)\\W" 1 "FaceTalking") ;; :-d ("\\(:-d\\)\\W" 1 "FaceTasty") - ;; ;-> ;-) ;-} ;> ;) :} - ("\\(;-?[>)}]+\\)\\W" 1 "FaceWinking") ;; :-V :-v :V :v ("\\(:-?[Vv]\\)\\W" 1 "FaceWry") ;; :-P :P -- 1.7.10.4