diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 3fd613fb69..0f710cb8de 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -1861,11 +1861,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		{
 			Paragraph * spar = lt->selection.start.par();
 			Paragraph * epar = lt->selection.end.par()->next();
-			while(spar != epar) {
+			while (spar != epar) {
 				if (spar->layout() != current_layout) {
 					change_layout = true;
 					break;
 				}
+				spar = spar->next();
 			}
 		}
 		if (change_layout) {
diff --git a/src/ChangeLog b/src/ChangeLog
index ad9a06a847..91db7498ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lyxrc.C (read): treat a viewer or converter command of "none" as
+	if it were empty.
+
+	* MenuBackend.C (expandFormats): for an update, also allow the
+	formats that are not viewable
+  
+	* BufferView_pimpl.C (Dispatch): when changing layouts, fix an
+	infinite loop (bug #652)
+
 2002-09-10  Michael Schmitt  <michael.schmitt@teststep.org>
 
 	* text.C (getColumnNearX): placement of cursor in presence of
@@ -24,7 +35,8 @@
 
 2002-08-18  Dekel Tsur  <dekelts@tau.ac.il>
 
-	* text.C (paintRowSelection): Fix code for rows with both RTL & LTR text.
+	* text.C (paintRowSelection): Fix code for rows with both RTL &
+	LTR text.
 
 	* BufferView_pimpl.C (smartQuote): Insert typewriter quotes in
 	Hebrew text.
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 0bb7f4c975..ee61e2854a 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -340,7 +340,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
 				action = LFUN_PREVIEW;
 				break;
 			case MenuItem::UpdateFormats:
-				formats = Exporter::GetExportableFormats(buf, true);
+				formats = Exporter::GetExportableFormats(buf, false);
 				action = LFUN_UPDATE;
 				break;
 			default:
diff --git a/src/lyxrc.C b/src/lyxrc.C
index 00b386a22e..c6cbea31df 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -902,7 +902,8 @@ int LyXRC::read(string const & filename)
 				command = lexrc.getString();
 			if (lexrc.next())
 				flags = lexrc.getString();
-			if (command.empty() || command == "none")
+			if (command.empty()
+ 			    || token(command, ' ', 0) == "none")
 				converters.erase(from, to);
 			else
 				converters.add(from, to, command, flags);
@@ -912,8 +913,11 @@ int LyXRC::read(string const & filename)
 			string format, command;
 			if (lexrc.next())
 				format = lexrc.getString();
-			if (lexrc.next())
+			if (lexrc.next()) {
 				command = lexrc.getString();
+				if (token(command, ' ', 0) == "none")
+ 					command.erase();
+			}
 			formats.setViewer(format, command);
 			break;
 		}
diff --git a/status.12x b/status.12x
index 31f57c8747..051018674e 100644
--- a/status.12x
+++ b/status.12x
@@ -32,15 +32,12 @@ What's new
 
 - update cl2emult textclass
 
-- small cleanup of UserGuide; update to German User Guide and Extended
-  manual.
+- small cleanup of UserGuide; update to German and French documentation
 
-- update german and danish localization of the interface
+- update french, german and danish localization of the interface
 
 ** Bug fixes
 
-- the reference dialog now lists the labels of the current buffer.
-
 - fix bug where special characters in equations label confuse LyX
   (this was a new bug in 1.2.1)
 
@@ -49,10 +46,18 @@ What's new
 
 - fix bug with handling of EPSI files (this was a new bug in 1.2.1)
 
+- fix lockup when changing the layout of several paragraphs at the
+  same time (and the layout of the first paragraph is already correct)
+
 - fix bug with graphics files which name contain a '.'
 
+- when a viewer has not been found (set to "none"), remove the
+  corresponding View menu entry
+
 - fix placement of cursor with mouse in presence of hfills
 
+- the reference dialog now lists the labels of the current buffer
+
 - fix the thesaurus dialog so that it can be closed with the Escape key
 
 - fix drawing problem when a line of text contains both left-to-right