diff options
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org/ob-haskell.el | 4 | ||||
| -rw-r--r-- | lisp/org/ob-ocaml.el | 4 | ||||
| -rw-r--r-- | lisp/org/ob-sql.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-clock.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-remember.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-table.el | 7 |
8 files changed, 15 insertions, 18 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index d4f993fedf..9d7b7c658c 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -13808,7 +13808,7 @@ 2009-08-06 Bastien Guerry <bzg@altern.org> - * org.el (org-special-ctrl-a/e): Explicitely bind the value + * org.el (org-special-ctrl-a/e): Explicitly bind the value 'reversed for this option to the "true line boundary first" behavior. (org-tags-match-list-sublevels): Document the 'indented value for @@ -16482,7 +16482,7 @@ 2008-11-23 Carsten Dominik <carsten.dominik@gmail.com> * org-export-latex.el (org-export-latex-subcontent): - Interprete target aliases as additional labels. + Interpret target aliases as additional labels. * org-exp.el (org-export-target-aliases): New variable. (org-export-preprocess-string) @@ -17290,7 +17290,7 @@ (org-edit-fixed-width-region): Also try `org-edit-fixed-width-region'. (org-edit-fixed-width-region-mode): New option. - (org-activate-code): Only interprete lines starting with colon + (org-activate-code): Only interpret lines starting with colon plus a space as example lines. * org-remember.el (org-remember-templates): Add nil instead of diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el index cae07036c5..236dbba28f 100644 --- a/lisp/org/ob-haskell.el +++ b/lisp/org/ob-haskell.el @@ -29,7 +29,7 @@ ;; they can be run, but haskell code can also be run through an ;; interactive interpreter. ;; -;; For now lets only allow evaluation using the haskell interpreter. +;; For now let's only allow evaluation using the haskell interpreter. ;;; Requirements: @@ -80,7 +80,7 @@ (cdr (member org-babel-haskell-eoe (reverse (mapcar #'org-babel-trim raw))))))) (org-babel-reassemble-table - (cond + (cond ((equal result-type 'output) (mapconcat #'identity (reverse (cdr results)) "\n")) ((equal result-type 'value) diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el index ee7a7cc212..78d309b9e1 100644 --- a/lisp/org/ob-ocaml.el +++ b/lisp/org/ob-ocaml.el @@ -29,7 +29,7 @@ ;; they can be run, but ocaml code can also be run through an ;; interactive interpreter. ;; -;; For now lets only allow evaluation using the ocaml interpreter. +;; For now let's only allow evaluation using the ocaml interpreter. ;;; Requirements: @@ -99,7 +99,7 @@ (lambda (pair) (format "let %s = %s;;" (car pair) (org-babel-ocaml-elisp-to-ocaml (cdr pair)))) (mapcar #'cdr (org-babel-get-header params :var)))) - + (defun org-babel-ocaml-elisp-to-ocaml (val) "Return a string of ocaml code which evaluates to VAL." (if (listp val) diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 9274438c18..7a5c7c8a46 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -32,7 +32,7 @@ ;; ;; Also SQL evaluation generally takes place inside of a database. ;; -;; For now lets just allow a generic ':cmdline' header argument. +;; For now let's just allow a generic ':cmdline' header argument. ;; ;; TODO: ;; @@ -40,7 +40,7 @@ ;; - add more useful header arguments (user, passwd, database, etc...) ;; - support for more engines (currently only supports mysql) ;; - what's a reasonable way to drop table data into SQL? -;; +;; ;;; Code: (require 'ob) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 53a0c5587a..1d0802dcda 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -5059,7 +5059,7 @@ See also the user option `org-agenda-clock-consistency-checks'." (/ (- tlend ts) 60)) face (or (plist-get pl :overlap-face) face))) ((and (> tlend 0) (> ts (+ tlend (* 60 maxgap)))) - ;; There is a gap, lets see if we need to report it + ;; There is a gap, let's see if we need to report it (unless (org-agenda-check-clock-gap tlend ts gapok) (setq issue (format "Clocking gap: %d minutes" (/ (- ts tlend) 60)) diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index de5087e163..b1a8a4b9fd 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1261,7 +1261,7 @@ line and position cursor in that line." (and (re-search-forward org-property-end-re nil t) (goto-char (match-beginning 0)))) (throw 'exit t)) - ;; Lets count the CLOCK lines + ;; Let's count the CLOCK lines (goto-char beg) (while (re-search-forward re end t) (setq first (or first (match-beginning 0)) @@ -2641,4 +2641,3 @@ The details of what will be saved are regulated by the variable ;;; org-clock.el ends here - diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index 2bc5ef92ae..e15debfd90 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -1122,7 +1122,7 @@ See also the variable `org-reverse-note-order'." (condition-case nil (require 'remember) (error - ;; Lets install our own micro version of remember + ;; Let's install our own micro version of remember (defvar remember-register ?R) (defvar remember-mode-hook nil) (defvar remember-handler-functions nil) @@ -1153,4 +1153,3 @@ See also the variable `org-reverse-note-order'." ;;; org-remember.el ends here - diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 7f49b3236e..2fba931528 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -2204,7 +2204,7 @@ For all numbers larger than LIMIT, shift them by DELTA." (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field)) (push (cons field v) org-table-local-parameters) (push (list field line col) org-table-named-field-locations)))) - ;; Analyse the line types + ;; Analyze the line types (goto-char beg) (setq org-table-current-begin-line (org-current-line) org-table-current-begin-pos (point) @@ -2432,7 +2432,7 @@ not overwrite the stored one." duration-output-format nil fmt (replace-match "" t t fmt))) (if (string-match "t" fmt) - (setq duration t + (setq duration t duration-output-format org-table-duration-custom-format numbers t fmt (replace-match "" t t fmt))) @@ -2500,7 +2500,7 @@ not overwrite the stored one." ;; Insert complex ranges (while (and (string-match org-table-range-regexp form) (> (length (match-string 0 form)) 1)) - (setq formrg (save-match-data + (setq formrg (save-match-data (org-table-get-range (match-string 0 form) nil n0))) (setq formrpl (save-match-data @@ -4723,4 +4723,3 @@ list of the fields in the rectangle ." ;;; org-table.el ends here - |