[rkward-cvs] SF.net SVN: rkward: [921] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 921
          http://svn.sourceforge.net/rkward/?rev=921&view=rev
Author:   tfry
Date:     2006-11-15 05:19:04 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Disable symbol name completion while in comments

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
    trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2006-11-07 16:30:38 UTC (rev 920)
+++ trunk/rkward/ChangeLog	2006-11-15 13:19:04 UTC (rev 921)
@@ -1,3 +1,4 @@
+- in script editor, do not provide symbol name completion while in comments
 - properly support active bindings in globalenv ()
 - if not started in a tty, spawn a konsole. R will go into non-interactive mode otherwise
 

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2006-11-07 16:30:38 UTC (rev 920)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2006-11-15 13:19:04 UTC (rev 921)
@@ -144,10 +144,10 @@
 }
 
 # overriding x11 to get informed, when a new x11 window is opened
-#"x11" <- function (display = "", width = 7, height = 7, pointsize = 12, gamma = 1, colortype = getOption("X11colortype"), maxcubesize = 256, bg #= "transparent", canvas = "white", fonts = getOption("X11fonts")) {
+#"x11" <- function (...) {
 #	.rk.do.call ("startOpenX11", as.character (dev.cur ()));
 #
-#	base::X11()
+#	base::X11 (...)
 #
 #	.rk.do.call ("endOpenX11", as.character (dev.cur ()));
 #}

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2006-11-07 16:30:38 UTC (rev 920)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2006-11-15 13:19:04 UTC (rev 921)
@@ -221,6 +221,7 @@
 	uint para=0; uint cursor_pos=0;
 	m_view->cursorPosition (&para, &cursor_pos);
 	QString current_line = getLine ();
+	if (current_line.findRev ("#", cursor_pos) >= 0) return;	// do not hint while in comments
 
 	QString current_symbol = RKCommonFunctions::getCurrentSymbol (current_line, cursor_pos, false);
 	if (current_symbol.length () >= 2) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.