[Emacs-diffs] emacs/lisp/org org.el org-publish.el org-plot.e...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/05 21:00:34

Modified files:
        lisp/org       : org.el org-publish.el org-plot.el org-mouse.el 
                         org-mobile.el org-mac-message.el org-latex.el 
                         org-docbook.el org-clock.el org-bibtex.el 
                         ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org.el?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-publish.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-plot.el?cvsroot=emacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-mouse.el?cvsroot=emacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-mobile.el?cvsroot=emacs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-mac-message.el?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-latex.el?cvsroot=emacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-docbook.el?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-clock.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-bibtex.el?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.91&r2=1.92

Patches:
Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- org.el      4 Oct 2009 01:36:08 -0000       1.56
+++ org.el      5 Nov 2009 21:00:31 -0000       1.57
@@ -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))

Index: org-publish.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-publish.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- org-publish.el      1 Oct 2009 07:59:55 -0000       1.31
+++ org-publish.el      5 Nov 2009 21:00:32 -0000       1.32
@@ -607,8 +607,7 @@
   (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

Index: org-plot.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-plot.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- org-plot.el 1 Oct 2009 07:59:55 -0000       1.21
+++ org-plot.el 5 Nov 2009 21:00:33 -0000       1.22
@@ -279,8 +279,8 @@
   (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

Index: org-mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-mouse.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- org-mouse.el        1 Oct 2009 07:59:55 -0000       1.28
+++ org-mouse.el        5 Nov 2009 21:00:33 -0000       1.29
@@ -1042,8 +1042,7 @@
           (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)))))

Index: org-mobile.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-mobile.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- org-mobile.el       1 Oct 2009 07:59:55 -0000       1.1
+++ org-mobile.el       5 Nov 2009 21:00:33 -0000       1.2
@@ -391,8 +391,7 @@
                                           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

Index: org-mac-message.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-mac-message.el,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- org-mac-message.el  1 Oct 2009 07:59:55 -0000       1.27
+++ org-mac-message.el  5 Nov 2009 21:00:33 -0000       1.28
@@ -193,8 +193,7 @@
 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:\\)\\([^]]+\\)\\]\\(\\[\\([^]]+\\)\\]\\)?\\]"))

Index: org-latex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-latex.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- org-latex.el        1 Oct 2009 07:59:55 -0000       1.3
+++ org-latex.el        5 Nov 2009 21:00:33 -0000       1.4
@@ -451,8 +451,7 @@
                       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)

Index: org-docbook.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-docbook.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- org-docbook.el      1 Oct 2009 07:59:54 -0000       1.8
+++ org-docbook.el      5 Nov 2009 21:00:33 -0000       1.9
@@ -285,8 +285,7 @@
                         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)

Index: org-clock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-clock.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- org-clock.el        4 Oct 2009 01:36:08 -0000       1.29
+++ org-clock.el        5 Nov 2009 21:00:33 -0000       1.30
@@ -752,8 +752,7 @@
     (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 @@
   (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)

Index: org-bibtex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-bibtex.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- org-bibtex.el       1 Oct 2009 07:59:54 -0000       1.25
+++ org-bibtex.el       5 Nov 2009 21:00:33 -0000       1.26
@@ -188,7 +188,8 @@
        (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)
+         (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.

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- ChangeLog   4 Oct 2009 01:36:07 -0000       1.91
+++ ChangeLog   5 Nov 2009 21:00:33 -0000       1.92
@@ -1,3 +1,19 @@
+2009-11-05  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org.el (org-directory, org-map-entries):