[Emacs-diffs] /srv/bzr/emacs/trunk r103632: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103632
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-12 08:53:34 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-sync.el (gnus-sync-install-hooks, gnus-sync-unload-hook): Don't install 
`gnus-sync-read' to any hooks by default.  It's buggy.  The user will have to 
run `gnus-sync-read' manually and wait for Cloudy Gnus.
  mm-uu.el (mm-uu-type-alist): Add support for diff starting with "=== modified 
file".
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sync.el
  lisp/gnus/mm-uu.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-03-10 13:32:49 +0000
+++ b/lisp/gnus/ChangeLog       2011-03-12 08:53:34 +0000
@@ -1,3 +1,15 @@
+2011-03-11  Teodor Zlatanov  <address@hidden>
+
+       * gnus-sync.el (gnus-sync-install-hooks, gnus-sync-unload-hook): Don't
+       install `gnus-sync-read' to any hooks by default.  It's buggy.  The
+       user will have to run `gnus-sync-read' manually and wait for Cloudy
+       Gnus.
+
+2011-03-11  Julien Danjou  <address@hidden>
+
+       * mm-uu.el (mm-uu-type-alist): Add support for diff starting with "===
+       modified file".
+
 2011-03-09  Teodor Zlatanov  <address@hidden>
 
        * auth-source.el (auth-source-read-char-choice): New function to read a

=== modified file 'lisp/gnus/gnus-sync.el'
--- a/lisp/gnus/gnus-sync.el    2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/gnus-sync.el    2011-03-12 08:53:34 +0000
@@ -25,7 +25,8 @@
 ;; This is the gnus-sync.el package.
 
 ;; It's due for a rewrite using gnus-after-set-mark-hook and
-;; gnus-before-update-mark-hook.  Until then please consider it
+;; gnus-before-update-mark-hook, and my plan is to do this once No
+;; Gnus development is done.  Until then please consider it
 ;; experimental.
 
 ;; Put this in your startup file (~/.gnus.el for instance)
@@ -42,7 +43,8 @@
 
 ;; TODO:
 
-;; - after gnus-sync-read, the message counts are wrong
+;; - after gnus-sync-read, the message counts are wrong.  So it's not
+;;   run automatically, you have to call it with M-x gnus-sync-read
 
 ;; - use gnus-after-set-mark-hook and gnus-before-update-mark-hook to
 ;;   catch the mark updates
@@ -220,13 +222,13 @@
   "Install the sync hooks."
   (interactive)
   ;; (add-hook 'gnus-get-new-news-hook 'gnus-sync-read)
-  (add-hook 'gnus-save-newsrc-hook 'gnus-sync-save)
-  (add-hook 'gnus-read-newsrc-el-hook 'gnus-sync-read))
+  ;; (add-hook 'gnus-read-newsrc-el-hook 'gnus-sync-read)
+  (add-hook 'gnus-save-newsrc-hook 'gnus-sync-save))
 
 (defun gnus-sync-unload-hook ()
   "Uninstall the sync hooks."
   (interactive)
-  ;; (remove-hook 'gnus-get-new-news-hook 'gnus-sync-read)
+  (remove-hook 'gnus-get-new-news-hook 'gnus-sync-read)
   (remove-hook 'gnus-save-newsrc-hook 'gnus-sync-save)
   (remove-hook 'gnus-read-newsrc-el-hook 'gnus-sync-read))
 

=== modified file 'lisp/gnus/mm-uu.el'
--- a/lisp/gnus/mm-uu.el        2011-02-01 23:46:27 +0000
+++ b/lisp/gnus/mm-uu.el        2011-03-12 08:53:34 +0000
@@ -158,6 +158,12 @@
      mm-uu-diff-extract
      nil
      mm-uu-diff-test)
+    (diff
+     "^=== modified file "
+     nil
+     mm-uu-diff-extract
+     nil
+     mm-uu-diff-test)
     (git-format-patch
      "^diff --git "
      "^-- "