diff options
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/textmodes/org-publish.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/reftex-parse.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/texinfmt.el | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb0d980e0b0..4c1132d0184 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ + +2007-12-06 D. Goel <deego3@gmail.com> + + + * textmodes/org-publish.el (org-publish-file): Fix buggy call(s) to `error'. + (org-publish-current-project): Ditto. + * textmodes/reftex-parse.el (reftex-short-context): Ditto. + (reftex-short-context): Ditto. + * textmodes/texinfmt.el: Ditto. + + + 2007-12-06 Stefan Monnier <monnier@iro.umontreal.ca> * doc-view.el (doc-view-dvi->pdf-sentinel) @@ -58,6 +70,7 @@ event of a verification failure. 2007-12-05 Reiner Steib <Reiner.Steib@gmx.de> +>>>>>>> 1.12380 * net/tls.el (tls-program): Provide more custom choices from `tls-checktrust'. Refer to `tls-checktrust' in doc string. diff --git a/lisp/textmodes/org-publish.el b/lisp/textmodes/org-publish.el index e98afaf4a6b..807a844c425 100644 --- a/lisp/textmodes/org-publish.el +++ b/lisp/textmodes/org-publish.el @@ -481,7 +481,7 @@ FILENAME is the filename of the file to be published." (plist (org-publish-get-plist-from-filename filename)) (publishing-function (or (plist-get plist :publishing-function) 'org-publish-org-to-html))) (if (not project-name) - (error (format "File %s is not part of any known project." filename))) + (error "File %s is not part of any known project." filename)) (when (org-publish-needed-p filename) (if (listp publishing-function) ;; allow chain of publishing functions @@ -575,7 +575,7 @@ With prefix argument, force publishing all files in project." (let* ((project-name (org-publish-get-project-from-filename (buffer-file-name))) (org-publish-use-timestamps-flag (if force nil t))) (if (not project-name) - (error (format "File %s is not part of any known project." (buffer-file-name)))) + (error "File %s is not part of any known project." (buffer-file-name))) (org-publish project-name)))) diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index b6b85b8f7d3..c6c4b33d053 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -544,7 +544,7 @@ of master file." (save-excursion (condition-case error-var (funcall parse env) - (error (format "HOOK ERROR: %s" (cdr error-var)))))) + (error "HOOK ERROR: %s" (cdr error-var))))) (t "INVALID VALUE OF PARSE")))) diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 55e7134f87e..812fcca06d6 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2061,9 +2061,8 @@ commands that are defined in texinfo.tex for printed output. (apply '+ texinfo-multitable-width-list)))) (if (> desired-columns fill-column) (error - (format - "Multi-column table width, %d chars, is greater than page width, %d chars." - desired-columns fill-column)))) + "Multi-column table width, %d chars, is greater than page width, %d chars." + desired-columns fill-column))) texinfo-multitable-width-list)) ;; @item A1 @tab A2 @tab A3 |