[gnus git] branch master updated: m0-5-169-gbaec42d =1= Merge changes made in Emacs trunk

       via  baec42de88199e90b738e968e34e8db492d2f2ef (commit)
      from  2297d85919376feabe9df62887fa0d38ba893c54 (commit)


- Log -----------------------------------------------------------------
commit baec42de88199e90b738e968e34e8db492d2f2ef
Author: Andreas Schwab <[email protected]>
Date:   Mon Dec 3 14:11:30 2012 +0000

    Merge changes made in Emacs trunk
    
    * gnus-sum.el (gnus-summary-mode-map): Bind gnus-summary-widget-forward to TAB, not [tab].
     (gnus-summary-article-map): Likewise.
    * gnus-sync.el (gnus-sync-newsrc-offsets): Restore definition.
     (gnus-sync-save): Use correct format for gnus-sync-newsrc-loader.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dedf4d7..86b29de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-03  Andreas Schwab  <[email protected]>
+
+	* gnus-sum.el (gnus-summary-mode-map): Bind gnus-summary-widget-forward
+	to TAB, not [tab].
+	(gnus-summary-article-map): Likewise.
+
+	* gnus-sync.el (gnus-sync-newsrc-offsets): Restore definition.
+	(gnus-sync-save): Use correct format for gnus-sync-newsrc-loader.
+
 2012-11-21  Paul Eggert  <[email protected]>
 
 	* time-date.el: Commentary fix.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index efbcb4d..4b00e99 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1915,7 +1915,7 @@ increase the score of each group you read."
   "a" gnus-summary-post-news
   "x" gnus-summary-limit-to-unread
   "s" gnus-summary-isearch-article
-  [tab] gnus-summary-widget-forward
+  "\t" gnus-summary-widget-forward
   [backtab] gnus-summary-widget-backward
   "t" gnus-summary-toggle-header
   "g" gnus-summary-show-article
@@ -2080,7 +2080,7 @@ increase the score of each group you read."
   "W" gnus-warp-to-article
   "g" gnus-summary-show-article
   "s" gnus-summary-isearch-article
-  [tab] gnus-summary-widget-forward
+  "\t" gnus-summary-widget-forward
   [backtab] gnus-summary-widget-backward
   "P" gnus-summary-print-article
   "S" gnus-sticky-article
diff --git a/lisp/gnus-sync.el b/lisp/gnus-sync.el
index b0b0d30..59ba590 100644
--- a/lisp/gnus-sync.el
+++ b/lisp/gnus-sync.el
@@ -120,6 +120,12 @@ this setting is harmless until the user chooses a sync backend."
   :group 'gnus-sync
   :type '(repeat regexp))
 
+(defcustom gnus-sync-newsrc-offsets '(2 3)
+  "List of per-group data to be synchronized."
+  :group 'gnus-sync
+  :type '(set (const :tag "Read ranges" 2)
+              (const :tag "Marks" 3)))
+
 (defcustom gnus-sync-global-vars nil
   "List of global variables to be synchronized.
 You may want to sync `gnus-newsrc-last-checked-date' but pretty
@@ -754,7 +760,15 @@ With a prefix, FORCE is set and all groups will be saved."
     ;; entry in gnus-newsrc-alist whose group matches any of the
     ;; gnus-sync-newsrc-groups
     ;; TODO: keep the old contents for groups we don't have!
-    (let ((gnus-sync-newsrc-loader (gnus-sync-newsrc-loader-builder)))
+    (let ((gnus-sync-newsrc-loader
+	   (loop for entry in (cdr gnus-newsrc-alist)
+		 when (gnus-grep-in-list
+		       (car entry)     ;the group name
+		       gnus-sync-newsrc-groups)
+		 collect (cons (car entry)
+			       (mapcar (lambda (offset)
+					 (cons offset (nth offset entry)))
+				       gnus-sync-newsrc-offsets)))))
       (with-temp-file gnus-sync-backend
         (progn
           (let ((coding-system-for-write gnus-ding-file-coding-system)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    9 +++++++++
 lisp/gnus-sum.el  |    4 ++--
 lisp/gnus-sync.el |   16 +++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project