Update 020_debian.patch to 2015-05-09

1 files changed, 103 insertions, 57 deletions

diff --git a/debian/patches/020_debian.patch b/debian/patches/020_debian.patch
index 135efba..d1deb5e 100644
--- a/debian/patches/020_debian.patch
+++ b/debian/patches/020_debian.patch
@@ -2,10 +2,37 @@ Description: Git master branch of Debian's w3m
 Origin: http://anonscm.debian.org/cgit/collab-maint/w3m.git
 
 diff --git a/ChangeLog b/ChangeLog
-index 88358ef..55418f3 100644
+index 88358ef..a188506 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,615 @@
+@@ -1,3 +1,642 @@
++2015-05-09  Tatsuya Kinoshita  <tats@debian.org>
++
++	* doc-jp/README.siteconf, doc/README.siteconf:
++	Update examples of siteconf for twitter.com.
++
++2015-05-03  Tatsuya Kinoshita  <tats@debian.org>
++
++	* main.c: Correct GC version confirmation.
++
++2015-05-02  yshl  <yshl@takechiyo.net>
++
++	* main.c: Correct GC version confirmation.
++
++2015-04-29  Markus Hiereth  <post@hiereth.de>
++
++	* po/de.po: Update German translation.
++	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783383
++
++2015-04-29  Tatsuya Kinoshita  <tats@debian.org>
++
++	* po/Makevars, po/de.po, po/ja.po, po/w3m.pot, rc.c:
++	Update PO strings for display_borders.
++
++2015-04-26  yshl  <yshl@takechiyo.net>
++
++	* main.c: Use GC_oom_fn instead of GC_set_oom_fn for gc-7.1.
++
 +2015-02-03  Tatsuya Kinoshita  <tats@debian.org>
 +
 +	* po/de.po, po/ja.po, po/w3m.pot: Update PO.
@@ -4024,7 +4051,7 @@ index 4aedfde..670ed5f 100644
      ssl_key_file ファイル名
 diff --git a/doc-jp/README.siteconf b/doc-jp/README.siteconf
 new file mode 100644
-index 0000000..58b51c7
+index 0000000..90066f7
 --- /dev/null
 +++ b/doc-jp/README.siteconf
 @@ -0,0 +1,60 @@
@@ -4049,8 +4076,8 @@ index 0000000..58b51c7
 +
 +===== 例 =====
 +
-+url "http://twitter.com/#!/"
-+substitute_url "http://mobile.twitter.com/"
++url "https://twitter.com/"
++substitute_url "https://mobile.twitter.com/"
 +
 +twitter.com をモバイルサイトに転送します。
 +
@@ -4268,7 +4295,7 @@ index c064d76..da5408b 100644
        CP1250, CP1251, CP1252, CP1253, CP1254, CP1255, CP1256, CP1257
 diff --git a/doc/README.siteconf b/doc/README.siteconf
 new file mode 100644
-index 0000000..f173087
+index 0000000..39b1028
 --- /dev/null
 +++ b/doc/README.siteconf
 @@ -0,0 +1,60 @@
@@ -4292,8 +4319,8 @@ index 0000000..f173087
 +
 +===== Examples =====
 +
-+url "http://twitter.com/#!/"
-+substitute_url "http://mobile.twitter.com/"
++url "https://twitter.com/"
++substitute_url "https://mobile.twitter.com/"
 +
 +This forwards the twitter.com to its mobile site.
 +
@@ -7917,7 +7944,7 @@ index f5a73a2..9428319 100644
      return NULL;
  #endif
 diff --git a/main.c b/main.c
-index b421943..d37b243 100644
+index b421943..9cac333 100644
 --- a/main.c
 +++ b/main.c
 @@ -11,6 +11,9 @@
