Spelling fixes.

[gnu-emacs] / lisp / org / org-remember.el

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index c6e21ae057b194e41c3139db23b8a1d96cc24e5b..d1d863c28456627822418f690148b09ad6416b41 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,12 +1,10 @@
 ;;; org-remember.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -34,12 +32,16 @@
 (eval-when-compile
   (require 'cl))
 (require 'org)
+(require 'org-compat)
 (require 'org-datetree)
 
 (declare-function remember-mode "remember" ())
 (declare-function remember "remember" (&optional initial))
 (declare-function remember-buffer-desc "remember" ())
 (declare-function remember-finalize "remember" ())
+(declare-function org-pop-to-buffer-same-window
+                 "org-compat" (&optional buffer-or-name norecord label))
+
 (defvar remember-save-after-remembering)
 (defvar remember-register)
 (defvar remember-buffer)
@@ -62,7 +64,7 @@ and `org-remember-default-headline'.  To force prompting anyway, use
 \\[universal-argument] \\[org-remember-finalize] to file the note.
 
 When this variable is nil, \\[org-remember-finalize] gives you the prompts, and
-\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack."
+\\[universal-argument] \\[org-remember-finalize] triggers the fast track."
   :group 'org-remember
   :type 'boolean)
 
@@ -785,7 +787,7 @@ The user is queried for the template."
       (setq heading org-remember-default-headline))
     (setq visiting (org-find-base-buffer-visiting file))
     (if (not visiting) (find-file-noselect file))
-    (switch-to-buffer (or visiting (get-file-buffer file)))
+    (org-pop-to-buffer-same-window (or visiting (get-file-buffer file)))
     (widen)
     (goto-char (point-min))
     (if (re-search-forward
@@ -941,7 +943,7 @@ See also the variable `org-reverse-note-order'."
        (throw 'quit t))
       ;; Find the file
       (with-current-buffer (or visiting (find-file-noselect file))
-       (unless (or (org-mode-p) (member heading '(top bottom)))
+       (unless (or (eq major-mode 'org-mode) (member heading '(top bottom)))
          (error "Target files for notes must be in Org-mode if not filing to top/bottom"))
        (save-excursion
          (save-restriction
@@ -951,7 +953,7 @@ See also the variable `org-reverse-note-order'."
            ;; Find the default location
            (when heading
              (cond
-              ((not (org-mode-p))
+              ((not (eq major-mode 'org-mode))
                (if (eq heading 'top)
                    (goto-char (point-min))
                  (goto-char (point-max))
@@ -1004,7 +1006,7 @@ See also the variable `org-reverse-note-order'."
             ((eq org-remember-interactive-interface 'outline-path-completion)
              (let ((org-refile-targets '((nil . (:maxlevel . 10))))
                    (org-refile-use-outline-path t))
-               (setq spos (org-refile-get-location "Heading: ")
+               (setq spos (org-refile-get-location "Heading")
                      exitcmd 'return
                      spos (nth 3 spos))))
             (t (error "This should not happen")))
@@ -1012,7 +1014,7 @@ See also the variable `org-reverse-note-order'."
                                        ; not handle this note
            (and visitp (run-with-idle-timer 0.01 nil 'org-remember-visit-immediately))
            (goto-char spos)
-           (cond ((org-on-heading-p t)
+           (cond ((org-at-heading-p t)
                   (org-back-to-heading t)
                   (setq level (funcall outline-level))
                   (cond
@@ -1072,7 +1074,7 @@ See also the variable `org-reverse-note-order'."
                   (save-restriction
                     (widen)
                     (goto-char (point-min))
-                    (re-search-forward "^\\*+ " nil t)
+                    (re-search-forward org-outline-regexp-bol nil t)
                     (beginning-of-line 1)
                     (org-paste-subtree 1 txt)
                     (and org-auto-align-tags (org-set-tags nil t))
@@ -1149,7 +1151,4 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
-
 ;;; org-remember.el ends here
-