Merge branch 'ar/unlink-err' into maint

diff --git a/builtin-help.c b/builtin-help.c
index 9b57a746185719eb43c962c4adb96283657692e9..67dda3e6e63c9130a6f1e1c94cb35e519d765a95 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -114,7 +114,7 @@ static int check_emacsclient_version(void)
        return 0;
 }
 
-static void exec_woman_emacs(const char* path, const char *page)
+static void exec_woman_emacs(const char *path, const char *page)
 {
        if (!check_emacsclient_version()) {
                /* This works only with emacsclient version >= 22. */
@@ -128,7 +128,7 @@ static void exec_woman_emacs(const char* path, const char *page)
        }
 }
 
-static void exec_man_konqueror(const char* path, const char *page)
+static void exec_man_konqueror(const char *path, const char *page)
 {
        const char *display = getenv("DISPLAY");
        if (display && *display) {
@@ -156,7 +156,7 @@ static void exec_man_konqueror(const char* path, const char *page)
        }
 }
 
-static void exec_man_man(const char* path, const char *page)
+static void exec_man_man(const char *path, const char *page)
 {
        if (!path)
                path = "man";
@@ -236,7 +236,7 @@ static int add_man_viewer_info(const char *var, const char *value)
        const char *subkey = strrchr(name, '.');
 
        if (!subkey)
-               return error("Config with no key for man viewer: %s", name);
+               return 0;
 
        if (!strcmp(subkey, ".path")) {
                if (!value)
@@ -249,7 +249,6 @@ static int add_man_viewer_info(const char *var, const char *value)
                return add_man_viewer_cmd(name, subkey - name, value);
        }
 
-       warning("'%s': unsupported man viewer sub key.", subkey);
        return 0;
 }