@@ -7978,7 +8005,7 @@ index b421943..d37b243 100644
  int
  main(int argc, char **argv, char **envp)
  {
-@@ -397,7 +415,11 @@ main(int argc, char **argv, char **envp)
+@@ -397,7 +415,15 @@ main(int argc, char **argv, char **envp)
      wc_ces CodePage;
  #endif
  #endif
@@ -7986,11 +8013,15 @@ index b421943..d37b243 100644
 +    char **getimage_args = NULL;
 +#endif /* defined(DONT_CALL_GC_AFTER_FORK) && defined(USE_IMAGE) */
      GC_INIT();
++#if (GC_VERSION_MAJOR>7) || ((GC_VERSION_MAJOR==7) && (GC_VERSION_MINOR>=2))
 +    GC_set_oom_fn(die_oom);
++#else
++    GC_oom_fn = die_oom;
++#endif
  #if defined(ENABLE_NLS) || (defined(USE_M17N) && defined(HAVE_LANGINFO_CODESET))
      setlocale(LC_ALL, "");
  #endif
-@@ -418,6 +440,10 @@ main(int argc, char **argv, char **envp)
+@@ -418,6 +444,10 @@ main(int argc, char **argv, char **envp)
  
      CurrentDir = currentdir();
      CurrentPid = (int)getpid();
@@ -8001,7 +8032,7 @@ index b421943..d37b243 100644
      BookmarkFile = NULL;
      config_file = NULL;
  
-@@ -530,12 +556,14 @@ main(int argc, char **argv, char **envp)
+@@ -530,12 +560,14 @@ main(int argc, char **argv, char **envp)
  		    PagerMax = atoi(argv[i]);
  	    }
  #ifdef USE_M17N
@@ -8016,7 +8047,7 @@ index b421943..d37b243 100644
  	    else if (!strncmp("-I", argv[i], 2)) {
  		if (argv[i][2] != '\0')
  		    p = argv[i] + 2;
-@@ -660,6 +688,12 @@ main(int argc, char **argv, char **envp)
+@@ -660,6 +692,12 @@ main(int argc, char **argv, char **envp)
  		}
  	    }
  #endif
@@ -8029,7 +8060,7 @@ index b421943..d37b243 100644
  	    else if (!strcmp("-num", argv[i]))
  		showLineNum = TRUE;
  	    else if (!strcmp("-no-proxy", argv[i]))
-@@ -703,7 +737,11 @@ main(int argc, char **argv, char **envp)
+@@ -703,7 +741,11 @@ main(int argc, char **argv, char **envp)
  		accept_cookie = TRUE;
  	    }
  #endif				/* USE_COOKIE */
@@ -8041,7 +8072,7 @@ index b421943..d37b243 100644
  		squeezeBlankLine = TRUE;
  	    else if (!strcmp("-X", argv[i]))
  		Do_not_use_ti_te = TRUE;
-@@ -735,6 +773,15 @@ main(int argc, char **argv, char **envp)
+@@ -735,6 +777,15 @@ main(int argc, char **argv, char **envp)
  	    else if (!strcmp("-reqlog",argv[i])) {
  		w3m_reqlog=rcFile("request.log");
  	    }
@@ -8057,7 +8088,7 @@ index b421943..d37b243 100644
  	    else {
  		usage();
  	    }
-@@ -823,6 +870,30 @@ main(int argc, char **argv, char **envp)
+@@ -823,6 +874,30 @@ main(int argc, char **argv, char **envp)
  
      if (w3m_backend)
  	backend();
@@ -8088,11 +8119,11 @@ index b421943..d37b243 100644
  
      if (w3m_dump)
  	mySignal(SIGINT, SIG_IGN);
-@@ -833,7 +904,12 @@ main(int argc, char **argv, char **envp)
+@@ -833,7 +908,12 @@ main(int argc, char **argv, char **envp)
      mySignal(SIGPIPE, SigPipe);
  #endif
  
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++#if (GC_VERSION_MAJOR>7) || ((GC_VERSION_MAJOR==7) && (GC_VERSION_MINOR>=2))
 +    orig_GC_warn_proc = GC_get_warn_proc();
 +    GC_set_warn_proc(wrap_GC_warn_proc);
 +#else
@@ -8101,7 +8132,7 @@ index b421943..d37b243 100644
      err_msg = Strnew();
      if (load_argc == 0) {
  	/* no URL specified */
-@@ -894,12 +970,17 @@ main(int argc, char **argv, char **envp)
+@@ -894,12 +974,17 @@ main(int argc, char **argv, char **envp)
  	if (i >= 0) {
  	    SearchHeader = search_header;
  	    DefaultType = default_type;
@@ -8122,7 +8153,7 @@ index b421943..d37b243 100644
  	    }
  	    else {
  		if (post_file && i == 0) {
-@@ -928,9 +1009,7 @@ main(int argc, char **argv, char **envp)
+@@ -928,9 +1013,7 @@ main(int argc, char **argv, char **envp)
  		else {
  		    request = NULL;
  		}
@@ -8133,7 +8164,7 @@ index b421943..d37b243 100644
  	    }
  	    if (newbuf == NULL) {
  		/* FIXME: gettextize? */
-@@ -945,7 +1024,7 @@ main(int argc, char **argv, char **envp)
+@@ -945,7 +1028,7 @@ main(int argc, char **argv, char **envp)
  		break;
  	    case SCM_LOCAL:
  	    case SCM_LOCAL_CGI:
@@ -8142,7 +8173,7 @@ index b421943..d37b243 100644
  	    default:
  		pushHashHist(URLHist, parsedURL2Str(&newbuf->currentURL)->ptr);
  		break;
-@@ -1246,6 +1325,12 @@ dump_extra(Buffer *buf)
+@@ -1246,6 +1329,12 @@ dump_extra(Buffer *buf)
  #endif
  }
  
@@ -8155,7 +8186,7 @@ index b421943..d37b243 100644
  static void
  do_dump(Buffer *buf)
  {
-@@ -1266,18 +1351,20 @@ do_dump(Buffer *buf)
+@@ -1266,18 +1355,20 @@ do_dump(Buffer *buf)
  	int i;
  	saveBuffer(buf, stdout, FALSE);
  	if (displayLinkNumber && buf->href) {
@@ -8186,7 +8217,7 @@ index b421943..d37b243 100644
  	    }
  	}
      }
-@@ -1566,6 +1653,18 @@ DEFUN(pgBack, PREV_PAGE, "Move to previous page")
+@@ -1566,6 +1657,18 @@ DEFUN(pgBack, PREV_PAGE, "Move to previous page")
  		  * (Currentbuf->LINES - 1)), prec_num ? B_SCROLL : B_NORMAL);
  }
  
