summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/org/ChangeLog16
-rw-r--r--lisp/org/org-bibtex.el5
-rw-r--r--lisp/org/org-clock.el6
-rw-r--r--lisp/org/org-docbook.el3
-rw-r--r--lisp/org/org-latex.el3
-rw-r--r--lisp/org/org-mac-message.el3
-rw-r--r--lisp/org/org-mobile.el3
-rw-r--r--lisp/org/org-mouse.el3
-rw-r--r--lisp/org/org-plot.el4
-rw-r--r--lisp/org/org-publish.el3
-rw-r--r--lisp/org/org.el20
11 files changed, 38 insertions, 31 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index d651d6b5e19..ef82bd2076f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-05 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * 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.
+
2009-10-04 Juanma Barranquero <lekktu@gmail.com>
* org.el (org-directory, org-map-entries):
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 74462b35f1f..3b34e7dd8c8 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -188,8 +188,9 @@
(let ((b (current-buffer)) (p (point)))
;; Restore the window configuration because we just use the web link
(set-window-configuration org-window-config-before-follow-link)
- (save-excursion (set-buffer b) (goto-char p)
- (bibtex-url)))
+ (with-current-buffer b
+ (goto-char p)
+ (bibtex-url)))
(recenter 0)) ; Move entry start to beginning of window
;; return t to indicate that the search is done.
t))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 1b55309101f..6cd39b1ea7d 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -752,8 +752,7 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
(if (not (marker-buffer org-clock-marker))
(if fail-quietly (throw 'exit t) (error "No active clock")))
(let (ts te s h m remove)
- (save-excursion
- (set-buffer (marker-buffer org-clock-marker))
+ (with-current-buffer (marker-buffer org-clock-marker)
(save-restriction
(widen)
(goto-char org-clock-marker)
@@ -814,8 +813,7 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
(interactive)
(if (not (marker-buffer org-clock-marker))
(error "No active clock"))
- (save-excursion
- (set-buffer (marker-buffer org-clock-marker))
+ (with-current-buffer (marker-buffer org-clock-marker)
(goto-char org-clock-marker)
(delete-region (1- (point-at-bol)) (point-at-eol)))
(move-marker 'org-clock-marker nil)
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index 37d13cfe1d6..11f37999190 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -285,8 +285,7 @@ then use this command to convert it."
beg end t 'string))
(setq reg (buffer-substring beg end)
buf (get-buffer-create "*Org tmp*"))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(erase-buffer)
(insert reg)
(org-mode)
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 6e06459b0e9..7b6970bbca9 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -451,8 +451,7 @@ then use this command to convert it."
beg end t 'string))
(setq reg (buffer-substring beg end)
buf (get-buffer-create "*Org tmp*"))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(erase-buffer)
(insert reg)
(org-mode)
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index ff68fd7756e..b2abe95ad40 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -193,8 +193,7 @@ If heading exists, delete all message:// links within heading's first
level. If heading doesn't exist, create it at point-max. Insert
list of message:// links to flagged mail after heading."
(interactive "bBuffer in which to insert links: \nsHeading after which to insert links: ")
- (save-excursion
- (set-buffer org-buffer)
+ (with-current-buffer org-buffer
(goto-char (point-min))
(let ((isearch-forward t)
(message-re "\\[\\[\\(message:\\)\\([^]]+\\)\\]\\(\\[\\([^]]+\\)\\]\\)?\\]"))
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 0204b5c2300..65d063db7d1 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -391,8 +391,7 @@ If nothing new has beed added, return nil."
org-mobile-directory)))
(insertion-point (make-marker))
not-empty content)
- (save-excursion
- (set-buffer capture-buffer)
+ (with-current-buffer capture-buffer
(setq content (buffer-string))
(setq not-empty (string-match "\\S-" content))
(when not-empty
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index d434e7fe450..e5e540d84d8 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1042,8 +1042,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
(org-mouse-direct nil)
(org-mouse-main-buffer (current-buffer)))
(when (eq (with-current-buffer buffer major-mode) 'org-mode)
- (let ((endmarker (save-excursion
- (set-buffer buffer)
+ (let ((endmarker (with-current-buffer buffer
(outline-end-of-subtree)
(forward-char 1)
(copy-marker (point)))))
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 04894c0e75f..81605f79c38 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -279,8 +279,8 @@ line directly before or after the table."
(save-window-excursion
(delete-other-windows)
(when (get-buffer "*gnuplot*") ;; reset *gnuplot* if it already running
- (save-excursion
- (set-buffer "*gnuplot*") (goto-char (point-max))
+ (with-current-buffer "*gnuplot*"
+ (goto-char (point-max))
(gnuplot-delchar-or-maybe-eof nil)))
(org-plot/goto-nearest-table)
;; set default options
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 9cd7a8cefb3..2bd92268657 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -607,8 +607,7 @@ Default for INDEX-FILENAME is 'sitemap.org'."
(let* ((visiting (find-buffer-visiting file))
(buffer (or visiting (find-file-noselect file)))
title)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(let* ((opt-plist (org-combine-plists (org-default-export-plist)
(org-infile-export-plist))))
(setq title
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c3137887b4c..d3db0094aab 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -110,8 +110,7 @@ With prefix arg HERE, insert it at point."
(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 @@ on the system \"/user@host:\"."
"\\}[ \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 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'"
(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 @@ EXTRA is additional text that will be inserted into the notes buffer."
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 @@ This uses the icalendar.el library."
(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 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
'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 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
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))
View Lorry Controller Status