Mercurial > octave
changeset 25282:ed0c2683a316
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 18 Apr 2018 15:19:57 -0400 |
parents | 607c59f16834 (current diff) 35115cc6183b (diff) |
children | 172d464b62ea |
files | |
diffstat | 3 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/languages/nl_NL.ts Wed Apr 18 09:22:02 2018 -0400 +++ b/libgui/languages/nl_NL.ts Wed Apr 18 15:19:57 2018 -0400 @@ -544,7 +544,7 @@ <message> <location line="+1"/> <source>global</source> - <translation>gobaal</translation> + <translation>globaal</translation> </message> <message> <location line="+1"/>
--- a/libinterp/op-kw-docs Wed Apr 18 09:22:02 2018 -0400 +++ b/libinterp/op-kw-docs Wed Apr 18 15:19:57 2018 -0400 @@ -650,14 +650,14 @@ @end example @seealso{switch} @end deftypefn -## FIXME: Can't have duplicate DOCSTRING entries. The function methods -## already has a docstring which overrides this keyword definition. -#methods -#@c libinterp/parse-tree/oct-parse.in.yy -#-*- texinfo -*- -#@deftypefn {} {} methods -#Begin a methods block in a classdef definition. -#@end deftypefn +@c ## FIXME: Can't have duplicate DOCSTRING entries. The function methods +@c ## already has a docstring which overrides this keyword definition. +@c #methods +@c #@c libinterp/parse-tree/oct-parse.in.yy +@c #-*- texinfo -*- +@c #@deftypefn {} {} methods +@c #Begin a methods block in a classdef definition. +@c #@end deftypefn otherwise @c libinterp/parse-tree/oct-parse.in.yy -*- texinfo -*-
--- a/liboctave/util/url-transfer.cc Wed Apr 18 09:22:02 2018 -0400 +++ b/liboctave/util/url-transfer.cc Wed Apr 18 15:19:57 2018 -0400 @@ -36,6 +36,7 @@ #include "dir-ops.h" #include "file-ops.h" #include "file-stat.h" +#include "oct-env.h" #include "unwind-prot.h" #include "url-transfer.h" @@ -323,6 +324,14 @@ init ("", "", std::cin, os); + std::string cainfo = sys::env::getenv ("CURLOPT_CAINFO"); + if (! cainfo.empty ()) + SETOPT (CURLOPT_CAINFO, cainfo.c_str ()); + + std::string capath = sys::env::getenv ("CURLOPT_CAPATH"); + if (! capath.empty ()) + SETOPT (CURLOPT_CAPATH, capath.c_str ()); + SETOPT (CURLOPT_NOBODY, 0); // Restore the default HTTP request method to GET after setting