[git] gnupg-doc - branch, master, updated. b4b2626da5b628b5bbd9baf25dd2e667a68b2466

[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  b4b2626da5b628b5bbd9baf25dd2e667a68b2466 (commit)
      from  3f1715f771cd1b21b032846d7f1ea1666a14b1c7 (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 b4b2626da5b628b5bbd9baf25dd2e667a68b2466
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 21 18:47:57 2015 +0100

    web: Fix regression in blog menu
    
    This was introduced with the last change.

diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 036cf52..c11d27b 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -277,7 +277,12 @@ 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")
-                         (file-name-sans-extension htmlfile) ".org"))
+                         ;; The replace below is a hack to cope with
+                         ;; blogmode where HTMLFILE is like "./foo.html".
+                         (replace-regexp-in-string
+                          "^\\./" "/"
+                          (file-name-sans-extension htmlfile) t)
+                         ".org"))
         (changed (if (and committed-at (>= (length committed-at) 10))
                      (substring committed-at 0 10)
                      "[unknown]")))
@@ -330,13 +335,8 @@ string of the source file or nil if not available."
                         (concat "git log -1 --format='%ci' -- " orgfile))))
     (prog1 (with-current-buffer work-buffer
              (let ((fname (file-name-nondirectory htmlfile))
-                   ;; The first replace below is a hack to cope with
-                   ;; blog mode where HTMLFILE is like "./foo.html".
                    (fname-2 (replace-regexp-in-string
-                             "^\\./" "/"
-                             (replace-regexp-in-string
-                              ".*/stage\\(/.*\\)$" "\\1" htmlfile t)
-                             t))
+                              ".*/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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


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