Fossil SCM

(cherry-pick): Fix a problem with markdown rendering for "code".

jan.nijtmans 2017-07-28 19:41 UTC trunk
Commit dad3706248b945e20e66f7e650a2b920fd162039fe3985294220b0a2277b4ae6
Parent f7914bfdfacad19…
5 files changed +1 -1 +1 -1 +1 -1 +1 -1 +5 -3
~ Dockerfile ~ Dockerfile ~ VERSION ~ VERSION ~ src/markdown_html.c
M Dockerfile
+1 -1
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
55
66
 ### Now install some additional parts we will need for the build
77
 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "trunk", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION release
10
+ENV FOSSIL_INSTALL_VERSION branch-2.3
1111
1212
 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
1313
 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
1414
 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1515
 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
1616
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION release
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-2.3
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16
M Dockerfile
+1 -1
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
55
66
 ### Now install some additional parts we will need for the build
77
 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "trunk", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION release
10
+ENV FOSSIL_INSTALL_VERSION branch-2.3
1111
1212
 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
1313
 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
1414
 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1515
 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
1616
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION release
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16
--- Dockerfile
+++ Dockerfile
@@ -5,11 +5,11 @@
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-2.3
11
12 RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
13 RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14 RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
15 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16
M VERSION
+1 -1
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1
-2.3
1
+2.3.1
22
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 2.3
2
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 2.3.1
2
M VERSION
+1 -1
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1
-2.3
1
+2.3.1
22
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 2.3
2
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
1 2.3.1
2
M src/markdown_html.c
+5 -3
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -296,13 +296,15 @@
296296
 BLOB_APPEND_LITERAL(ob, "</a>");
297297
 return 1;
298298
 }
299299
300300
 static int html_code_span(struct Blob *ob, struct Blob *text, void *opaque){
301
- BLOB_APPEND_LITERAL(ob, "<code>");
302
- html_escape(ob, blob_buffer(text), blob_size(text));
303
- BLOB_APPEND_LITERAL(ob, "</code>");
301
+ if( text ){
302
+ BLOB_APPEND_LITERAL(ob, "<code>");
303
+ html_escape(ob, blob_buffer(text), blob_size(text));
304
+ BLOB_APPEND_LITERAL(ob, "</code>");
305
+ }
304306
 return 1;
305307
 }
306308
307309
 static int html_double_emphasis(
308310
 struct Blob *ob,
309311
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -296,13 +296,15 @@
296 BLOB_APPEND_LITERAL(ob, "</a>");
297 return 1;
298 }
299
300 static int html_code_span(struct Blob *ob, struct Blob *text, void *opaque){
301 BLOB_APPEND_LITERAL(ob, "<code>");
302 html_escape(ob, blob_buffer(text), blob_size(text));
303 BLOB_APPEND_LITERAL(ob, "</code>");
 
 
304 return 1;
305 }
306
307 static int html_double_emphasis(
308 struct Blob *ob,
309
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -296,13 +296,15 @@
296 BLOB_APPEND_LITERAL(ob, "</a>");
297 return 1;
298 }
299
300 static int html_code_span(struct Blob *ob, struct Blob *text, void *opaque){
301 if( text ){
302 BLOB_APPEND_LITERAL(ob, "<code>");
303 html_escape(ob, blob_buffer(text), blob_size(text));
304 BLOB_APPEND_LITERAL(ob, "</code>");
305 }
306 return 1;
307 }
308
309 static int html_double_emphasis(
310 struct Blob *ob,
311

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button