Sync with nana-gnus-6_13_12.

diff --git a/lisp/smiley.el b/lisp/smiley.el
index e6c13f7..65dc913 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -255,8 +255,13 @@ above them."
          (while (re-search-forward regexp nd t)
            (let* ((start (match-beginning group))
                   (end (match-end group))
-                  (glyph (smiley-create-glyph (buffer-substring start end)
-                                              file)))
+                  (glyph
+                   (and (or (eq start 1)
+                            (not (string-match "\\(\\^\\|;\\|_\\);)" 
+                                               (buffer-substring 
+                                                (1- start) (+ start 2)))))
+                        (smiley-create-glyph (buffer-substring start end)
+                                             file))))
              (when glyph
                (mapcar 'delete-annotation (annotations-at end))
                (let ((ext (make-extent start end))
@@ -294,7 +299,7 @@ Mouse button3 - menu"))
   (save-excursion
     (goto-char start)
     (when (and (re-search-backward "[()]" nil t)
-              (= (following-char) ?\()
+              (eq (char-after) ?\()
               (goto-char end)
               (or (not (re-search-forward "[()]" nil t))
                   (= (char-after (1- (point))) ?\()))