[Emacs-diffs] Changes to emacs/lisp/org/org-remember.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/11/12 08:01:10

Index: org-remember.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-remember.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- org-remember.el     25 Oct 2008 21:32:49 -0000      1.9
+++ org-remember.el     12 Nov 2008 08:01:09 -0000      1.10
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.10c
+;; Version: 6.12a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -694,7 +694,7 @@
 See also the variable `org-reverse-note-order'."
   (when (and (equal current-prefix-arg 2)
             (not (marker-buffer org-clock-marker)))
-    (error "No runing clock"))
+    (error "No running clock"))
   (when (org-bound-and-true-p org-jump-to-target-location)
     (let* ((end (min (point-max) (1+ (point))))
           (beg (point)))
@@ -733,10 +733,12 @@
        (setq visitp t))
       (when previousp
        (setq file (car org-remember-previous-location)
+             visiting (and file (org-find-base-buffer-visiting file))
              heading (cdr org-remember-previous-location)
              fastp t))
       (when clockp
        (setq file (buffer-file-name (marker-buffer org-clock-marker))
+             visiting (and file (org-find-base-buffer-visiting file))
              heading org-clock-heading-for-remember
              fastp t))
       (setq current-prefix-arg nil)