Added screenshots. Added default EDITOR for :plotedit

andmarti1424 · Apr 27, 2017 · 18de5ee · 18de5ee
1 parent 762cf99
commit 18de5ee
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 6 deletions.
diff --git a/Readme.md b/Readme.md
@@ -26,9 +26,12 @@ SC original authors are James Gosling and Mark Weiser, and mods were later added
 About the name, the idea is that the program can be identified as another vim-like app.
 SC-IM stands for Spreadsheet Calculator Improvised. :-)
 
-![demo image](scim5.png?raw=true)
-![demo image](scim4.png?raw=true)
-![demo image](scim.png?raw=true)
+![demo image](screenshots/scim5.png?raw=true)
+![demo image](screenshots/scim4.png?raw=true)
+![demo image](screenshots/scim.png?raw=true)
+![demo image](screenshots/scimp1.png?raw=true)
+![demo image](screenshots/scimp2.png?raw=true)
+![demo image](screenshots/scimp3.png?raw=true)
 
 ## Build & Install
 

diff --git a/logo.png → screenshots/logo.png b/logo.png → screenshots/logo.png
diff --git a/scim.png → screenshots/scim.png b/scim.png → screenshots/scim.png
diff --git a/scim2.png → screenshots/scim2.png b/scim2.png → screenshots/scim2.png
diff --git a/scim3.png → screenshots/scim3.png b/scim3.png → screenshots/scim3.png
diff --git a/scim4.png → screenshots/scim4.png b/scim4.png → screenshots/scim4.png
diff --git a/scim5.png → screenshots/scim5.png b/scim5.png → screenshots/scim5.png
diff --git a/screenshots/scimp1.png b/screenshots/scimp1.png
diff --git a/screenshots/scimp2.png b/screenshots/scimp2.png
diff --git a/screenshots/scimp3.png b/screenshots/scimp3.png
diff --git a/src/Makefile b/src/Makefile
@@ -39,6 +39,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\"
 
 # Sets default pager, e.g. 'less' or 'more'
 CFLAGS += -DDFLT_PAGER=\"less\"
+# Sets default editor. Its use in case EDITOR env variable is not set
+CFLAGS += -DDFLT_EDITOR=\"vim\"
 # Comment out to disable color support
 CFLAGS += -DUSECOLORS
 # Command history file, relative to home directory. Comment out to disable commandline history

diff --git a/src/plot.c b/src/plot.c
@@ -25,7 +25,10 @@ int plotedit(wchar_t * s) {
         system("reset");
         //reset_shell_mode();
 
-        sprintf(command, "vim %s", path_out);
+        char * editor;
+        if (! (editor = getenv("EDITOR")))
+            editor = DFLT_EDITOR;
+        sprintf(command, "%s %s", editor, path_out);
 
         if (system(command) == -1) sc_error("Failed editting plot file - errno:%d", errno);
         reset_prog_mode();

diff --git a/src/sc.h b/src/sc.h
@@ -36,11 +36,14 @@ extern struct ent ** ATBL(struct ent ***,int ,int );
 #define STDERRBUF   8192     /* stderr buffer size */
 
 #ifndef DFLT_PAGER
- #define    DFLT_PAGER "more"    /* more is probably more widespread than less */
+#define    DFLT_PAGER "more" /* more is probably more widespread than less */
 #endif                       /* DFLT_PAGER */
 
+#ifndef DFLT_EDITOR
+#define    DFLT_EDITOR "vim"
+#endif
 
-//#ifndef A_CHARTEXT           /* Should be defined in curses.h */
+//#ifndef A_CHARTEXT         /* Should be defined in curses.h */
 // #define A_CHARTEXT 0xff
 //#endif