[Emacs-diffs] /srv/bzr/emacs/trunk r109749: [Gnus] Enable posting-style group parameter to hold non-ASCII string values

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 109749
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-22 10:37:55 +0000
message:
  [Gnus] Enable posting-style group parameter to hold non-ASCII string values
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-cus.el
  lisp/gnus/gnus-msg.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-08-21 01:23:57 +0000
+++ b/lisp/gnus/ChangeLog       2012-08-22 10:37:55 +0000
@@ -1,3 +1,12 @@
+2012-08-22  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-cus.el (gnus-group-customize): Decode values posting-style holds.
+       (gnus-group-customize-done): Encode values posting-style holds.
+
+       * gnus-msg.el (gnus-summary-resend-message)
+       (gnus-configure-posting-styles): Decode values posting-style group
+       parameter holds.
+
 2012-08-21  Katsumi Yamaoka  <address@hidden>
 
        * gnus-msg.el (gnus-summary-resend-message): Honor posting-style for

=== modified file 'lisp/gnus/gnus-cus.el'
--- a/lisp/gnus/gnus-cus.el     2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-cus.el     2012-08-22 10:37:55 +0000
@@ -417,6 +417,11 @@
            (delq elem tmp))
          (setq tmp (cdr tmp))))
 
+      ;; Decode values posting-style holds.
+      (dolist (style (cdr (assq 'posting-style values)))
+       (when (stringp (cadr style))
+         (setcdr style (list (mm-decode-coding-string (cadr style) 'utf-8)))))
+
       (setq gnus-custom-params
             (apply 'widget-create 'group
                    :value values
@@ -487,14 +492,17 @@
 (defun gnus-group-customize-done (&rest ignore)
   "Apply changes and bury the buffer."
   (interactive)
-  (if gnus-custom-topic
-      (gnus-topic-set-parameters gnus-custom-topic
-                                (widget-value gnus-custom-params))
-    (gnus-group-edit-group-done 'params gnus-custom-group
-                               (widget-value gnus-custom-params))
-    (gnus-group-edit-group-done 'method gnus-custom-group
-                               (widget-value gnus-custom-method)))
-  (bury-buffer))
+  (let ((params (widget-value gnus-custom-params)))
+    ;; Encode values posting-style holds.
+    (dolist (style (cdr (assq 'posting-style params)))
+      (when (stringp (cadr style))
+       (setcdr style (list (mm-encode-coding-string (cadr style) 'utf-8)))))
+    (if gnus-custom-topic
+       (gnus-topic-set-parameters gnus-custom-topic params)
+      (gnus-group-edit-group-done 'params gnus-custom-group params)
+      (gnus-group-edit-group-done 'method gnus-custom-group
+                                 (widget-value gnus-custom-method)))
+    (bury-buffer)))
 
 ;;; Score Customization:
 

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2012-08-21 01:23:57 +0000
+++ b/lisp/gnus/gnus-msg.el     2012-08-22 10:37:55 +0000
@@ -1376,6 +1376,9 @@
        (user-full-name user-full-name)
        (user-mail-address user-mail-address)
        tem)
+    (dolist (style styles)
+      (when (stringp (cadr style))
+       (setcdr style (list (mm-decode-coding-string (cadr style) 'utf-8)))))
     (dolist (style (if styles
                       (append gnus-posting-styles (list (cons ".*" styles)))
                     gnus-posting-styles))
@@ -1807,6 +1810,10 @@
       (when gnus-newsgroup-name
        (let ((tmp-style (gnus-group-find-parameter group 'posting-style t)))
          (when tmp-style
+           (dolist (style tmp-style)
+             (when (stringp (cadr style))
+               (setcdr style (list (mm-decode-coding-string (cadr style)
+                                                            'utf-8)))))
            (setq styles (append styles (list (cons ".*" tmp-style)))))))
       ;; Go through all styles and look for matches.
       (dolist (style styles)