[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-1-11-g5c947f2

Anton Gladky gladky.anton at gmail.com
Fri Mar 30 22:39:15 UTC 2012


The following commit has been merged in the master branch:
commit d70bc8f29466b4b0197bbc6a711f67afe34694fa
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 30 23:09:58 2012 +0200

    Enable history recording, better fix for segmentation fault.

diff --git a/debian/patches/07_fix_segm_fault.diff b/debian/patches/07_fix_segm_fault.diff
index 4d8f28f..6a3b42e 100644
--- a/debian/patches/07_fix_segm_fault.diff
+++ b/debian/patches/07_fix_segm_fault.diff
@@ -6,7 +6,7 @@ Last-Update: 2012-03-30
 
 --- a/src/command.c
 +++ b/src/command.c
-@@ -2688,9 +2688,10 @@
+@@ -2688,9 +2688,14 @@
  #  elif defined(HAVE_LIBEDITLINE)
  	    /* deleting history entries does not work, so suppress adjacent 
  	    duplicates only */
@@ -14,9 +14,13 @@ Last-Update: 2012-03-30
 -	    if (strcmp(current_history()->line, line) != 0)
 -		add_history(line);
 +      
-+	    if (previous_history() && strcmp(current_history()->line, line) != 0) {
-+        add_history(line);
-+      }
++	    int found;
++	    using_history();
++
++	    found = history_search(line, -1);
++	    if (found <= 0) {
++               add_history(line);
++            }
  #  else /* builtin readline */
  	    add_history(line);
  #  endif

-- 
Gnuplot. Interactive plotting program



More information about the debian-science-commits mailing list