[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-103-ga872350)
The branch, master has been updated
via a8723507d0f62c784289cd9785ef12e2c412da8a (commit)
via 0353fd0c7eab2d2c713a202e26a86d2002523f3e (commit)
via 2fd51c888dfeb536481b7cbfefe2484f4ddede33 (commit)
via e89ef317e6603e41f2fde56ec02cf98775e51b27 (commit)
via ec5a4822f2f30ff48f521ed62ad0b3fda1021faf (commit)
via edac96258eb6ff8888f05479de942f3e239da87c (commit)
via 4809fe081c03bd3a9468db4aa6ad7823c4717b0d (commit)
from 6bc584e027a6a4c7df5c87c03ac6cbcb0284db8b (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.
=========
Summary
=========
configure.ac | 3 ++
gnetlist/src/g_netlist.c | 4 +-
gschem/lib/system-gschemrc.scm | 6 ++--
gschem/scheme/auto-place-attribs.scm | 2 +
gschem/src/g_funcs.c | 2 +-
gschem/src/g_hook.c | 2 +-
gschem/src/g_keys.c | 2 +-
gschem/src/o_attrib.c | 2 +-
gschem/src/o_complex.c | 6 ++--
gschem/src/o_copy.c | 2 +-
gschem/src/o_misc.c | 8 ++--
gschem/src/o_move.c | 2 +-
gschem/src/o_pin.c | 2 +-
gschem/src/o_select.c | 11 +++---
gschem/src/x_menus.c | 8 ++--
gschem/src/x_window.c | 2 +-
libgeda/src/g_basic.c | 15 +++++++-
m4/geda-guile-display-error.m4 | 60 ++++++++++++++++++++++++++++++++++
18 files changed, 107 insertions(+), 32 deletions(-)
create mode 100644 m4/geda-guile-display-error.m4
=================
Commit Messages
=================
commit a8723507d0f62c784289cd9785ef12e2c412da8a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix error location information for scm_display_error().
:100644 100644 3bbd463... 2cfef97... M libgeda/src/g_basic.c
commit 0353fd0c7eab2d2c713a202e26a86d2002523f3e
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Add feature test for scm_display_error() arguments.
:100644 100644 bb6f33a... 29653a1... M configure.ac
:000000 100644 0000000... 05faa12... A m4/geda-guile-display-error.m4
commit 2fd51c888dfeb536481b7cbfefe2484f4ddede33
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Use scm_is_pair(x) instead of scm_pair_p(x) == SCM_BOOL_T.
:100644 100644 91df379... 6b21abd... M gschem/src/g_funcs.c
commit e89ef317e6603e41f2fde56ec02cf98775e51b27
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use scm_is_false instead of comparing with SCM_BOOL_F.
:100644 100644 15de633... 8b97a37... M gnetlist/src/g_netlist.c
:100644 100644 1f2d5c8... 38be4b7... M gschem/src/g_hook.c
:100644 100644 b06e636... d9407d2... M gschem/src/o_attrib.c
:100644 100644 fca61b6... 0cebeb0... M gschem/src/o_complex.c
:100644 100644 65a3385... 3039206... M gschem/src/o_copy.c
:100644 100644 330e39a... 8a5c068... M gschem/src/o_misc.c
:100644 100644 dbedbba... 5017d7e... M gschem/src/o_move.c
:100644 100644 f7e8882... 34b54e4... M gschem/src/o_pin.c
:100644 100644 50bcfdb... 95a8a13... M gschem/src/o_select.c
:100644 100644 9b3a5bc... 2fe0941... M gschem/src/x_menus.c
:100644 100644 c9290a7... 915c907... M gschem/src/x_window.c
commit ec5a4822f2f30ff48f521ed62ad0b3fda1021faf
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove uses of deprecated SCM_STRINGP and SCM_SYMBOLP.
:100644 100644 c0b2fde... 36cba14... M gschem/src/g_keys.c
:100644 100644 eff2516... 9b3a5bc... M gschem/src/x_menus.c
commit edac96258eb6ff8888f05479de942f3e239da87c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Add missing regex module to autoplace plugin.
:100644 100644 ea29c1c... 668df19... M gschem/scheme/auto-place-attribs.scm
commit 4809fe081c03bd3a9468db4aa6ad7823c4717b0d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Rename File->Close to File->Close Window.
There has been some confusion over whether File->Close closes the
current page or current window.
Affects-bug: lp-792459
:100644 100644 96a0840... af7b1ec... M gschem/lib/system-gschemrc.scm
=========
Changes
=========
commit a8723507d0f62c784289cd9785ef12e2c412da8a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix error location information for scm_display_error().
diff --git a/libgeda/src/g_basic.c b/libgeda/src/g_basic.c
index 3bbd463..2cfef97 100644
--- a/libgeda/src/g_basic.c
+++ b/libgeda/src/g_basic.c
@@ -237,7 +237,7 @@ static void
process_error_stack (SCM s_stack, SCM s_key, SCM s_args, GError **err) {
char *long_message;
char *short_message;
- SCM s_port, s_subr, s_message, s_message_args, s_rest;
+ SCM s_port, s_subr, s_message, s_message_args, s_rest, s_location;
/* Split s_args up */
s_rest = s_args;
@@ -258,8 +258,19 @@ process_error_stack (SCM s_stack, SCM s_key, SCM s_args, GError **err) {
scm_display_backtrace (s_stack, s_port, SCM_BOOL_F, SCM_BOOL_F);
scm_puts ("\n", s_port);
}
- scm_display_error (SCM_BOOL_F, s_port, s_subr,
+
+ s_location = SCM_BOOL_F;
+#ifdef HAVE_SCM_DISPLAY_ERROR_STACK
+ s_location = s_stack;
+#endif /* HAVE_SCM_DISPLAY_ERROR_STACK */
+#ifdef HAVE_SCM_DISPLAY_ERROR_FRAME
+ s_location =
+ scm_is_true (s_stack) ? scm_stack_ref (s_stack, SCM_INUM0) : SCM_BOOL_F;
+#endif /* HAVE_SCM_DISPLAY_ERROR_FRAME */
+
+ scm_display_error (s_location, s_port, s_subr,
s_message, s_message_args, s_rest);
+
long_message = scm_to_locale_string (scm_get_output_string (s_port));
scm_close_output_port (s_port);
commit 0353fd0c7eab2d2c713a202e26a86d2002523f3e
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Add feature test for scm_display_error() arguments.
diff --git a/configure.ac b/configure.ac
index bb6f33a..29653a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,9 @@ AC_SEARCH_LIBS([getopt_long], [gnugetopt],
# Check for misc features of awk
AX_AWK_FEATURES
+# Check Guile features
+AX_GUILE_DISPLAY_ERROR
+
#####################################################################
# Optional things
#####################################################################
diff --git a/m4/geda-guile-display-error.m4 b/m4/geda-guile-display-error.m4
new file mode 100644
index 0000000..05faa12
--- /dev/null
+++ b/m4/geda-guile-display-error.m4
@@ -0,0 +1,60 @@
+# geda-guile-display-error.m4 -*-Autoconf-*-
+# serial 1
+
+dnl Check for behaviour of scm_display_error().
+dnl Copyright (C) 2011 Peter Brett <peter@xxxxxxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+AC_DEFUN([AX_GUILE_DISPLAY_ERROR],
+[
+ AC_PREREQ([2.60])dnl
+ AC_REQUIRE([AX_CHECK_GUILE])dnl
+
+ AC_ARG_VAR([GUILE], [Path to guile executable])
+ AC_CHECK_PROG([GUILE], [guile], [guile], [no])
+
+ if test "X$GUILE" != "Xno"; then
+
+ AC_MSG_CHECKING([whether scm_display_error expects a stack argument])
+ if $GUILE -c \
+"(exit
+ (false-if-exception
+ (begin
+ (display-error (make-stack #t) (current-output-port) \"a\" \"b\" '() '())
+ #t)))" > /dev/null; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_SCM_DISPLAY_ERROR_STACK], 1,
+ [Define to 1 if scm_display_error expects a stack as first argument.])
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ AC_MSG_CHECKING([whether scm_display_error expects a frame argument])
+ if $GUILE -c \
+"(exit
+ (false-if-exception
+ (begin
+ (display-error (stack-ref (make-stack #t) 0)
+ (current-output-port) \"a\" \"b\" '() '())
+ #t)))" > /dev/null; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_SCM_DISPLAY_ERROR_FRAME], 1,
+ [Define to 1 if scm_display_error expects a frame as first argument.])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+])dnl AX_GUILE_DISPLAY_ERROR
commit 2fd51c888dfeb536481b7cbfefe2484f4ddede33
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Use scm_is_pair(x) instead of scm_pair_p(x) == SCM_BOOL_T.
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index 91df379..6b21abd 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -197,7 +197,7 @@ SCM g_funcs_filesel(SCM msg, SCM templ, SCM flags)
/*! \bug FIXME -- how to deal with conflicting flags?
* Should I throw a scheme error? Just deal in the c code?
*/
- for (c_flags = 0; scm_pair_p (flags) == SCM_BOOL_T; flags = SCM_CDR (flags)) {
+ for (c_flags = 0; scm_is_pair (flags); flags = SCM_CDR (flags)) {
SCM f = SCM_CAR (flags);
if (strcmp (SCM_STRING_CHARS (f), "may_exist") == 0) {
c_flags |= FSB_MAY_EXIST;
commit e89ef317e6603e41f2fde56ec02cf98775e51b27
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use scm_is_false instead of comparing with SCM_BOOL_F.
diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index 15de633..8b97a37 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -214,7 +214,7 @@ SCM g_get_all_unique_nets(SCM scm_level)
/*printf("Got net: `%s'\n",net_name); */
x = scm_from_locale_string (net_name);
- if (scm_member(x, list) == SCM_BOOL_F) {
+ if (scm_is_false (scm_member (x, list))) {
list = scm_cons (x, list);
}
}
@@ -298,7 +298,7 @@ SCM g_get_all_connections(SCM scm_netname)
x = pairlist;
is_member = scm_member(x, connlist);
- if (is_member == SCM_BOOL_F) {
+ if (scm_is_false (is_member)) {
connlist = scm_cons (pairlist, connlist);
}
diff --git a/gschem/src/g_hook.c b/gschem/src/g_hook.c
index 1f2d5c8..38be4b7 100644
--- a/gschem/src/g_hook.c
+++ b/gschem/src/g_hook.c
@@ -709,7 +709,7 @@ SCM g_add_component(SCM page_smob, SCM scm_comp_name, SCM scm_x, SCM scm_y,
/* Run the add component hook for the new component */
- if (scm_hook_empty_p(add_component_object_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (add_component_object_hook))) {
scm_run_hook(add_component_object_hook,
scm_cons(g_make_object_smob(toplevel,
new_obj), SCM_EOL));
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index b06e636..d9407d2 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -271,7 +271,7 @@ OBJECT *o_attrib_add_attrib(GSCHEM_TOPLEVEL *w_current,
}
/* Run the add attribute hook */
- if (scm_hook_empty_p(add_attribute_hook) == SCM_BOOL_F &&
+ if (scm_is_false (scm_hook_empty_p (add_attribute_hook)) &&
o_current != NULL) {
scm_run_hook (add_attribute_hook,
scm_cons (g_make_object_smob (toplevel, o_current),
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index fca61b6..0cebeb0 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -138,7 +138,7 @@ void o_complex_place_changed_run_hook(GSCHEM_TOPLEVEL *w_current) {
GList *ptr = NULL;
/* Run the complex place list changed hook */
- if (scm_hook_empty_p(complex_place_list_changed_hook) == SCM_BOOL_F &&
+ if (scm_is_false (scm_hook_empty_p (complex_place_list_changed_hook)) &&
toplevel->page_current->place_list != NULL) {
ptr = toplevel->page_current->place_list;
while (ptr) {
@@ -177,13 +177,13 @@ void o_complex_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y, int continue_pl
iter = g_list_next (iter)) {
o_current = iter->data;
- if (scm_hook_empty_p(add_component_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (add_component_hook))) {
scm_run_hook(add_component_hook,
scm_cons(g_make_attrib_smob_list(w_current, o_current),
SCM_EOL));
}
- if (scm_hook_empty_p(add_component_object_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (add_component_object_hook))) {
scm_run_hook(add_component_object_hook,
scm_cons(g_make_object_smob(w_current->toplevel,
o_current), SCM_EOL));
diff --git a/gschem/src/o_copy.c b/gschem/src/o_copy.c
index 65a3385..3039206 100644
--- a/gschem/src/o_copy.c
+++ b/gschem/src/o_copy.c
@@ -84,7 +84,7 @@ static void o_copy_end_generic(GSCHEM_TOPLEVEL *w_current, int multiple)
iter = g_list_next (iter)) {
object = iter->data;
if ( (object->type == OBJ_COMPLEX) &&
- (scm_hook_empty_p(copy_component_hook) == SCM_BOOL_F)) {
+ scm_is_false (scm_hook_empty_p (copy_component_hook))) {
scm_run_hook(copy_component_hook,
scm_cons (g_make_attrib_smob_list(w_current, object),
SCM_EOL));
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 330e39a..8a5c068 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -252,7 +252,7 @@ void o_rotate_call_hooks (GSCHEM_TOPLEVEL *w_current, GList *list)
switch (o_current->type) {
case OBJ_PIN:
/* Run the rotate pin hook */
- if (scm_hook_empty_p (rotate_pin_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (rotate_pin_hook))) {
scm_run_hook (rotate_pin_hook,
scm_cons (g_make_object_smob (toplevel, o_current),
SCM_EOL));
@@ -261,7 +261,7 @@ void o_rotate_call_hooks (GSCHEM_TOPLEVEL *w_current, GList *list)
case OBJ_COMPLEX:
/* Run the rotate hook */
- if (scm_hook_empty_p (rotate_component_object_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (rotate_component_object_hook))) {
scm_run_hook (rotate_component_object_hook,
scm_cons (g_make_object_smob (toplevel, o_current),
SCM_EOL));
@@ -328,7 +328,7 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
switch(o_current->type) {
case(OBJ_PIN):
/* Run the mirror pin hook */
- if (scm_hook_empty_p(mirror_pin_hook) == SCM_BOOL_F &&
+ if (scm_is_false (scm_hook_empty_p (mirror_pin_hook)) &&
o_current != NULL) {
scm_run_hook(mirror_pin_hook,
scm_cons(g_make_object_smob(toplevel, o_current),
@@ -338,7 +338,7 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
case (OBJ_COMPLEX):
/* Run the mirror pin hook */
- if (scm_hook_empty_p(mirror_component_object_hook) == SCM_BOOL_F &&
+ if (scm_is_false (scm_hook_empty_p(mirror_component_object_hook)) &&
o_current != NULL) {
scm_run_hook(mirror_component_object_hook,
scm_cons(g_make_object_smob(toplevel, o_current),
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index dbedbba..5017d7e 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -180,7 +180,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
case (OBJ_COMPLEX):
case (OBJ_PLACEHOLDER):
- if (scm_hook_empty_p(move_component_hook) == SCM_BOOL_F &&
+ if (scm_is_false (scm_hook_empty_p (move_component_hook)) &&
object != NULL) {
scm_run_hook(move_component_hook,
scm_cons (g_make_attrib_smob_list
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index f7e8882..34b54e4 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -142,7 +142,7 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
PIN_TYPE_NET, 0);
s_page_append (toplevel, toplevel->page_current, new_obj);
- if (scm_hook_empty_p (add_pin_hook) == SCM_BOOL_F) {
+ if (scm_is_false (scm_hook_empty_p (add_pin_hook))) {
scm_run_hook (add_pin_hook,
scm_cons (g_make_object_smob (toplevel, new_obj), SCM_EOL));
}
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 50bcfdb..95a8a13 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -54,8 +54,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
* are selecting a component. This will likely be used for cross probing
* between schematics and PCB layout or schematics and simulation results.
*/
- if ( (scm_hook_empty_p(deselect_all_hook) == SCM_BOOL_F)
- && flag == 2 )
+ if ( scm_is_false (scm_hook_empty_p (deselect_all_hook)) && flag == 2 )
{
scm_run_hook(deselect_all_hook,
scm_cons (g_make_attrib_smob_list(w_current, o_current),
@@ -67,7 +66,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
* are selecting a component. This will likely be used for cross probing
* between schematics and PCB layout or schematics and simulation results.
*/
- if ( (scm_hook_empty_p(select_component_hook) == SCM_BOOL_F)
+ if ( scm_is_false (scm_hook_empty_p (select_component_hook))
&& o_current
&& (o_current->type == OBJ_COMPLEX)
&& flag == 1 )
@@ -82,7 +81,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
* are deselecting a component. This will likely be used for cross probing
* between schematics and PCB layout or schematics and simulation results.
*/
- if ( (scm_hook_empty_p(deselect_component_hook) == SCM_BOOL_F)
+ if ( scm_is_false (scm_hook_empty_p(deselect_component_hook))
&& o_current
&& (o_current->type == OBJ_COMPLEX)
&& flag == 0 )
@@ -97,7 +96,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
* are selecting a net. This will likely be used for cross probing
* between schematics and PCB layout or schematics and simulation results.
*/
- if ( (scm_hook_empty_p(select_net_hook) == SCM_BOOL_F)
+ if ( scm_is_false (scm_hook_empty_p (select_net_hook))
&& o_current
&& (o_current->type == OBJ_NET)
&& flag == 1)
@@ -112,7 +111,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
* are deselecting a net. This will likely be used for cross probing
* between schematics and PCB layout or schematics and simulation results.
*/
- if ( (scm_hook_empty_p(select_net_hook) == SCM_BOOL_F)
+ if ( scm_is_false (scm_hook_empty_p (select_net_hook))
&& o_current
&& (o_current->type == OBJ_NET)
&& flag == 0)
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 9b3a5bc..2fe0941 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -171,7 +171,7 @@ get_main_menu(GSCHEM_TOPLEVEL *w_current)
scm_keys = g_scm_c_eval_string_protected (buf);
g_free (buf);
- if (scm_keys == SCM_BOOL_F) {
+ if (scm_is_false (scm_keys)) {
menu_item_keys = "";
} else {
menu_item_keys = SCM_STRING_CHARS (scm_keys);
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index c9290a7..915c907 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -747,7 +747,7 @@ x_window_open_page (GSCHEM_TOPLEVEL *w_current, const gchar *filename)
toplevel->page_current->page_filename);
}
- if (scm_hook_empty_p (new_page_hook) == SCM_BOOL_F)
+ if (scm_is_false (scm_hook_empty_p (new_page_hook)))
scm_run_hook (new_page_hook,
scm_cons (g_make_page_smob (toplevel, page), SCM_EOL));
commit ec5a4822f2f30ff48f521ed62ad0b3fda1021faf
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove uses of deprecated SCM_STRINGP and SCM_SYMBOLP.
diff --git a/gschem/src/g_keys.c b/gschem/src/g_keys.c
index c0b2fde..36cba14 100644
--- a/gschem/src/g_keys.c
+++ b/gschem/src/g_keys.c
@@ -152,7 +152,7 @@ g_keys_dump_keymap (void)
struct keyseq_action_t keymap_entry;
g_return_val_if_fail (SCM_CONSP (scm_keymap_entry) &&
- SCM_SYMBOLP (SCM_CAR (scm_keymap_entry)) &&
+ scm_is_symbol (SCM_CAR (scm_keymap_entry)) &&
scm_is_string (SCM_CDR (scm_keymap_entry)), ret);
keymap_entry.action = g_strdup (SCM_SYMBOL_CHARS (SCM_CAR (scm_keymap_entry)));
keymap_entry.keyseq = g_strdup (SCM_STRING_CHARS (SCM_CDR (scm_keymap_entry)));
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index eff2516..9b3a5bc 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -136,13 +136,13 @@ get_main_menu(GSCHEM_TOPLEVEL *w_current)
scm_item_stock = scm_is_pair (SCM_CDDDR (scm_item)) ?
SCM_CADDDR (scm_item) : SCM_BOOL_F;
SCM_ASSERT(scm_is_string(scm_item_name), scm_item_name, SCM_ARGn, "get_main_menu item_name");
- SCM_ASSERT(SCM_SYMBOLP (scm_item_func) ||
+ SCM_ASSERT(scm_is_symbol (scm_item_func) ||
scm_is_false (scm_item_func),
scm_item_func, SCM_ARGn, "get_main_menu item_func");
- SCM_ASSERT (SCM_SYMBOLP (scm_item_hotkey_func) ||
+ SCM_ASSERT (scm_is_symbol (scm_item_hotkey_func) ||
scm_is_false (scm_item_hotkey_func),
scm_item_hotkey_func, SCM_ARGn, "get_main_menu hotkey_func");
- SCM_ASSERT (SCM_STRINGP (scm_item_stock) ||
+ SCM_ASSERT (scm_is_string (scm_item_stock) ||
scm_is_false (scm_item_stock),
scm_item_stock, SCM_ARGn, "get_main_menu stock");
commit edac96258eb6ff8888f05479de942f3e239da87c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Add missing regex module to autoplace plugin.
diff --git a/gschem/scheme/auto-place-attribs.scm b/gschem/scheme/auto-place-attribs.scm
index ea29c1c..668df19 100644
--- a/gschem/scheme/auto-place-attribs.scm
+++ b/gschem/scheme/auto-place-attribs.scm
@@ -17,6 +17,8 @@
;;; along with this program; if not, write to the Free Software
;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+(use-modules (ice-9 regex))
+
;; --------------------------------------------------------------------------
;;
;; Code to place new text attributes automatically
commit 4809fe081c03bd3a9468db4aa6ad7823c4717b0d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Rename File->Close to File->Close Window.
There has been some confusion over whether File->Close closes the
current page or current window.
Affects-bug: lp-792459
diff --git a/gschem/lib/system-gschemrc.scm b/gschem/lib/system-gschemrc.scm
index 96a0840..af7b1ec 100644
--- a/gschem/lib/system-gschemrc.scm
+++ b/gschem/lib/system-gschemrc.scm
@@ -1367,8 +1367,7 @@
;;
;; menu item name menu action menu hotkey function menu stock icon
;;
- `( (,(N_ "New Window") file-new-window file-new-window #f)
- (,(N_ "_New") file-new file-new "gtk-new")
+ `( (,(N_ "_New") file-new file-new "gtk-new")
(,(N_ "_Open...") file-open file-open "gtk-open")
;; The entry below will be removed from the menu if glib < 2.6 is detected
(,(N_ "Open Recen_t") #f #f #f)
@@ -1383,7 +1382,8 @@
("SEPARATOR" #f #f #f)
(,(N_ "Execute Script...") file-script file-script "gtk-execute")
("SEPARATOR" #f #f #f)
- (,(N_ "_Close") file-close-window file-close-window "gtk-close")
+ (,(N_ "New Window") file-new-window file-new-window #f)
+ (,(N_ "_Close Window") file-close-window file-close-window "gtk-close")
(,(N_ "_Quit") file-quit file-quit "gtk-quit")))
(define edit-menu-items
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs