diff --git a/ChangeLog b/ChangeLog
index 335bd45192830b48f7c4a905503d92e1dbba9b65..aaa3e7fab7354fade5a1e80ff1561b62347b4d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-01 Chris Allegretta <chrisa@asty.org>
+	* global.c (shortcut_init) - Don't actually free the shortcut
+	  list, since the next pass via justifying will then remove
+	  all custom shortcuts.  Fixed bug discovered by Benno Schulenberg.
+	* text.c (do_linter) - Remove some unused variables to quiet
+	  -pedanic -Wall.
+
 2014-03-03  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (add_to_funcs) - Add a newline, for clarity.
 	* src/global.c (shortcut_init) - Mark, don't translate yet.
diff --git a/src/global.c b/src/global.c
index 9ccaf676ce18be9d24382b354ab309a2b5875f0f..ac6359b71fd3b6adb2882c68868fdeaf59297eb7 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1128,12 +1128,6 @@ void shortcut_init(bool unjustify)
 
     currmenu = MMAIN;
 
-    while (sclist != NULL) {
-        sc *s = sclist;
-        sclist = (s)->next;
-        free(s);
-    }
-
     add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER,
 	"^G", do_help_void, 0, TRUE);
     add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER,
diff --git a/src/text.c b/src/text.c
index e514772c35839bffda4c3131b5c301529a2ef4f4..ef022f37dc2e1749e9374f3c8570cc7912bc93c3 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2984,12 +2984,11 @@ void do_linter(void)
     char *read_buff, *read_buff_ptr, *read_buff_word, *ptr;
     size_t pipe_buff_size, read_buff_size, read_buff_read, bytesread;
     size_t parsesuccess = 0;
-    int lint_fd[2], tempfile_fd = -1;
+    int lint_fd[2];
     pid_t pid_lint;
     int lint_status;
     static int arglen = 3;
     static char **lintargs = NULL;
-    FILE *temp_file;
     char *lintcopy;
     char *convendptr = NULL;
     const sc *s;
@@ -3186,7 +3185,6 @@ void do_linter(void)
 	ssize_t tmpcol = 1;
 	int kbinput;
 	bool meta_key, func_key;
-	struct stat lintfileinfo;
 
 	if (curlint->colno > 0)
 	    tmpcol = curlint->colno;