From 2e5488ba3d389169c727f4d562cba1ae32f4b3db Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 27 Jan 2007 19:52:49 +0200
Subject: [PATCH] option_changed: Merge the 2nd and 3rd parameter.

All callers were passing the same value for both.
---
 src/config/dialogs.c     | 4 +---
 src/config/options.c     | 6 +++---
 src/config/options.h     | 3 +--
 src/session/session.c    | 2 +-
 src/viewer/text/search.c | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index e06e4a54..05878953 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -275,9 +275,7 @@ check_valid_option(struct dialog_data *dlg_data, struct widget_data *widget_data
 	if (chinon) {
 		if (option_types[option->type].set &&
 		    option_types[option->type].set(option, chinon)) {
-			struct option *current = option;
-
-			option_changed(ses, current, option);
+			option_changed(ses, option);
 
 			commandline = 0;
 			mem_free(chinon);
diff --git a/src/config/options.c b/src/config/options.c
index d8f65818..f152438d 100644
--- a/src/config/options.c
+++ b/src/config/options.c
@@ -956,7 +956,7 @@ toggle_option(struct session *ses, struct option *option)
 	assert(option->max);
 
 	option->value.number = (number <= option->max) ? number : option->min;
-	option_changed(ses, option, option);
+	option_changed(ses, option);
 }
 
 static int
@@ -1011,11 +1011,11 @@ call_change_hooks(struct session *ses, struct option *current, struct option *op
 }
 
 void
-option_changed(struct session *ses, struct option *current, struct option *option)
+option_changed(struct session *ses, struct option *option)
 {
 	option->flags |= OPT_TOUCHED;
 	/* Notify everyone out there! */
-	call_change_hooks(ses, current, option);
+	call_change_hooks(ses, option, option);
 }
 
 int
diff --git a/src/config/options.h b/src/config/options.h
index 8c8c1987..340af5eb 100644
--- a/src/config/options.h
+++ b/src/config/options.h
@@ -180,8 +180,7 @@ void call_change_hooks(struct session *ses, struct option *current,
 
 /* Do proper bookkeeping after an option has changed - call this every time
  * you change an option value. */
-void option_changed(struct session *ses, struct option *current,
-                    struct option *option);
+void option_changed(struct session *ses, struct option *option);
 
 extern int commit_option_values(struct option_resolver *resolvers,
 				struct option *root,
diff --git a/src/session/session.c b/src/session/session.c
index 06377bc9..83810fc2 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -775,7 +775,7 @@ setup_first_session(struct session *ses, struct uri *uri)
 	if (!get_opt_bool("config.saving_style_w")) {
 		struct option *opt = get_opt_rec(config_options, "config.saving_style_w");
 		opt->value.number = 1;
-		option_changed(ses, opt, opt);
+		option_changed(ses, opt);
 		if (get_opt_int("config.saving_style") != 3) {
 			info_box(term, 0,
 				 N_("Warning"), ALIGN_CENTER,
diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index d492a074..5fc924a0 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -1400,7 +1400,7 @@ text_typeahead_handler(struct input_line *line, int action_id)
 
 			opt->value.number = (opt->value.number + 1)
 					    % (opt->max + 1);
-			option_changed(ses, opt, opt);
+			option_changed(ses, opt);
 		}
 		/* Fall thru */