@@ -8205,7 +8236,7 @@ index b421943..d37b243 100644
  /* 1 line up */
  DEFUN(lup1, UP, "Scroll up one line")
  {
-@@ -1844,6 +1943,10 @@ srch_nxtprv(int reverse)
+@@ -1844,6 +1947,10 @@ srch_nxtprv(int reverse)
      result = srchcore(SearchString, routine[reverse]);
      if (result & SR_FOUND)
  	clear_mark(Currentbuf->currentLine);
@@ -8216,7 +8247,7 @@ index b421943..d37b243 100644
      displayBuffer(Currentbuf, B_NORMAL);
      disp_srchresult(result, (reverse ? "Backward: " : "Forward: "),
  		    SearchString);
-@@ -2261,7 +2364,7 @@ DEFUN(movR1, MOVE_RIGHT1,
+@@ -2261,7 +2368,7 @@ DEFUN(movR1, MOVE_RIGHT1,
  static wc_uint32
  getChar(char *p)
  {
@@ -8225,7 +8256,7 @@ index b421943..d37b243 100644
  }
  
  static int
-@@ -2804,12 +2907,15 @@ loadLink(char *url, char *target, char *referer, FormList *request)
+@@ -2804,12 +2911,15 @@ loadLink(char *url, char *target, char *referer, FormList *request)
      union frameset_element *f_element = NULL;
      int flag = 0;
      ParsedURL *base, pu;
@@ -8242,7 +8273,7 @@ index b421943..d37b243 100644
  	base->scheme == SCM_LOCAL || base->scheme == SCM_LOCAL_CGI)
  	referer = NO_REFERER;
      if (referer == NULL)
-@@ -3568,6 +3674,33 @@ DEFUN(lastA, LINK_END, "Go to the last link")
+@@ -3568,6 +3678,33 @@ DEFUN(lastA, LINK_END, "Go to the last link")
      displayBuffer(Currentbuf, B_NORMAL);
  }
  
@@ -8276,7 +8307,7 @@ index b421943..d37b243 100644
  /* go to the next anchor */
  DEFUN(nextA, NEXT_LINK, "Move to next link")
  {
-@@ -4055,6 +4188,7 @@ goURL0(char *prompt, int relative)
+@@ -4055,6 +4192,7 @@ goURL0(char *prompt, int relative)
      char *url, *referer;
      ParsedURL p_url, *current;
      Buffer *cur_buf = Currentbuf;
@@ -8284,7 +8315,7 @@ index b421943..d37b243 100644
  
      url = searchKeyData();
      if (url == NULL) {
-@@ -4064,11 +4198,8 @@ goURL0(char *prompt, int relative)
+@@ -4064,11 +4202,8 @@ goURL0(char *prompt, int relative)
  	current = baseURL(Currentbuf);
  	if (current) {
  	    char *c_url = parsedURL2Str(current)->ptr;
@@ -8298,7 +8329,7 @@ index b421943..d37b243 100644
  	    else
  		pushHist(hist, c_url);
  	}
-@@ -4077,11 +4208,8 @@ goURL0(char *prompt, int relative)
+@@ -4077,11 +4212,8 @@ goURL0(char *prompt, int relative)
  	    char *a_url;
  	    parseURL2(a->url, &p_url, current);
  	    a_url = parsedURL2Str(&p_url)->ptr;
@@ -8312,7 +8343,7 @@ index b421943..d37b243 100644
  	    else
  		pushHist(hist, a_url);
  	}
-@@ -4089,15 +4217,22 @@ goURL0(char *prompt, int relative)
+@@ -4089,15 +4221,22 @@ goURL0(char *prompt, int relative)
  	if (url != NULL)
  	    SKIP_BLANKS(url);
      }
@@ -8342,7 +8373,7 @@ index b421943..d37b243 100644
      if (url == NULL || *url == '\0') {
  	displayBuffer(Currentbuf, B_FORCE_REDRAW);
  	return;
-@@ -4106,14 +4241,6 @@ goURL0(char *prompt, int relative)
+@@ -4106,14 +4245,6 @@ goURL0(char *prompt, int relative)
  	gotoLabel(url + 1);
  	return;
      }
@@ -8357,7 +8388,7 @@ index b421943..d37b243 100644
      parseURL2(url, &p_url, current);
      pushHashHist(URLHist, parsedURL2Str(&p_url)->ptr);
      cmd_loadURL(url, current, referer, NULL);
-@@ -4510,8 +4637,7 @@ _peekURL(int only_img)
+@@ -4510,8 +4641,7 @@ _peekURL(int only_img)
  	s = parsedURL2Str(&pu);
      }
      if (DecodeURL)
@@ -8367,7 +8398,7 @@ index b421943..d37b243 100644
  #ifdef USE_M17N
      s = checkType(s, &pp, NULL);
      p = NewAtom_N(Lineprop, s->length);
-@@ -4570,7 +4696,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
+@@ -4570,7 +4700,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
  	offset = 0;
  	s = currentURL();
  	if (DecodeURL)
@@ -8376,7 +8407,7 @@ index b421943..d37b243 100644
  #ifdef USE_M17N
  	s = checkType(s, &pp, NULL);
  	p = NewAtom_N(Lineprop, s->length);
-@@ -5398,6 +5524,58 @@ DEFUN(mouse, MOUSE, "mouse operation")
+@@ -5398,6 +5528,58 @@ DEFUN(mouse, MOUSE, "mouse operation")
      process_mouse(btn, x, y);
  }
  
