Browse Source

Fix some typos, add a new variable

Carsten Dominik 15 years ago
parent
commit
09acabcfb3
5 changed files with 18 additions and 5 deletions
  1. 1 1
      lisp/org-exp-blocks.el
  2. 1 1
      lisp/org-id.el
  3. 1 1
      lisp/org-macs.el
  4. 14 1
      lisp/org-remember.el
  5. 1 1
      lisp/org.el

+ 1 - 1
lisp/org-exp-blocks.el

@@ -370,7 +370,7 @@ with their values as determined by R."
 
 
 (defun org-export-interblocks-format-R (start end)
 (defun org-export-interblocks-format-R (start end)
   "This is run over parts of the org-file which are between R
   "This is run over parts of the org-file which are between R
-blocks.  It's main use is to expand the \R{stuff} chunks for
+blocks.  Its main use is to expand the \R{stuff} chunks for
 export."
 export."
   (save-excursion
   (save-excursion
     (goto-char start)
     (goto-char start)

+ 1 - 1
lisp/org-id.el

@@ -563,7 +563,7 @@ optional argument MARKERP, return the position as a new marker."
 ;; so we do have to add it to `org-store-link-functions'.
 ;; so we do have to add it to `org-store-link-functions'.
 
 
 (defun org-id-store-link ()
 (defun org-id-store-link ()
-  "Store a link to the current entry, using it's ID."
+  "Store a link to the current entry, using its ID."
   (interactive)
   (interactive)
   (let* ((link (org-make-link "id:" (org-id-get-create)))
   (let* ((link (org-make-link "id:" (org-id-get-create)))
 	 (desc (save-excursion
 	 (desc (save-excursion

+ 1 - 1
lisp/org-macs.el

@@ -173,7 +173,7 @@ We use a macro so that the test can happen at compilation time."
 
 
 (defsubst org-check-external-command (cmd &optional use no-error)
 (defsubst org-check-external-command (cmd &optional use no-error)
   "Check if external progam CMD for USE exists, error if not.
   "Check if external progam CMD for USE exists, error if not.
-When the program does exist, return it's path.
+When the program does exist, return its path.
 When it does not exist and NO-ERROR is set, return nil.
 When it does not exist and NO-ERROR is set, return nil.
 Otherwise, throw an error.  The optional argument USE can describe what this
 Otherwise, throw an error.  The optional argument USE can describe what this
 program is needed for, so that the error message can be more informative."
 program is needed for, so that the error message can be more informative."

+ 14 - 1
lisp/org-remember.el

@@ -256,6 +256,18 @@ is set."
   :group 'org-remember
   :group 'org-remember
   :type 'boolean)
   :type 'boolean)
 
 
+(defcustom org-remember-warn-about-backups t
+  "Non-nil means warn about backup files in `org-remember-backup-directory'.
+
+Set this to nil if you find that you don't need the warning.
+
+If you cancel remember calls frequently and know when they
+contain useful information (because you know that you made an
+error or emacs crashed, for example) nil is more useful.  In the
+opposite case, the default, t, is more useful."
+  :group 'org-remember
+  :type 'boolean)
+
 (defvar annotation) ; from remember.el, dynamically scoped in `remember-mode'
 (defvar annotation) ; from remember.el, dynamically scoped in `remember-mode'
 (defvar initial)    ; from remember.el, dynamically scoped in `remember-mode'
 (defvar initial)    ; from remember.el, dynamically scoped in `remember-mode'
 
 
@@ -1050,7 +1062,8 @@ See also the variable `org-reverse-note-order'."
 			  (directory-files
 			  (directory-files
 			   org-remember-backup-directory nil
 			   org-remember-backup-directory nil
 			   "^remember-.*[0-9]$"))))
 			   "^remember-.*[0-9]$"))))
-		  (when (> n 0)
+		  (when (and org-remember-warn-about-backups
+                             (> n 0))
 		    (message
 		    (message
 		     "%d backup files (unfinished remember calls) in %s"
 		     "%d backup files (unfinished remember calls) in %s"
 		     n org-remember-backup-directory))))))))))
 		     n org-remember-backup-directory))))))))))

+ 1 - 1
lisp/org.el

@@ -4786,7 +4786,7 @@ If KWD is a number, get the corresponding match group."
 (defun org-cycle (&optional arg)
 (defun org-cycle (&optional arg)
   "TAB-action and visibility cycling for Org-mode.
   "TAB-action and visibility cycling for Org-mode.
 
 
-This is the command invoked in Org-moe by the TAB key.  It's main purpose
+This is the command invoked in Org-mode by the TAB key.  Its main purpose
 is outine visibility cycling, but it also invokes other actions
 is outine visibility cycling, but it also invokes other actions
 in special contexts.
 in special contexts.