[Emacs-diffs] Changes to emacs/lisp/org/org-gnus.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/11/12 08:01:10

Index: org-gnus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-gnus.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- org-gnus.el 25 Oct 2008 21:32:48 -0000      1.8
+++ org-gnus.el 12 Nov 2008 08:01:07 -0000      1.9
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.10c
+;; Version: 6.12a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -96,12 +96,11 @@
       (setq desc (org-email-link-description))
       (if (org-xor current-prefix-arg org-usenet-links-prefer-google)
          (setq link
-               (concat
-                desc "\n  "
                 (format "http://groups.google.com/groups?as_umsgid=%s";
-                        (org-fixup-message-id-for-http message-id))))
-       (setq link (org-make-link "gnus:" group
-                                 "#" (number-to-string article))))
+                       (org-fixup-message-id-for-http message-id)))
+       (setq link (org-make-link "gnus:" group "#"
+                                 (or message-id
+                                     (number-to-string article)))))
       (org-add-link-props :link link :description desc)
       link))))
 
@@ -121,9 +120,17 @@
   (if gnus-other-frame-object (select-frame gnus-other-frame-object))
   (cond ((and group article)
         (gnus-group-read-group 1 nil group)
-        (gnus-summary-goto-article (string-to-number article) nil t))
+        (gnus-summary-goto-article
+         (if (string-match "[^0-9]" article)
+             article
+           (string-to-number article))
+         nil t))
        (group (gnus-group-jump-to-group group))))
 
+(defun org-gnus-no-new-news ()
+  "Like `M-x gnus' but doesn't check for new news."
+  (if (not (gnus-alive-p)) (gnus)))
+
 (provide 'org-gnus)
 
 ;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d