Synch to No Gnus 200603102319.

diff --git a/ChangeLog b/ChangeLog
index 95eb283..e9a9fad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,15 @@
        etc/images/sort-criteria.xpm, etc/images/sort-descending.xpm,
        etc/images/sort-row-ascending.xpm: New icons from GNOME 2.6.
 
+2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (release-check-settings): Add status and
+       suggestions.
+       (release-files): Remove duplicate release-cvs-export.
+       (README): New target.
+       (release-files, release-make-tar-ball, release-diff): List files.
+       (README, release-make-tar-ball): Fix.
+
 2006-03-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * GNUS-NEWS: Generated.

diff --git a/Makefile.in b/Makefile.in
index f6baef8..b219303 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -265,6 +265,13 @@ release-check-settings:
        @echo
        @if [ x"$(VERSION)" = x ]; then echo "error: No VERSION given."; exit 1; else :; fi
        @if [ x"$(TAG)" = x ]; then echo "error: No TAG given."; exit 1; else :; fi
+       @echo
+       @echo Settings checked successfully.
+       @echo
+       @echo You may now make...
+       @echo   release-bump-version
+       @echo   release-commit
+       @echo   release-files
 
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:  release-check-settings
@@ -305,15 +312,25 @@ release-commit:   release-check-settings
        @read dummy
        cvs tag $(TAG)
 
-release-files: release-cvs-export release-make-tar-ball release-diff
+release-files: release-make-tar-ball release-diff
+       @echo "Release files have been created:"
+       @ls -l gnus-$(TAG).tar.gz
+       @ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
 release-cvs-export gnus-$(TAG):        release-check-settings
+       rm -fr gnus-$(TAG)
        cvs export -d gnus-$(TAG) -r $(TAG) gnus
 
 release-make-tar-ball: gnus-$(TAG) $(TAR_BALL_EXTRA)
        [ -d gnus-$(TAG) ] && cd gnus-$(TAG) && \
          rm $(CVS_IGNORE_FILES) || true
+       cp -p $(TAR_BALL_EXTRA) gnus-$(TAG)/
        tar zcvf gnus-$(TAG).tar.gz gnus-$(TAG)
+       ls -l gnus-$(TAG).tar.gz
+
+README:
+       @echo README is not in CVS.  Get it from Lars.
+       false
 
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz
@@ -321,6 +338,7 @@ release-diff:       release-check-settings
        cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true
        mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
+       ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
 release-post-clean:    release-check-settings
        rm -fr gnus-$(TAG) temp.diff

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0acd74d..90968a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * smiley.el: Add more test smileys.
+       (smiley-data-directory, smiley-regexp-alist)
+       (gnus-smiley-file-types): Fix doc strings.
+       (smiley-update-cache): Clear smiley-cached-regexp-alist before
+       adding new elements.
+       (smiley-mouse-map): Unused code.  Make it a comment.
+
 2006-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-nocem.el (gnus-nocem-scan-groups): Add autoload cookie;

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 27060be..4a317a8 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -31,8 +31,21 @@
 ;; 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:  :-) :-\ :-( :-/
+;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx'
+;; comment).
+
+;; Test smileys:
+;; smile             ^:-) ^:)
+;; blink             ;-)  ;)
+;; forced            :-]
+;; braindamaged      8-)
+;; indifferent       :-|
+;; wry               :-/  :-\
+;; sad               :-(
+;; evil              >:-)
+;; cry               ;-(
+;; dead              X-)
+;; grin              :-D
 
 ;;; Code:
 
@@ -45,8 +58,9 @@
   :group 'gnus-visual)
 
 ;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies")
-  "*Location of the smiley faces files."
+(defcustom smiley-data-directory
+  (nnheader-find-etc-directory "images/smilies")
+  "Location of the smiley faces files."
   :type 'directory
   :group 'smiley)
 
@@ -118,8 +132,8 @@
       ("\\(:-(\\)\\W" 1 "sad")
       ("\\(:-{\\)\\W" 1 "frown")))
   "*A list of regexps to map smilies to images.
-The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
+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'."
   :type '(repeat (list regexp
                       (integer :tag "Regexp match number")
@@ -137,7 +151,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
     (when (gnus-image-type-available-p 'xbm)
       (push "xbm" types))
     types)
-  "*List of suffixes on picon file names to try."
+  "*List of suffixes on smiley file names to try."
   :version "22.1"
   :type '(repeat string)
   :group 'smiley)
@@ -145,6 +159,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
 (defvar smiley-cached-regexp-alist nil)
 
 (defun smiley-update-cache ()
+  (setq smiley-cached-regexp-alist nil)
   (dolist (elt (if (symbolp smiley-regexp-alist)
                   (symbol-value smiley-regexp-alist)
                 smiley-regexp-alist))
@@ -163,12 +178,13 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
            (push (list (car elt) (cadr elt) image)
                  smiley-cached-regexp-alist)))))))
 
-(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))
+;; Not implemented:
+;; (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)