mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Bastien Guerry 2012-09-28 17:47:53 +02:00
commit fe7f964b49
15 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/lisp/org-annotate-file.el
View File

@ -86,7 +86,7 @@ that appear after the value in `after' with '...'"
"Put a section for the current file into your annotation file"
(interactive)
(unless (buffer-file-name)
(error "This buffer has no associated file."))
(error "This buffer has no associated file"))
(org-annotate-file-show-section))
(defun org-annotate-file-show-section (&optional buffer)

2
contrib/lisp/org-contacts.el
View File

@ -609,7 +609,7 @@ Org-contacts does not specify how to encode the name. So we try to do our best."
"Show contacts on a map. Requires google-maps-el."
(interactive)
(unless (fboundp 'google-maps-static-show)
(error "org-contacts-show-map requires google-maps-el."))
(error "`org-contacts-show-map' requires `google-maps-el'"))
(google-maps-static-show
:markers
(loop

2
contrib/lisp/org-drill.el
View File

@ -1438,7 +1438,7 @@ visual overlay, or with the string TEXT if it is supplied."
(defun org-drill-hide-heading-at-point (&optional text)
(unless (org-at-heading-p)
(error "Point is not on a heading."))
(error "Point is not on a heading"))
(save-excursion
(let ((beg (point)))
(end-of-line)

4
contrib/lisp/org-e-odt.el
View File

@ -183,7 +183,7 @@ heuristically based on the values of `org-e-odt-lib-dir' and
org-e-odt-styles-dir-list)
nil)))
(unless styles-dir
(error "Error (org-e-odt): Cannot find factory styles files. Aborting."))
(error "Error (org-e-odt): Cannot find factory styles files, aborting"))
styles-dir)
"Directory that holds auxiliary XML files used by the ODT exporter.
@ -2059,7 +2059,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(cdr (assoc-string anchor-type
org-e-odt-default-image-sizes-alist))
;; Error out.
(error "Cannot determine Image size. Aborting ..."))))
(error "Cannot determine image size, aborting"))))
(width (car size)) (height (cdr size)))
(cond
(scale

4
lisp/ob-io.el
View File

@ -85,7 +85,7 @@ Emacs-lisp table, otherwise return the results as a string."
If RESULT-TYPE equals 'output then return standard output as a string.
If RESULT-TYPE equals 'value then return the value of the last statement
in BODY as elisp."
(when session (error "Sessions are not supported for Io. Yet."))
(when session (error "Sessions are not (yet) supported for Io"))
(case result-type
(output
(if (member "repl" result-params)
@ -107,7 +107,7 @@ in BODY as elisp."
(defun org-babel-prep-session:io (session params)
"Prepare SESSION according to the header arguments specified in PARAMS."
(error "Sessions are not supported for Io. Yet."))
(error "Sessions are not (yet) supported for Io"))
(defun org-babel-io-initiate-session (&optional session)
"If there is not a current inferior-process-buffer in SESSION

4
lisp/ob-perl.el
View File

@ -57,7 +57,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:perl (session params)
"Prepare SESSION according to the header arguments in PARAMS."
(error "Sessions are not supported for Perl."))
(error "Sessions are not supported for Perl"))
(defun org-babel-variable-assignments:perl (params)
"Return list of perl statements assigning the block's variables."
@ -101,7 +101,7 @@ print o join(\"\\n\", @r), \"\\n\"")
If RESULT-TYPE equals 'output then return a list of the outputs
of the statements in BODY, if RESULT-TYPE equals 'value then
return the value of the last statement in BODY, as elisp."
(when session (error "Sessions are not supported for Perl."))
(when session (error "Sessions are not supported for Perl"))
(case result-type
(output (org-babel-eval org-babel-perl-command body))
(value (let ((tmp-file (org-babel-temp-file "perl-")))

10
lisp/ob-python.el
View File

@ -44,7 +44,7 @@
(defvar org-babel-default-header-args:python '())
(defvar org-babel-python-command "python"
"Name of command for executing python code.")
"Name of command for executing Python code.")
(defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python)
"Preferred python mode for use in running python interactively.
@ -99,7 +99,7 @@ VARS contains resolved variable references"
;; helper functions
(defun org-babel-variable-assignments:python (params)
"Return list of python statements assigning the block's variables."
"Return a list of Python statements assigning the block's variables."
(mapcar
(lambda (pair)
(format "%s=%s"
@ -160,7 +160,7 @@ then create. Return the initialized session."
(py-shell)
(setq python-buffer (concat "*" bufname "*"))))
(t
(error "No function available for running an inferior python.")))
(error "No function available for running an inferior Python")))
(setq org-babel-python-buffers
(cons (cons session python-buffer)
(assq-delete-all session org-babel-python-buffers)))
@ -190,7 +190,7 @@ open('%s', 'w').write( pprint.pformat(main()) )")
(defun org-babel-python-evaluate
(session body &optional result-type result-params preamble)
"Evaluate BODY as python code."
"Evaluate BODY as Python code."
(if session
(org-babel-python-evaluate-session
session body result-type result-params)
@ -288,7 +288,7 @@ last statement in BODY, as elisp."
(org-babel-eval-read-file tmp-file)))))))
(defun org-babel-python-read-string (string)
"Strip 's from around python string."
"Strip 's from around Python string."
(if (string-match "^'\\([^\000]+\\)'$" string)
(match-string 1 string)
string))

4
lisp/ob-scala.el
View File

@ -84,7 +84,7 @@ Emacs-lisp table, otherwise return the results as a string."
If RESULT-TYPE equals 'output then return standard output as a string.
If RESULT-TYPE equals 'value then return the value of the last statement
in BODY as elisp."
(when session (error "Sessions are not supported for Scala. Yet."))
(when session (error "Sessions are not (yet) supported for Scala"))
(case result-type
(output
(let ((src-file (org-babel-temp-file "scala-")))
@ -105,7 +105,7 @@ in BODY as elisp."
(defun org-babel-prep-session:scala (session params)
"Prepare SESSION according to the header arguments specified in PARAMS."
(error "Sessions are not supported for Scala. Yet."))
(error "Sessions are not (yet) supported for Scala"))
(defun org-babel-scala-initiate-session (&optional session)
"If there is not a current inferior-process-buffer in SESSION

2
lisp/ob-sqlite.el
View File

@ -71,7 +71,7 @@ This function is called by `org-babel-execute-src-block'."
(list :header :echo :bail :column
:csv :html :line :list))))
exit-code)
(unless db (error "ob-sqlite: can't evaluate without a database."))
(unless db (error "ob-sqlite: can't evaluate without a database"))
(with-temp-buffer
(insert
(org-babel-eval

2
lisp/org-bibtex.el
View File

@ -628,7 +628,7 @@ This uses `bibtex-parse-entry'."
"Insert a heading built from the first element of `org-bibtex-entries'."
(interactive)
(when (= (length org-bibtex-entries) 0)
(error "No entries in `org-bibtex-entries'."))
(error "No entries in `org-bibtex-entries'"))
(let* ((entry (pop org-bibtex-entries))
(org-special-properties nil) ; avoids errors with `org-entry-put'
(val (lambda (field) (cdr (assoc field entry))))

5
lisp/org-clock.el
View File

@ -2025,9 +2025,8 @@ the returned times will be formatted strings."
((string-match "\\([-+][0-9]+\\)$" skey)
(setq shift (string-to-number (match-string 1 skey))
key (intern (substring skey 0 (match-beginning 1))))
(if(and (memq key '(quarter thisq)) (> shift 0))
(error "Looking forward with quarters isn't implemented.")
())))
(if (and (memq key '(quarter thisq)) (> shift 0))
(error "Looking forward with quarters isn't implemented"))))
(when (= shift 0)
(cond ((eq key 'yesterday) (setq key 'today shift -1))

2
lisp/org-colview.el
View File

@ -36,7 +36,7 @@
(declare-function org-clock-sum-today "org-clock" (&optional headline-filter))
(when (featurep 'xemacs)
(error "Do not load this file into XEmacs, use 'org-colview-xemacs.el'."))
(error "Do not load this file into XEmacs, use `org-colview-xemacs.el'"))
;;; Column View

2
lisp/org-gnus.el
View File

@ -213,7 +213,7 @@ If `org-store-link' was called with a prefix arg the meaning of
desc link
newsgroup xarchive) ; those are always nil for gcc
(and (not gcc)
(error "Can not create link: No Gcc header found."))
(error "Can not create link: No Gcc header found"))
(org-store-link-props :type "gnus" :from from :subject subject
:message-id id :group gcc :to to)
(setq desc (org-email-link-description)

4
lisp/org-odt.el
View File

@ -211,7 +211,7 @@ heuristically based on the values of `org-odt-lib-dir' and
org-odt-styles-dir-list)
nil)))
(unless styles-dir
(error "Error (org-odt): Cannot find factory styles files. Aborting."))
(error "Error (org-odt): Cannot find factory styles files, aborting"))
styles-dir)
"Directory that holds auxiliary XML files used by the ODT exporter.
@ -2076,7 +2076,7 @@ ATTR is a string of other attributes of the a element."
until size
do (setq size (org-odt-do-image-size
probe-method file dpi embed-as)))
(or size (error "Cannot determine Image size. Aborting ..."))
(or size (error "Cannot determine image size, aborting"))
(setq width (car size) height (cdr size)))
(cond
(scale

2
lisp/org-table.el
View File

@ -2191,7 +2191,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
(while (re-search-forward re2 (point-at-eol) t)
(unless (save-match-data (org-in-regexp "remote([^)]+?)"))
(if (equal (char-before (match-beginning 0)) ?.)
(error "Change makes TBLFM term %s invalid. Use undo to recover."
(error "Change makes TBLFM term %s invalid, use undo to recover"
(match-string 0))
(replace-match "")))))
(while (re-search-forward re (point-at-eol) t)