Mercurial > emacs
changeset 105166:172e1951f385
* org.el (org-tree-to-indirect-buffer, org-convert-to-oddeven-levels)
(org-shiftselect-error, org-ctrl-c-ctrl-c):
* org-agenda.el (org-agenda-undo, org-check-for-org-mode):
* org-attach.el (org-attach-check-absolute-path):
* org-docbook.el (org-export-as-docbook):
* org-html.el (org-export-as-html):
* org-id.el (org-id-update-id-locations):
* org-table.el (org-table-fedit-lisp-indent, orgtbl-send-table):
Fix typos in error messages.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 23 Sep 2009 23:55:26 +0000 |
| parents | fd22b3e4d41f |
| children | e14dfafc8256 |
| files | lisp/org/ChangeLog lisp/org/org-agenda.el lisp/org/org-attach.el lisp/org/org-docbook.el lisp/org/org-html.el lisp/org/org-id.el lisp/org/org-table.el lisp/org/org.el |
| diffstat | 8 files changed, 46 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/ChangeLog Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/ChangeLog Wed Sep 23 23:55:26 2009 +0000 @@ -1,3 +1,15 @@ +2009-09-23 Juanma Barranquero <lekktu@gmail.com> + + * org.el (org-tree-to-indirect-buffer, org-convert-to-oddeven-levels) + (org-shiftselect-error, org-ctrl-c-ctrl-c): + * org-agenda.el (org-agenda-undo, org-check-for-org-mode): + * org-attach.el (org-attach-check-absolute-path): + * org-docbook.el (org-export-as-docbook): + * org-html.el (org-export-as-html): + * org-id.el (org-id-update-id-locations): + * org-table.el (org-table-fedit-lisp-indent, orgtbl-send-table): + Fix typos in error messages. + 2009-09-17 Stefan Monnier <monnier@iro.umontreal.ca> * org-ascii.el: Require CL for the `loop' macro. @@ -768,7 +780,7 @@ * org.el (org-time-since): Add a function to get the time since an org timestamp. (org-entry-properties): Add two new special properties: SINCE and - SINCE_IA. These give the time since any active or inactive + SINCE_IA. These give the time since any active or inactive timestamp in an entry. (org-special-properties): Add SINCE, SINCE_IA. (org-tags-sort-function): Add custom declaration for tags @@ -3994,7 +4006,7 @@ preview. (org-time-stamp-inactive): Call `org-time-stamp'. (org-time-stamp): New argument `inactive'. Also edit inacive - stamps. Convert time stamp type. + stamps. Convert time stamp type. (org-open-file): Interpret the `default' value for the `command' in `org-file-apps'. @@ -4087,13 +4099,13 @@ * org-remember.el (org-get-x-clipboard): Use the compat function to get clipboard values when x-selection-value is - unavailable. Use substring-no-properties instead of + unavailable. Use substring-no-properties instead of set-text-properties to remove text properties from the clipboard value. * lisp/org-clock.el (org-update-mode-line): Support limiting the modeline clock string, and display the full todo value in the - tooltip. Set a local keymap so mouse-3 on the clock string goes to + tooltip. Set a local keymap so mouse-3 on the clock string goes to the currently clocked task. (org-clock-string-limit): Add a custom value for the maximum length of the clock string in the modeline.
--- a/lisp/org/org-agenda.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-agenda.el Wed Sep 23 23:55:26 2009 +0000 @@ -1592,7 +1592,7 @@ that have been changed along." (interactive) (or org-agenda-allow-remote-undo - (error "Check the variable `org-agenda-allow-remote-undo' to activate remote undo.")) + (error "Check the variable `org-agenda-allow-remote-undo' to activate remote undo")) (if (not (eq this-command last-command)) (setq org-agenda-undo-has-started-in nil org-agenda-pending-undo-list org-agenda-undo-list)) @@ -2387,7 +2387,7 @@ (defun org-check-for-org-mode () "Make sure current buffer is in org-mode. Error if not." (or (org-mode-p) - (error "Cannot execute org-mode agenda command on buffer in %s." + (error "Cannot execute org-mode agenda command on buffer in %s" major-mode))) (defun org-fit-agenda-window () @@ -2487,7 +2487,7 @@ (org-agenda-mark-clocking-task) (when org-agenda-entry-text-mode (org-agenda-entry-text-hide) - (org-agenda-entry-text-show)) + (org-agenda-entry-text-show)) (run-hooks 'org-finalize-agenda-hook) (setq org-agenda-type (get-text-property (point) 'org-agenda-type)) (when (get 'org-agenda-filter :preset-filter)
--- a/lisp/org/org-attach.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-attach.el Wed Sep 23 23:55:26 2009 +0000 @@ -217,7 +217,7 @@ (or (and dir (file-name-absolute-p dir)) (file-name-absolute-p org-attach-directory) (buffer-file-name (buffer-base-buffer)) - (error "Need absolute `org-attach-directory' to attach in buffers without filename."))) + (error "Need absolute `org-attach-directory' to attach in buffers without filename"))) (defun org-attach-set-directory () "Set the ATTACH_DIR property of the current entry.
--- a/lisp/org/org-docbook.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-docbook.el Wed Sep 23 23:55:26 2009 +0000 @@ -387,7 +387,7 @@ (org-set-local 'buffer-file-name (with-current-buffer (buffer-base-buffer) buffer-file-name)) - (error "Need a file name to be able to export."))) + (error "Need a file name to be able to export"))) (message "Exporting...") (setq-default org-todo-line-regexp org-todo-line-regexp)
--- a/lisp/org/org-html.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-html.el Wed Sep 23 23:55:26 2009 +0000 @@ -544,7 +544,7 @@ (org-set-local 'buffer-file-name (with-current-buffer (buffer-base-buffer) buffer-file-name)) - (error "Need a file name to be able to export."))) + (error "Need a file name to be able to export"))) (message "Exporting...") (setq-default org-todo-line-regexp org-todo-line-regexp)
--- a/lisp/org/org-id.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-id.el Wed Sep 23 23:55:26 2009 +0000 @@ -390,7 +390,7 @@ When CHECK is given, prepare detailed information about duplicate IDs." (interactive) (if (not org-id-track-globally) - (error "Please turn on `org-id-track-globally' if you want to track IDs.") + (error "Please turn on `org-id-track-globally' if you want to track IDs") (let ((files (or files (append
--- a/lisp/org/org-table.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org-table.el Wed Sep 23 23:55:26 2009 +0000 @@ -2993,7 +2993,7 @@ (call-interactively 'lisp-indent-line)) ((looking-at "[$&@0-9a-zA-Z]+ *= *[^ \t\n']") (goto-char pos)) ((not (fboundp 'pp-buffer)) - (error "Cannot pretty-print. Command `pp-buffer' is not available.")) + (error "Cannot pretty-print. Command `pp-buffer' is not available")) ((looking-at "[$&@0-9a-zA-Z]+ *= *'(") (goto-char (- (match-end 0) 2)) (setq beg (point)) @@ -3783,7 +3783,7 @@ (org-table-end))) (ntbl 0)) (unless dests (if maybe (throw 'exit nil) - (error "Don't know how to transform this table."))) + (error "Don't know how to transform this table"))) (dolist (dest dests) (let* ((name (plist-get dest :name)) (transform (plist-get dest :transform))
--- a/lisp/org/org.el Wed Sep 23 23:22:13 2009 +0000 +++ b/lisp/org/org.el Wed Sep 23 23:55:26 2009 +0000 @@ -5661,7 +5661,7 @@ (switch-to-buffer ibuf)) ((eq org-indirect-buffer-display 'other-window) (pop-to-buffer ibuf)) - (t (error "Invalid value."))) + (t (error "Invalid value"))) (if (featurep 'xemacs) (save-excursion (org-mode) (turn-on-font-lock))) (narrow-to-region beg end) @@ -6073,7 +6073,7 @@ ;; First check if there are no even levels (when (re-search-forward "^\\(\\*\\*\\)+ " nil t) (org-show-context t) - (error "Not all levels are odd in this file. Conversion not possible.")) + (error "Not all levels are odd in this file. Conversion not possible")) (when (yes-or-no-p "Are you sure you want to globally change levels to odd-even? ") (let ((org-odd-levels-only nil) n) (save-excursion @@ -7889,7 +7889,7 @@ (cond ((and (org-on-heading-p) (not (org-in-regexp - (concat org-plain-link-re "\\|" + (concat org-plain-link-re "\\|" org-bracket-link-regexp "\\|" org-angle-link-re "\\|" "[ \t]:[^ \t\n]+:[ \t]*$")))) @@ -7958,12 +7958,12 @@ ;; Check if we need to translate the link (let ((tmp (funcall org-link-translation-function type path))) (setq type (car tmp) path (cdr tmp)))) - + (cond - + ((assoc type org-link-protocols) (funcall (nth 1 (assoc type org-link-protocols)) path)) - + ((equal type "mailto") (let ((cmd (car org-link-mailto-program)) (args (cdr org-link-mailto-program)) args1 @@ -7981,14 +7981,14 @@ (setq a (replace-match subject t t a))) (push a args1)))) (apply cmd (nreverse args1)))) - + ((member type '("http" "https" "ftp" "news")) (browse-url (concat type ":" (org-link-escape path org-link-escape-chars-browser)))) - + ((member type '("message")) (browse-url (concat type ":" path))) - + ((string= type "tags") (org-tags-view in-emacs path)) ((string= type "thisfile") @@ -8004,10 +8004,10 @@ ,pos))) (condition-case nil (eval cmd) (error (progn (widen) (eval cmd)))))) - + ((string= type "tree-match") (org-occur (concat "\\[" (regexp-quote path) "\\]"))) - + ((string= type "file") (if (string-match "::\\([0-9]+\\)\\'" path) (setq line (string-to-number (match-string 1 path)) @@ -8018,11 +8018,11 @@ (if (string-match "[*?{]" (file-name-nondirectory path)) (dired path) (org-open-file path in-emacs line search))) - + ((string= type "news") (require 'org-gnus) (org-gnus-follow-link path)) - + ((string= type "shell") (let ((cmd path)) (if (or (not org-confirm-shell-link-function) @@ -8034,7 +8034,7 @@ (message "Executing %s" cmd) (shell-command cmd)) (error "Abort")))) - + ((string= type "elisp") (let ((cmd path)) (if (or (not org-confirm-elisp-link-function) @@ -8047,7 +8047,7 @@ (eval (read cmd)) (call-interactively (read cmd)))) (error "Abort")))) - + (t (browse-url-at-point)))))) (move-marker org-open-link-marker nil) @@ -8837,7 +8837,7 @@ (setq answ (funcall cfunc prompt tbl nil (not new-nodes) nil 'org-refile-history)) (setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl))) - (if pa + (if pa (progn (when (or (not org-refile-history) (not (eq old-hist org-refile-history)) @@ -8889,7 +8889,7 @@ "Read an outline path like a file name." (let ((thetable collection) (org-completion-use-ido nil) ; does not work with ido. - (org-completion-use-iswitchb nil)) ; or iswitchb + (org-completion-use-iswitchb nil)) ; or iswitchb (apply 'org-icompleting-read prompt (lambda (string predicate &optional flag) @@ -9687,7 +9687,7 @@ (error "No data for statistics cookie")))) (goto-char pos) (move-marker pos nil))))) - + (defvar org-entry-property-inherited-from) ;; defined below (defun org-update-parent-todo-statistics () "Update any statistics cookie in the parent of the current headline. @@ -14589,8 +14589,8 @@ (defun org-shiftselect-error () "Throw an error because Shift-Cursor command was applied in wrong context." (if (and (boundp 'shift-select-mode) shift-select-mode) - (error "To use shift-selection with Org-mode, customize `org-support-shift-select'.") - (error "This command works only in special context like headlines or timestamps."))) + (error "To use shift-selection with Org-mode, customize `org-support-shift-select'") + (error "This command works only in special context like headlines or timestamps"))) (defun org-call-for-shift-select (cmd) (let ((this-command-keys-shift-translated t)) @@ -15029,7 +15029,7 @@ (let ((org-inhibit-startup t)) (org-mode-restart)) (message "Local setup has been refreshed")))) ((org-clock-update-time-maybe)) - (t (error "C-c C-c can do nothing useful at this location."))))) + (t (error "C-c C-c can do nothing useful at this location"))))) (defun org-mode-restart () "Restart Org-mode, to scan again for special lines.