[git] gnupg-doc - branch, master, updated. 25d26636a349ade08fbdcd49e43d932f6d3cd421

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  25d26636a349ade08fbdcd49e43d932f6d3cd421 (commit)
      from  8fb348cca439d2bd1e6de497bada167dded7a1ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25d26636a349ade08fbdcd49e43d932f6d3cd421
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 17 16:47:28 2017 +0100

    web: Prepare gpgweb.el for emacs24 and use with webbuilder

diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index fb62267..920df25 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -1,6 +1,7 @@
 ;;; gpgweb.el --- elisp helper code for the GnuPG web pages
 
-(require 'org-exp)
+(if (< (string-to-number emacs-version) 24)
+    (require 'org-exp))
 
 ;; makeindex disabled because the generated file is created in the
 ;; source directory.
@@ -296,7 +297,7 @@ HTMLFILE is HTML file name and COMMITTED-AT is the commit date
 string of the source file or nil if not available."
   (let ((srcfile (concat "https://git.gnupg.org/cgi-bin/gitweb.cgi?"
                          "p=gnupg-doc.git;a=blob;f="
-                         (if blogmode "misc/blog.gnupg.org" "web")
+                         (if blogmode "misc/blog.gnupg.org/" "web/")
                          ;; The replace below is a hack to cope with
                          ;; blogmode where HTMLFILE is like "./foo.html".
                          (replace-regexp-in-string
@@ -364,7 +365,7 @@ string of the source file or nil if not available."
     (prog1 (with-current-buffer work-buffer
              (let ((fname (file-name-nondirectory htmlfile))
                    (fname-2 (replace-regexp-in-string
-                              ".*/gpgweb-stage\\(/.*\\)$" "\\1" htmlfile t))
+                              ".*/gpgweb-stage/\\(.*\\)$" "\\1" htmlfile t))
                    (title (org-publish-find-title orgfile)))
                ;; Insert header, menu, and footer.
                (gpgweb-insert-header title committed-at)

-----------------------------------------------------------------------

Summary of changes:
 web/share/gpgweb.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org