diff lisp/org/org.el @ 105865:131bccfc4f5d

* org.el (org-version, org-get-refile-targets, org-refile) (org-store-log-note, org-diary-to-ical-string) (org-speedbar-set-agenda-restriction): * org-publish.el (org-publish-find-title): * org-plot.el (org-plot/gnuplot): * org-mouse.el (org-mouse-do-remotely): * org-mobile.el (org-mobile-move-capture): * org-mac-message.el (org-mac-message-insert-flagged): * org-latex.el (org-replace-region-by-latex): * org-docbook.el (org-replace-region-by-docbook): * org-clock.el (org-clock-out, org-clock-cancel): * org-bibtex.el (org-execute-file-search-in-bibtex): Use with-current-buffer.

--- a/lisp/org/org.el	Thu Nov 05 20:54:34 2009 +0000
+++ b/lisp/org/org.el	Thu Nov 05 21:00:31 2009 +0000
@@ -110,8 +110,7 @@
 	(let ((pwd (substring (pwd) 10)))
 	  (cd dir)
 	  (if (eql 0 (shell-command "git describe --abbrev=4 HEAD"))
-	      (save-excursion
-		(set-buffer "*Shell Command Output*")
+	      (with-current-buffer "*Shell Command Output*"
 		(goto-char (point-min))
 		(re-search-forward "[^\n]+")
 		(setq git-version (match-string 0))
@@ -8674,8 +8673,8 @@
 			       "\\}[ \t]")))
 	 (t (error "Bad refiling target description %s" desc)))
 	(while (setq f (pop files))
-	  (save-excursion
-	    (set-buffer (if (bufferp f) f (org-get-agenda-file-buffer f)))
+	  (with-current-buffer
+              (if (bufferp f) f (org-get-agenda-file-buffer f))
 	    (if (bufferp f) (setq f (buffer-file-name (buffer-base-buffer f))))
 	    (setq f (expand-file-name f))
 	    (if (eq org-refile-use-outline-path 'file)
@@ -8823,9 +8822,8 @@
 		(org-kill-new (buffer-substring region-start region-end))
 		(org-save-markers-in-region region-start region-end))
 	    (org-copy-subtree 1 nil t))
-	  (save-excursion
-	    (set-buffer (setq nbuf (or (find-buffer-visiting file)
-				       (find-file-noselect file))))
+	  (with-current-buffer (setq nbuf (or (find-buffer-visiting file)
+                                              (find-file-noselect file)))
 	    (setq reversed (org-notes-order-reversed-p))
 	    (save-excursion
 	      (save-restriction
@@ -10431,8 +10429,7 @@
 	 org-log-note-marker))
       (setq lines nil))
     (when lines
-      (save-excursion
-	(set-buffer (marker-buffer org-log-note-marker))
+      (with-current-buffer (marker-buffer org-log-note-marker)
 	(save-excursion
 	  (goto-char org-log-note-marker)
 	  (move-marker org-log-note-marker nil)
@@ -13284,8 +13281,7 @@
 	 (tmpfile (make-temp-name
 		   (expand-file-name "orgics" tmpdir)))
 	 buf rtn b e)
-    (save-excursion
-      (set-buffer frombuf)
+    (with-current-buffer frombuf
       (icalendar-export-region (point-min) (point-max) tmpfile)
       (setq buf (find-buffer-visiting tmpfile))
       (set-buffer buf)
@@ -17193,6 +17189,7 @@
 				 'org-imenu t))
       (setq m (get-text-property p 'org-imenu-marker))
       (save-excursion
+        ;; FIXME: Shouldn't set-buffer be done before save-restriction?  --Stef
 	(save-restriction
 	  (set-buffer (marker-buffer m))
 	  (goto-char m)
@@ -17207,6 +17204,7 @@
 	    txt (buffer-substring-no-properties (or tp (point-min))
 						(or np (point-max))))
       (save-excursion
+        ;; FIXME: Shouldn't set-buffer be done before save-restriction?  --Stef
 	(save-restriction
 	  (set-buffer (find-file-noselect
 		       (let ((default-directory dir))