Merge branch '1826_fixup_without_edit'

* 1826_fixup_without_edit:
  Ticket #1826: fixing build w/o internal edit

src/cmd.c

@@ -304,6 +304,8 @@ do_edit_at_line (const char *what, int start_line)
     if (use_internal_edit)
 	edit_file (what, start_line);
     else
+#else
+    (void) start_line;
 #endif /* USE_INTERNAL_EDIT */
     {
 	if (editor == NULL) {

src/user.c

@@ -183,6 +183,10 @@ expand_format (WEdit *edit_widget, char c, int lc_quote)
     char *result;
     char c_lc;
 
+#ifndef USE_INTERNAL_EDIT
+    (void) edit_widget;
+#endif
+
     if (c == '%')
 	return g_strdup ("%");