[Emacs-diffs] /srv/bzr/emacs/trunk r104278: gnus.texi (Gnus Registry Setup): Rename from "Setup".

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104278
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-18 22:16:26 +0000
message:
  gnus.texi (Gnus Registry Setup): Rename from "Setup".
   (Store custom flags and keywords): Mention 
`gnus-registry-user-format-function-M' and 
`gnus-registry-user-format-function-M2'.
  gnus-registry.el (gnus-registry-user-format-function-M): Use `mapconcat'.
   (gnus-registry-user-format-function-M2): Use to see the full text of the 
marks.  Make "," the mark text separator.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-registry.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-05-18 05:21:07 +0000
+++ b/doc/misc/ChangeLog        2011-05-18 22:16:26 +0000
@@ -1,3 +1,10 @@
+2011-05-18  Teodor Zlatanov  <address@hidden>
+
+       * gnus.texi (Gnus Registry Setup): Rename from "Setup".
+       (Store custom flags and keywords): Mention
+       `gnus-registry-user-format-function-M' and
+       `gnus-registry-user-format-function-M2'.
+
 2011-05-17  Paul Eggert  <address@hidden>
 
        * texinfo.tex: Sync from gnulib, version 2011-05-11.16.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-05-17 02:30:53 +0000
+++ b/doc/misc/gnus.texi        2011-05-18 22:16:26 +0000
@@ -25906,15 +25906,15 @@
 @end enumerate
 
 @menu
-* Setup::
+* Gnus Registry Setup::
 * Fancy splitting to parent::
 * Registry Article Refer Method::
 * Store custom flags and keywords::
 * Store arbitrary data::
 @end menu
 
address@hidden Setup
address@hidden Setup
address@hidden Gnus Registry Setup
address@hidden Gnus Registry Setup
 
 Fortunately, setting up the Gnus registry is pretty easy:
 
@@ -26086,6 +26086,21 @@
 will offer the available marks for completion.
 @end defun
 
+You can use @code{defalias} to install a summary line formatting
+function that will show the registry marks.  There are two flavors of
+this function, either showing the marks as single characters, using
+their @code{:char} property, or showing the marks as full strings.
+
address@hidden
+;; show the marks as single characters (see the :char property in
+;; `gnus-registry-marks'):
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M)
+
+;; show the marks by name (see `gnus-registry-marks'):
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M2)
address@hidden lisp
+
+
 @node Store arbitrary data
 @subsection Store arbitrary data
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-18 14:17:34 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-18 22:16:26 +0000
@@ -1,5 +1,10 @@
 2011-05-18  Teodor Zlatanov  <address@hidden>
 
+       * gnus-registry.el (gnus-registry-user-format-function-M):
+       Use `mapconcat'.
+       (gnus-registry-user-format-function-M2): Use to see the full text of
+       the marks.  Make "," the mark text separator.
+
        * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP
        authentication with auth-source.
 

=== modified file 'lisp/gnus/gnus-registry.el'
--- a/lisp/gnus/gnus-registry.el        2011-05-13 04:12:37 +0000
+++ b/lisp/gnus/gnus-registry.el        2011-05-18 22:16:26 +0000
@@ -57,6 +57,16 @@
 ;; You should also consider using the nnregistry backend to look up
 ;; articles.  See the Gnus manual for more information.
 
+;; Finally, you can put %uM in your summary line format to show the
+;; registry marks if you do this:
+
+;; show the marks as single characters (see the :char property in
+;; `gnus-registry-marks'):
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M)
+
+;; show the marks by name (see `gnus-registry-marks'):
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M2)
+
 ;; TODO:
 
 ;; - get the correct group on spool actions
@@ -887,22 +897,26 @@
                  nil
                  (cons "Registry Marks" gnus-registry-misc-menus))))))
 
-;;; use like this:
-;;; (defalias 'gnus-user-format-function-M
-;;;           'gnus-registry-user-format-function-M)
+;; use like this:
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M)
 (defun gnus-registry-user-format-function-M (headers)
-  (let* ((id (mail-header-message-id headers))
-         (marks (when id (gnus-registry-get-id-key id 'mark))))
-    (apply 'concat (mapcar (lambda (mark)
-                             (let ((c
-                                    (plist-get
-                                     (cdr-safe
-                                      (assoc mark gnus-registry-marks))
-                                     :char)))
-                               (if c
-                                   (list c)
-                                 nil)))
-                           marks))))
+  "Show the marks for an article by the :char property"
+  (let* ((id (mail-header-message-id headers))
+         (marks (when id (gnus-registry-get-id-key id 'mark))))
+    (mapconcat (lambda (mark)
+                 (plist-get
+                  (cdr-safe
+                   (assoc mark gnus-registry-marks))
+                  :char))
+               marks "")))
+
+;; use like this:
+;; (defalias 'gnus-user-format-function-M 
'gnus-registry-user-format-function-M2)
+(defun gnus-registry-user-format-function-M2 (headers)
+  "Show the marks for an article by name"
+  (let* ((id (mail-header-message-id headers))
+         (marks (when id (gnus-registry-get-id-key id 'mark))))
+    (mapconcat (lambda (mark) (symbol-name mark)) marks ",")))
 
 (defun gnus-registry-read-mark ()
   "Read a mark name from the user with completion."