Copyright, license, and header fixes for Org.

[gnu-emacs] / lisp / org / org-feed.el

diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 07558af462f847dfd55e8831c15eb008bef26676..f5186aaacf3f399a64cbd8b06028a7aae2e7e5e8 100644 (file)
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -1,11 +1,10 @@
 ;;; org-feed.el --- Add RSS feed items to Org files
 ;;
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -436,7 +435,7 @@ it can be a list structured like an entry in `org-feed-alist'."
   (if (stringp feed) (setq feed (assoc feed org-feed-alist)))
   (unless feed
     (error "No such feed in `org-feed-alist"))
-  (switch-to-buffer
+  (org-pop-to-buffer-same-window
    (org-feed-update feed 'retrieve-only))
   (goto-char (point-min)))