diff options
| author | Rasmus <rasmus@gmx.us> | 2017-12-06 15:02:15 +0100 |
|---|---|---|
| committer | Rasmus <rasmus@gmx.us> | 2017-12-06 15:37:41 +0100 |
| commit | 445eefd238eb7c3843e18cd265c05f07233f8aff (patch) | |
| tree | 1b80ecda2301629cf8e1f0b2941e1f729952ca84 /lisp/org/org-gnus.el | |
| parent | 5381c70b7a9d46fe4de205363b99f761e2475f1f (diff) | |
| download | emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.tar.gz emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.tar.bz2 emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.zip | |
Backport: Update Org to v9.1.4
Please note this is a bugfix release. See etc/ORG-NEWS for details.
(cherry picked from commit 567b5efe1f338c10c574758fb968915c5c34c909)
Diffstat (limited to 'lisp/org/org-gnus.el')
| -rw-r--r-- | lisp/org/org-gnus.el | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el index 687bc08b16e..26bb8899d3b 100644 --- a/lisp/org/org-gnus.el +++ b/lisp/org/org-gnus.el @@ -31,15 +31,31 @@ ;;; Code: -(require 'org) +(require 'gnus-sum) (require 'gnus-util) +(require 'nnheader) +(require 'nnir) +(require 'org) ;;; Declare external functions and variables +(declare-function gnus-activate-group "gnus-start" (group &optional scan dont-check method dont-sub-check)) +(declare-function gnus-find-method-for-group "gnus" (group &optional info)) +(declare-function gnus-group-group-name "gnus-group") +(declare-function gnus-group-jump-to-group "gnus-group" (group &optional prompt)) +(declare-function gnus-group-read-group "gnus-group" (&optional all no-article group select-articles)) (declare-function message-fetch-field "message" (header &optional not-all)) +(declare-function message-generate-headers "message" (headers)) +(declare-function message-narrow-to-headers "message") +(declare-function message-tokenize-header "message" (header &optional separator)) +(declare-function message-unquote-tokens "message" (elems)) (declare-function nnvirtual-map-article "nnvirtual" (article)) +(defvar gnus-newsgroup-name) +(defvar gnus-summary-buffer) +(defvar gnus-other-frame-object) + ;;; Customization variables @@ -120,9 +136,11 @@ If `org-store-link' was called with a prefix arg the meaning of (let* ((group (pcase (gnus-find-method-for-group gnus-newsgroup-name) (`(nnvirtual . ,_) - (car (nnvirtual-map-article (gnus-summary-article-number)))) + (save-excursion + (car (nnvirtual-map-article (gnus-summary-article-number))))) (`(nnir . ,_) - (nnir-article-group (gnus-summary-article-number))) + (save-excursion + (nnir-article-group (gnus-summary-article-number)))) (_ gnus-newsgroup-name))) (header (with-current-buffer gnus-summary-buffer (gnus-summary-article-header))) |