summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReiner Steib <Reiner.Steib@gmx.de>2004-08-16 15:40:45 +0000
committerReiner Steib <Reiner.Steib@gmx.de>2004-08-16 15:40:45 +0000
commit9c4ffee48dcda68fe1f1380ddddc2086ed561cf6 (patch)
treee47e4b30bb1bccd15c92c97d3e4d3977ab7aa75b
parentedf56d868faedb311160b4f834e89443e149052f (diff)
downloademacs-9c4ffee48dcda68fe1f1380ddddc2086ed561cf6.tar.gz
Removed obsolete files.
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/gnus-mule.el75
-rw-r--r--lisp/gnus/smiley-ems.el166
3 files changed, 2 insertions, 241 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9e744952dc5..90fcd0ec93c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
2004-08-16 Reiner Steib <Reiner.Steib@gmx.de>
+ * gnus-mule.el, smiley-ems.el: Removed obsolete files.
+
* mailcap.el (mailcap-mime-data): Mark as risky.
* gnus.el (gnus-group, gnus-summary, gnus-summary-sort): Fix
diff --git a/lisp/gnus/gnus-mule.el b/lisp/gnus/gnus-mule.el
deleted file mode 100644
index 835311d0ea2..00000000000
--- a/lisp/gnus/gnus-mule.el
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; gnus-mule.el --- provide backward compatibility function to GNUS
-
-;; Copyright (C) 1995, 1997, 2002 Free Software Foundation, Inc.
-;; Copyright (C) 1995, 2000 Electrotechnical Laboratory, JAPAN.
-
-;; Maintainer: FSF
-;; Keywords: news, i18n
-
-;; This file is part of GNU Emacs.
-
-;; 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.
-
-;; 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
-;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; This file provides the function `gnus-mule-add-group' for backward
-;; compatibility with old version of Gnus included in Emacs 20.
-
-;;; Code:
-
-(require 'gnus-sum)
-
-;;;###autoload
-(defun gnus-mule-add-group (name coding-system)
- "Specify that articles of news group NAME are encoded in CODING-SYSTEM.
-All news groups deeper than NAME are also the target.
-If CODING-SYSTEM is a cons, the car part is used and the cdr
-part is ignored.
-
-This function exists for backward compatibility with Emacs 20. It is
-recommended to customize the variable `gnus-group-charset-alist'
-rather than using this function."
- (if (consp coding-system)
- ;; Ignore the cdr part because now Gnus can't use different
- ;; coding systems for encoding and decoding.
- (setq coding-system (car coding-system)))
- (let ((tail gnus-group-charset-alist)
- (prev nil)
- (pattern (concat "^" (regexp-quote name))))
- ;; Check entries of `gnus-group-charset-alist' if they match NAME.
- (while (not (string-match (car (car tail)) name))
- (setq prev tail tail (cdr tail)))
- (if tail
- ;; A matching entry was found.
- (if (string= pattern (car (car tail)))
- ;; We can modify this entry.
- (setcar (cdr (car tail)) coding-system)
- ;; We must add a new entry before this.
- (if prev
- (setcdr prev (cons (list pattern coding-system)
- (cdr prev)))
- (setq gnus-group-charset-alist
- (cons (list pattern coding-system)
- gnus-group-charset-alist))))
- ;; We must prepend a new entry.
- (setq gnus-group-charset-alist
- (cons (list pattern coding-system)
- gnus-group-charset-alist)))))
-
-(provide 'gnus-mule)
-
-;;; arch-tag: 525e6b69-85de-4dfc-9dbb-764c795d63af
-;;; gnus-mule.el ends here
diff --git a/lisp/gnus/smiley-ems.el b/lisp/gnus/smiley-ems.el
deleted file mode 100644
index 7fce284e500..00000000000
--- a/lisp/gnus/smiley-ems.el
+++ /dev/null
@@ -1,166 +0,0 @@
-;;; smiley-ems.el --- displaying smiley faces
-
-;; Copyright (C) 2000 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
-;; 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.
-
-;; 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
-;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; A re-written, simplified version of Wes Hardaker's XEmacs smiley.el
-;; which might be merged back to smiley.el if we get an assignment for
-;; that. We don't have assignments for the images smiley.el uses, but
-;; I'm not sure we need that degree of rococoness and defaults like a
-;; yellow background. Also, using PBM means we can display the images
-;; more generally. -- fx
-
-;;; Test smileys: :-) :-\ :-( :-/
-
-;;; Code:
-
-(require 'nnheader)
-
-(defgroup smiley nil
- "Turn :-)'s into real images."
- :group 'gnus-visual)
-
-;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "smilies")
- "*If non-nil, a directory to search for the smiley image files.
-This is in addition to the normal image search path."
- :type '(choice directory
- (const nil))
- :group 'smiley)
-
-;; The XEmacs version has a baroque, if not rococo, set of these.
-(defcustom smiley-regexp-alist
- ;; Perhaps :-) should be distinct -- it does appear in the Jargon File.
- '(("\\([:;]-?)\\)\\(\\W\\|\\'\\)" 1 "smile.pbm")
- ("\\(:-[/\\]\\)\\(\\W\\|\\'\\)" 1 "wry.pbm")
- ("\\(:-[({]\\)\\(\\W\\|\\'\\)" 1 "frown.pbm"))
- "*A list of regexps to map smilies to images.
-The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-rgexp to replace with IMAGE. IMAGE is the name of a PBM file in
-`smiley-data-directory' or the normal image search path."
- :type '(repeat (list regexp
- (integer :tag "Regexp match number")
- (string :tag "Image name")))
- :set (lambda (symbol value)
- (set-default symbol value)
- (smiley-update-cache))
- :initialize 'custom-initialize-default
- :group 'smiley)
-
-(defvar smiley-cached-regexp-alist nil)
-
-(defun smiley-update-cache ()
- (dolist (elt smiley-regexp-alist)
- (let* ((data-directory smiley-data-directory)
- (image (find-image (list (list :type 'pbm
- :file (nth 2 elt)
- :ascent 'center)))))
- (if image
- (push (list (car elt) (cadr elt) image)
- smiley-cached-regexp-alist)))))
-
-(defvar smiley-active nil
- "Non-nil means smilies in the buffer will be displayed.")
-(make-variable-buffer-local 'smiley-active)
-
-(defvar smiley-mouse-map
- (let ((map (make-sparse-keymap)))
- (define-key map [down-mouse-2] 'ignore) ; override widget
- (define-key map [mouse-2]
- 'smiley-mouse-toggle-buffer)
- map))
-
-;;;###autoload
-(defun smiley-region (start end)
- "Display textual smileys as images.
-START and END specify the region; interactively, use the values
-of point and mark. The value of `smiley-regexp-alist' determines
-which smileys to operate on and which images to use for them."
- (interactive "r")
- (when (and (fboundp 'display-graphic-p)
- (display-graphic-p))
- (mapc (lambda (o)
- (if (eq 'smiley (overlay-get o 'smiley))
- (delete-overlay o)))
- (overlays-in start end))
- (unless smiley-cached-regexp-alist
- (smiley-update-cache))
- (save-excursion
- (let ((beg (or start (point-min)))
- (inhibit-point-motion-hooks t)
- group overlay image)
- (dolist (entry smiley-cached-regexp-alist)
- (setq group (nth 1 entry)
- image (nth 2 entry))
- (goto-char beg)
- (while (re-search-forward (car entry) end t)
- (when image
- (setq overlay (make-overlay (match-beginning group)
- (match-end group)))
- (overlay-put overlay
- 'display `(when smiley-active ,@image))
- (overlay-put overlay 'mouse-face 'highlight)
- (overlay-put overlay 'smiley t)
- (overlay-put overlay
- 'help-echo "mouse-2: toggle smilies in buffer")
- (overlay-put overlay 'keymap smiley-mouse-map)
- (goto-char (match-end group)))))))
- (setq smiley-active t)))
-
-(defun smiley-toggle-buffer (&optional arg)
- "Toggle displaying smiley faces.
-With arg, turn displaying on if and only if arg is positive."
- (interactive "P")
- (if (numberp arg)
- (setq smiley-active (> arg 0))
- (setq smiley-active (not smiley-active))))
-
-(defun smiley-mouse-toggle-buffer (event)
- "Toggle displaying smiley faces.
-With arg, turn displaying on if and only if arg is positive."
- (interactive "e")
- (save-excursion
- (save-window-excursion
- (mouse-set-point event)
- (smiley-toggle-buffer))))
-
-(eval-when-compile (defvar gnus-article-buffer))
-
-(defun gnus-smiley-display (&optional arg)
- "Display textual emoticons (\"smilies\") as small graphical icons.
-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)
- (smiley-region (point-min) (point-max))
- (if (and (numberp arg) (<= arg 0))
- (smiley-toggle-buffer arg)))))
-
-(provide 'smiley)
-
-;;; arch-tag: e726728a-14fb-4e6a-9aef-889941bdf7ad
-;;; smiley-ems.el ends here