X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fsmiley.el;h=afffc64f12fa8468f6df9bdeb5f887f5da1aa394;hb=74a489ff1213794152d6e13f7a11e16c89f62602;hp=f0249fa2c08a6837fb2d9b7e79320db121e18b35;hpb=8852b9d178c5c98f059ab256fe27310b9acc8b89;p=gnus

diff --git a/lisp/smiley.el b/lisp/smiley.el
index f0249fa2c..afffc64f1 100644
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -1,27 +1,25 @@
 ;;; smiley.el --- displaying smiley faces
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -60,17 +58,23 @@
 
 (defvar smiley-data-directory)
 
-(defcustom smiley-style 'low-color
+(defcustom smiley-style
+  (if (or (and (fboundp 'face-attribute)
+	       (>= (face-attribute 'default :height) 160))
+	  (and (fboundp 'face-height)
+	       (>= (face-height 'default) 14)))
+      'medium
+    'low-color)
   "Smiley style."
-  :type '(choice (const :tag "small, 3 colors" low-color)
-		 (const :tag "medium, ~10 colors" medium)
-		 (const :tag "dull, grayscale" grayscale))
+  :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14
+		 (const :tag "medium, ~10 colors" medium) ;; 16x16
+		 (const :tag "dull, grayscale" grayscale));; 14x14
   :set (lambda (symbol value)
 	 (set-default symbol value)
 	 (setq smiley-data-directory (smiley-directory))
 	 (smiley-update-cache))
   :initialize 'custom-initialize-default
-  :version "23.0" ;; No Gnus
+  :version "23.1" ;; No Gnus
   :group 'smiley)
 
 ;; For compatibility, honor the variable `smiley-data-directory' if the user
@@ -98,16 +102,17 @@ is nil, use `smiley-style'."
 
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
-  '(("\\(;-?)\\)\\W" 1 "blink")
+  '(("\\(;-)\\)\\W" 1 "blink")
+    ("[^;]\\(;)\\)\\W" 1 "blink")
     ("\\(:-]\\)\\W" 1 "forced")
     ("\\(8-)\\)\\W" 1 "braindamaged")
     ("\\(:-|\\)\\W" 1 "indifferent")
     ("\\(:-[/\\]\\)\\W" 1 "wry")
     ("\\(:-(\\)\\W" 1 "sad")
+    ("\\(X-)\\)\\W" 1 "dead")
     ("\\(:-{\\)\\W" 1 "frown")
     ("\\(>:-)\\)\\W" 1 "evil")
     ("\\(;-(\\)\\W" 1 "cry")
-    ("\\(X-)\\)\\W" 1 "dead")
     ("\\(:-D\\)\\W" 1 "grin")
     ;; "smile" must be come after "evil"
     ("\\(\\^?:-?)\\)\\W" 1 "smile"))
@@ -115,6 +120,7 @@ is nil, use `smiley-style'."
 The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
 regexp to replace with IMAGE.  IMAGE is the name of an image file in
 `smiley-data-directory'."
+  :version "24.1"
   :type '(repeat (list regexp
 		       (integer :tag "Regexp match number")
 		       (string :tag "Image name")))
@@ -192,8 +198,8 @@ A list of images is returned."
 
 ;;;###autoload
 (defun smiley-buffer (&optional buffer)
-  "Run `smiley-region' at the buffer, specified in the argument or
-interactively. If there's no argument, do it at the current buffer"
+  "Run `smiley-region' at the BUFFER, specified in the argument or
+interactively.  If there's no argument, do it at the current buffer."
   (interactive "bBuffer to run smiley-region: ")
   (save-excursion
     (if buffer
@@ -222,5 +228,4 @@ With arg, turn displaying on if and only if arg is positive."
 
 (provide 'smiley)
 
-;;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
 ;;; smiley.el ends here