Revision: emacs@sv.gnu.org/gnus--devo--0--patch-90

Merge from gnus--rel--5.10: lisp/smiley.el: Add missing test smiley.

Patches applied:

 * emacs--devo--0  (patch 140, 142-143, 147, 151, 163)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 62-64)

   - Merge from emacs--devo--0
   - Update from CVS

2006-03-20  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/smiley.el: Add missing test smiley.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f06636..bae1b4b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,10 @@
        * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add
        comment on version.
 
+2006-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * smiley.el: Add missing test smiley.
+
 2006-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-with-part): New macro.

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index bd9a484..a9608b7 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -288,7 +288,8 @@ passphrase cache or user."
         (passphrase (or passphrase
                         (when (not pgg-gpg-use-agent)
                           (pgg-read-passphrase
-                           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
+                           (format "GnuPG passphrase for %s: "
+                                   pgg-gpg-user-id)
                            pgg-gpg-user-id))))
         (args
          (append (list (if cleartext "--clearsign" "--detach-sign")

diff --git a/lisp/smiley.el b/lisp/smiley.el
index e8afe9d..6476340 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -42,6 +42,7 @@
 ;; indifferent       :-|
 ;; wry               :-/  :-\
 ;; sad               :-(
+;; frown             :-{
 ;; evil              >:-)
 ;; cry               ;-(
 ;; dead              X-)