[Emacs-diffs] emacs/lisp/org ChangeLog org-remember.el org.el

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/12/23 23:12:32

Modified files:
        lisp/org       : ChangeLog org-remember.el org.el 

Log message:
        2008-12-23  Carsten Dominik  <address@hidden>
        
                * org-remember.el (org-remember-handler): Safer way to get a new
                buffer accessing the target file.
        
                * org.el (org-refile-get-location): Handle case of current 
buffer
                not having a file associated with it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-remember.el?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org.el?cvsroot=emacs&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ChangeLog   22 Dec 2008 22:14:10 -0000      1.45
+++ ChangeLog   23 Dec 2008 23:12:31 -0000      1.46
@@ -1,3 +1,11 @@
+2008-12-23  Carsten Dominik  <address@hidden>
+
+       * org-remember.el (org-remember-handler): Safer way to get a new
+       buffer accessing the target file.
+
+       * org.el (org-refile-get-location): Handle case of current buffer
+       not having a file associated with it.
+
 2008-12-22  Carsten Dominik  <address@hidden>
 
        * org-table.el (org-table-get-formula): Only ask to overwrite

Index: org-remember.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-remember.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- org-remember.el     20 Dec 2008 14:32:08 -0000      1.16
+++ org-remember.el     23 Dec 2008 23:12:31 -0000      1.17
@@ -809,8 +809,7 @@
          (move-marker org-remember-last-stored-marker (point)))
        (throw 'quit t))
       ;; Find the file
-      (if (not visiting) (find-file-noselect file))
-      (with-current-buffer (or visiting (get-file-buffer file))
+      (with-current-buffer (or visiting (find-file-noselect file))
        (unless (org-mode-p)
          (error "Target files for remember notes must be in Org-mode"))
        (save-excursion

Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- org.el      20 Dec 2008 14:32:08 -0000      1.34
+++ org.el      23 Dec 2008 23:12:31 -0000      1.35
@@ -7668,13 +7668,13 @@
   (unless org-refile-target-table
     (error "No refile targets"))
   (let* ((cbuf (current-buffer))
+        (cfn (buffer-file-name (buffer-base-buffer cbuf)))
         (cfunc (if (and org-refile-use-outline-path
                         org-outline-path-complete-in-steps)
                    'org-olpath-completing-read
                  'org-ido-completing-read))
         (extra (if org-refile-use-outline-path "/" ""))
-        (filename (expand-file-name
-                   (buffer-file-name (buffer-base-buffer cbuf))))
+        (filename (and cfn (expand-file-name cfn)))
         (tbl (mapcar
               (lambda (x)
                 (if (not (equal filename (nth 1 x)))