@@ -8435,7 +8466,7 @@ index b421943..d37b243 100644
  #ifdef USE_GPM
  int
  gpm_process_mouse(Gpm_Event * event, void *data)
-@@ -5604,7 +5782,7 @@ execdict(char *word)
+@@ -5604,7 +5786,7 @@ execdict(char *word)
  	disp_message("Execution failed", TRUE);
  	return;
      }
@@ -8444,7 +8475,7 @@ index b421943..d37b243 100644
  	buf->filename = w;
  	buf->buffername = Sprintf("%s %s", DICTBUFFERNAME, word)->ptr;
  	if (buf->type == NULL)
-@@ -5671,7 +5849,7 @@ set_buffer_environ(Buffer *buf)
+@@ -5671,7 +5853,7 @@ set_buffer_environ(Buffer *buf)
  	    set_environ("W3M_CURRENT_FORM", form2str((FormItemList *)a->url));
  	else
  	    set_environ("W3M_CURRENT_FORM", "");
@@ -8453,7 +8484,7 @@ index b421943..d37b243 100644
  						l->real_linenumber)->ptr);
  	set_environ("W3M_CURRENT_COLUMN", Sprintf("%d",
  						  buf->currentColumn +
-@@ -5747,8 +5925,14 @@ deleteFiles()
+@@ -5747,8 +5929,14 @@ deleteFiles()
  	    Firstbuf = buf;
  	}
      }
@@ -8786,9 +8817,22 @@ index 1489115..ade7ca2 100644
  # Set of available languages.
 -ja
 +ja de
+diff --git a/po/Makevars b/po/Makevars
+index 2f57810..a60a09d 100644
+--- a/po/Makevars
++++ b/po/Makevars
+@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --from-code=EUC-JP --keyword=_ --keyword=N_
+ # or entity, or to disclaim their copyright.  The empty string stands for
+ # the public domain; in this case the translators are expected to disclaim
+ # their copyright.
+-COPYRIGHT_HOLDER = Fumitoshi UKAI
++COPYRIGHT_HOLDER = THE w3m'S COPYRIGHT HOLDER
+ 
+ # This is the email address or URL to which the translators shall report
+ # bugs in the untranslated strings:
 diff --git a/po/de.po b/po/de.po
 new file mode 100644
-index 0000000..eba6658
+index 0000000..19a3d3a
 --- /dev/null
 +++ b/po/de.po
 @@ -0,0 +1,914 @@
@@ -8800,9 +8844,9 @@ index 0000000..eba6658
 +msgstr ""
 +"Project-Id-Version: w3m 0.5.3\n"
 +"Report-Msgid-Bugs-To: satodai@w3m.jp\n"
-+"POT-Creation-Date: 2015-02-02 23:45+0900\n"
-+"PO-Revision-Date: 2014-10-19 11:15+0200\n"
-+"Last-Translator: Markus Hiereth <markus.hiereth@freenet.de>\n"
++"POT-Creation-Date: 2015-04-29 16:18+0900\n"
++"PO-Revision-Date: 2015-04-29 09:45+0200\n"
++"Last-Translator: Markus Hiereth <post@hiereth.de>\n"
 +"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 +"Language: de\n"
 +"MIME-Version: 1.0\n"
@@ -9003,8 +9047,8 @@ index 0000000..eba6658
 +msgstr "Zeichen zum Einrahmen von Tabellen und Men端s"
 +
 +#: rc.c:93
-+msgid "Display 0 pixel table borders"
-+msgstr ""
++msgid "Display table borders, ignore value of BORDER"
++msgstr "Zeige Tabellen gerahmt, BORDER-Wert ignorieren"
 +
 +#: rc.c:94
 +msgid "Fold lines in TEXTAREA"
@@ -9214,7 +9258,7 @@ index 0000000..eba6658
 +
 +#: rc.c:152
 +msgid "File for preferences for each site"
-+msgstr ""
++msgstr "Datei mit adress-spezifischen Voreinstellungen"
 +
 +#: rc.c:153
 +msgid "Password for anonymous FTP (your mail address)"
