From: Chris Allegretta <chrisa@asty.org>
Date: Tue, 3 Nov 2009 19:31:17 +0000 (+0000)
Subject:         * rcfile.c - Add in specific check for UNDOABLE and fix declaration as
X-Git-Tag: v2.1.99pre1~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3aad8ab9aa7abd8ea035b33d1f601803145bdc9c;p=nano.git

    * rcfile.c - Add in specific check for UNDOABLE and fix declaration as
          to what flag it toggles.  Fixes undo mode being able to be called from
          the rc file, reported by Helmut Jarausch <jarausch@igpm.rwth-aachen.de>



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4416 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 5bbb3146..9a4e067e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-03 Chris Allegretta <chrisa@asty.org>
 	* nano.h - Fix comma at end of enumerator list which angers -pedantic.
+	* rcfile.c - Add in specific check for UNDOABLE and fix declaration as
+	  to what flag it toggles.  Fixes undo mode being able to be called from
+	  the rc file, reported by Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
 
 2009-11-03 Mike Frysinger <vapier@gentoo.org>
 	* files.c - Move up is_file_writable() to stop implicit definition complaints.
diff --git a/src/rcfile.c b/src/rcfile.c
index decae786..be1ba2ba 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -89,7 +89,7 @@ static const rcoption rcopts[] = {
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},
-    {"undo", 0},
+    {"undo", UNDOABLE},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
     {"softwrap", SOFTWRAP},
@@ -1047,6 +1047,9 @@ void parse_rcfile(FILE *rcstream
 		else
 		    rcfile_error(N_("Cannot unset flag \"%s\""),
 			rcopts[i].name);
+		/* Looks like we still need this specific hack for undo */
+		if (strcasecmp(rcopts[i].name, "undo") == 0)
+		    shortcut_init(0);
 		break;
 	    }
 	}