Gnus -- minor build / warning fixes [OK For Upstream]

[gnus] / lisp / smiley.el

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 63a684e..ac19799 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -193,12 +193,6 @@ above them."
      (set-glyph-face glyph 'default)
      glyph)))
 
-(defun smiley-create-glyph-ems (smiley pixmap)
-  (condition-case e
-      (create-image (expand-file-name pixmap smiley-data-directory))
-    (error nil)))
-
-
 ;;;###autoload
 (defun smiley-region (beg end)
   "Smilify the region between point and mark."
@@ -222,14 +216,6 @@ above them."
            (reveal-annotation ant)
            (set-extent-property ext 'invisible t)))))))
 
-;; FIXME::
-(defun smiley-toggle-extent-ems (event)
-  "Toggle smiley at given point.
-Note -- this function hasn't been implemented yet."
-  (interactive "e")
-  (error "This function hasn't been implemented yet.")
-)
-
 (defun smiley-toggle-extents (e)
   (interactive "e")
   (map-extents
@@ -246,12 +232,6 @@ Note -- this function hasn't been implemented yet."
        nil))
    (event-buffer e)))
 
-;; FIXME::
-(defun smiley-toggle-extents-ems (e)
-  (interactive "e")
-  (error "This function hasn't been implemented yet.")
-)
-
 ;;;###autoload
 (defun smiley-buffer (&optional buffer st nd)
   (interactive)
@@ -318,44 +298,6 @@ Mouse button3 - menu"))
                  (make-annotation ")" end 'text))
                (goto-char end)))))))))
 
-;; FIXME: No popup menu, no customized color
-(defun smiley-buffer-ems (&optional buffer st nd)
-  (interactive)
-  (when window-system
-    (save-excursion
-      (when buffer
-       (set-buffer buffer))
-      (let ((buffer-read-only nil)
-           (alist (if (symbolp smiley-regexp-alist)
-                      (symbol-value smiley-regexp-alist)
-                    smiley-regexp-alist))
-           (case-fold-search nil)
-           entry regexp beg group file)
-       (dolist (overlay (overlays-in (or st (point-min))
-                                     (or nd (point-max))))
-         (when (overlay-get overlay 'smiley)
-           (remove-text-properties (overlay-start overlay)  
-                                   (overlay-end overlay) '(display))
-           (delete-overlay overlay)))
-       (goto-char (or st (point-min)))
-       (setq beg (point))
-       ;; loop through alist
-       (while (setq entry (pop alist))
-         (setq regexp (car entry)
-               group (cadr entry)
-               file (caddr entry))
-         (goto-char beg)
-         (while (re-search-forward regexp nd t)
-           (let* ((start (match-beginning group))
-                  (end (match-end group))
-                  (glyph (smiley-create-glyph nil file))
-                  (overlay (make-overlay start end)))
-             (when glyph
-               (add-text-properties start end
-                                    `(display ,glyph))
-               (overlay-put overlay 'smiley glyph)
-               (goto-char end)))))))))
-
 (defun smiley-end-paren-p (start end)
   "Try to guess whether the current smiley is an end-paren smiley."
   (save-excursion
@@ -395,32 +337,6 @@ With arg, turn displaying on if and only if arg is positive."
        (set-extent-property (cdar on) 'invisible nil)
        (setq on (cdr on))))))
 
-;; Simply removing all smiley if existing.
-;; FIXME: make it work as the one in XEmacs.
-(defun smiley-toggle-buffer-ems (&optional arg buffer st nd)
-  "Toggle displaying smiley faces.
-With arg, turn displaying on if and only if arg is positive." 
-  (interactive "P")
-  (save-excursion
-    (when buffer
-      (set-buffer buffer))
-    (let (found)
-      (dolist (overlay (overlays-in (or st (point-min))
-                                   (or nd (point-max))))
-       (when (overlay-get overlay 'smiley)
-         (remove-text-properties (overlay-start overlay)  
-                                 (overlay-end overlay) '(display))
-         (setq found t)))
-      (unless found
-       (smiley-buffer buffer st nd)))))
-
-(unless (featurep 'xemacs)
-  (defalias 'smiley-create-glyph 'smiley-create-glyph-ems)
-  (defalias 'smiley-toggle-extent 'smiley-toggle-extent-ems)
-  (defalias 'smiley-toggle-extents 'smiley-toggle-extents-ems)
-  (defalias 'smiley-buffer 'smiley-buffer-ems)
-  (defalias 'smiley-toggle-buffer 'smiley-toggle-buffer-ems))
-
 (defvar gnus-article-buffer)
 ;;;###autoload
 (defun gnus-smiley-display (&optional arg)
@@ -428,12 +344,9 @@ With arg, turn displaying on if and only if arg is positive."
 With arg, turn displaying on if and only if arg is positive."
   (interactive "P")
   (save-excursion
-    (set-buffer gnus-article-buffer)
-    (save-restriction
-      (widen)
-      (article-goto-body)
-      (let (buffer-read-only)
-       (smiley-toggle-buffer arg (current-buffer) (point) (point-max))))))
+    (article-goto-body)
+    (let (buffer-read-only)
+      (smiley-toggle-buffer arg (current-buffer) (point) (point-max)))))
 
 (provide 'smiley)