@@ -9707,7 +9751,7 @@ index 0000000..eba6658
 +msgid "en;q=1.0"
 +msgstr "de;q=1.0, en;q=0.5"
 diff --git a/po/ja.po b/po/ja.po
-index d67c695..f78556d 100644
+index d67c695..ef079e4 100644
 --- a/po/ja.po
 +++ b/po/ja.po
 @@ -1,6 +1,6 @@
@@ -9723,9 +9767,11 @@ index d67c695..f78556d 100644
  "Project-Id-Version: w3m 0.5.3\n"
  "Report-Msgid-Bugs-To: satodai@w3m.jp\n"
 -"POT-Creation-Date: 2010-08-20 18:44+0900\n"
-+"POT-Creation-Date: 2015-02-02 23:45+0900\n"
- "PO-Revision-Date: 2010-08-20 18:45+0900\n"
- "Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n"
+-"PO-Revision-Date: 2010-08-20 18:45+0900\n"
+-"Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n"
++"POT-Creation-Date: 2015-04-29 16:18+0900\n"
++"PO-Revision-Date: 2015-04-29 16:38+0900\n"
++"Last-Translator: Tatsuya Kinoshita <tats@debian.org>\n"
  "Language-Team: Japanese\n"
 -"Language: \n"
 +"Language: ja\n"
@@ -9883,8 +9929,8 @@ index d67c695..f78556d 100644
  
 -#: rc.c:91
 +#: rc.c:93
-+msgid "Display 0 pixel table borders"
-+msgstr "0��������祉����������若�����������茵�腓�"
++msgid "Display table borders, ignore value of BORDER"
++msgstr "BORDER �����ゃ����∴�������������若�����������茵�腓�"
 +
 +#: rc.c:94
  msgid "Fold lines in TEXTAREA"
@@ -10728,7 +10774,7 @@ index d67c695..f78556d 100644
  msgid "en;q=1.0"
  msgstr "ja;q=1.0, en;q=0.5"
 diff --git a/po/w3m.pot b/po/w3m.pot
-index e164b1e..d273a41 100644
+index e164b1e..b277bb9 100644
 --- a/po/w3m.pot
 +++ b/po/w3m.pot
 @@ -1,5 +1,5 @@
@@ -10743,7 +10789,7 @@ index e164b1e..d273a41 100644
  "Project-Id-Version: w3m 0.5.3\n"
  "Report-Msgid-Bugs-To: satodai@w3m.jp\n"
 -"POT-Creation-Date: 2010-08-20 18:44+0900\n"
-+"POT-Creation-Date: 2015-02-02 23:45+0900\n"
++"POT-Creation-Date: 2015-04-29 16:18+0900\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10898,7 +10944,7 @@ index e164b1e..d273a41 100644
  
 -#: rc.c:91
 +#: rc.c:93
-+msgid "Display 0 pixel table borders"
++msgid "Display table borders, ignore value of BORDER"
 +msgstr ""
 +
 +#: rc.c:94
@@ -11869,7 +11915,7 @@ index f8a7345..0d8beb5 100644
 -
 -#include "indep.h"
 diff --git a/rc.c b/rc.c
-index 8441a39..7b88368 100644
+index 8441a39..a839bb3 100644
 --- a/rc.c
 +++ b/rc.c
 @@ -9,7 +9,9 @@
@@ -11886,7 +11932,7 @@ index 8441a39..7b88368 100644
  #define CMT_MULTICOL     N_("Display file names in multi-column format")
  #define CMT_ALT_ENTITY   N_("Use ASCII equivalents to display entities")
  #define CMT_GRAPHIC_CHAR N_("Character type for border of table and menu")
-+#define CMT_DISP_BORDERS N_("Display 0 pixel table borders")
++#define CMT_DISP_BORDERS N_("Display table borders, ignore value of BORDER")
  #define CMT_FOLD_TEXTAREA N_("Fold lines in TEXTAREA")
  #define CMT_DISP_INS_DEL N_("Display INS, DEL, S and STRIKE element")
  #define CMT_COLOR        N_("Display with color")