procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve cvs commit conflict. (Fix buggy calls to error.)

Browse source
This commit is contained in:
Deepak Goel 2007-12-06 17:25:03 +00:00
parent 23f3a1407c
commit 864da779a6
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -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> 2007-12-06 Stefan Monnier <monnier@iro.umontreal.ca>
* doc-view.el (doc-view-dvi->pdf-sentinel) * doc-view.el (doc-view-dvi->pdf-sentinel)
@ -58,6 +70,7 @@
event of a verification failure. event of a verification failure.
2007-12-05 Reiner Steib <Reiner.Steib@gmx.de> 2007-12-05 Reiner Steib <Reiner.Steib@gmx.de>
>>>>>>> 1.12380
* net/tls.el (tls-program): Provide more custom choices from * net/tls.el (tls-program): Provide more custom choices from
`tls-checktrust'. Refer to `tls-checktrust' in doc string. `tls-checktrust'. Refer to `tls-checktrust' in doc string.

4
lisp/textmodes/org-publish.el
View file

@ -481,7 +481,7 @@ FILENAME is the filename of the file to be published."
(plist (org-publish-get-plist-from-filename filename)) (plist (org-publish-get-plist-from-filename filename))
(publishing-function (or (plist-get plist :publishing-function) 'org-publish-org-to-html))) (publishing-function (or (plist-get plist :publishing-function) 'org-publish-org-to-html)))
(if (not project-name) (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) (when (org-publish-needed-p filename)
(if (listp publishing-function) (if (listp publishing-function)
;; allow chain of publishing functions ;; 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))) (let* ((project-name (org-publish-get-project-from-filename (buffer-file-name)))
(org-publish-use-timestamps-flag (if force nil t))) (org-publish-use-timestamps-flag (if force nil t)))
(if (not project-name) (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)))) (org-publish project-name))))

2
lisp/textmodes/reftex-parse.el
View file

@ -544,7 +544,7 @@ of master file."
(save-excursion (save-excursion
(condition-case error-var (condition-case error-var
(funcall parse env) (funcall parse env)
(error (format "HOOK ERROR: %s" (cdr error-var)))))) (error "HOOK ERROR: %s" (cdr error-var)))))
(t (t
"INVALID VALUE OF PARSE")))) "INVALID VALUE OF PARSE"))))

5
lisp/textmodes/texinfmt.el
View file

@ -2061,9 +2061,8 @@ commands that are defined in texinfo.tex for printed output.
(apply '+ texinfo-multitable-width-list)))) (apply '+ texinfo-multitable-width-list))))
(if (> desired-columns fill-column) (if (> desired-columns fill-column)
(error (error
(format "Multi-column table width, %d chars, is greater than page width, %d chars."
"Multi-column table width, %d chars, is greater than page width, %d chars." desired-columns fill-column)))
desired-columns fill-column))))
texinfo-multitable-width-list)) texinfo-multitable-width-list))
;; @item A1 @tab A2 @tab A3 ;; @item A1 @tab A2 @tab A3