Index: src/Resources/TortoiseProcENG.rc
===================================================================
--- src/Resources/TortoiseProcENG.rc	(revision 11095)
+++ src/Resources/TortoiseProcENG.rc	(working copy)
@@ -824,32 +824,34 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,190,274,10
 END
 
-IDD_SETTINGSDIALOGS DIALOGEX 0, 0, 300, 217
+IDD_SETTINGSDIALOGS DIALOGEX 0, 0, 300, 223
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General::Dialogs 1"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Log messages",IDC_STATIC,7,7,286,83
+    GROUPBOX        "Log messages",IDC_STATIC,7,7,286,88
     LTEXT           "Default &number of log messages",IDC_STATIC,14,20,204,8
-    EDITTEXT        IDC_DEFAULTLOG,229,20,55,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
-    LTEXT           "&Font for log messages:",IDC_STATIC,14,32,92,23,SS_CENTERIMAGE
-    COMBOBOX        IDC_FONTNAMES,107,37,136,90,CBS_DROPDOWNLIST | CBS_OWNERDRAWVARIABLE | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FONTSIZES,253,37,31,47,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_DEFAULTLOG,229,17,55,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
+    LTEXT           "&Font for log messages:",IDC_STATIC,14,29,92,23,SS_CENTERIMAGE
+    COMBOBOX        IDC_FONTNAMES,107,34,136,90,CBS_DROPDOWNLIST | CBS_OWNERDRAWVARIABLE | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FONTSIZES,253,34,31,47,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Short &date/time format in log messages",IDC_SHORTDATEFORMAT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,56,271,10
-    GROUPBOX        "Progress",IDC_STATIC,7,93,286,35
-    LTEXT           "&Autoclose:",IDC_STATIC,14,103,85,19,SS_CENTERIMAGE
-    COMBOBOX        IDC_AUTOCLOSECOMBO,107,107,177,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,53,271,10
+    CONTROL         "Cache log messages",IDC_CACHELOGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,67,270,10
+    CONTROL         "Can double-click in log list to compare with previous revision",IDC_DIFFBYDOUBLECLICK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,81,270,10
+    GROUPBOX        "Progress",IDC_STATIC,7,99,286,35
+    LTEXT           "&Autoclose:",IDC_STATIC,14,109,85,19,SS_CENTERIMAGE
+    COMBOBOX        IDC_AUTOCLOSECOMBO,107,112,177,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Use URL of &WC as the default ""From:"" URL",IDC_WCURLFROM,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,144,271,10
-    GROUPBOX        "Merge",IDC_STATIC,7,132,286,27
-    GROUPBOX        "Checkout",IDC_STATIC,7,165,286,45
-    LTEXT           "Default path:",IDC_STATIC,14,179,85,8
-    LTEXT           "Default URL:",IDC_STATIC,14,195,85,8
-    EDITTEXT        IDC_CHECKOUTPATH,107,176,161,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_BROWSECHECKOUTPATH,272,176,12,14
-    EDITTEXT        IDC_CHECKOUTURL,107,193,161,14,ES_AUTOHSCROLL
-    CONTROL         "Cache log messages",IDC_CACHELOGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,72,270,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,150,271,10
+    GROUPBOX        "Merge",IDC_STATIC,7,138,286,27
+    GROUPBOX        "Checkout",IDC_STATIC,7,169,286,48
+    LTEXT           "Default path:",IDC_STATIC,13,185,85,8
+    LTEXT           "Default URL:",IDC_STATIC,13,201,85,8
+    EDITTEXT        IDC_CHECKOUTPATH,107,182,161,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_BROWSECHECKOUTPATH,271,182,12,14
+    EDITTEXT        IDC_CHECKOUTURL,107,199,161,14,ES_AUTOHSCROLL
 END
 
 IDD_RESOLVE DIALOGEX 0, 0, 244, 153
@@ -1651,7 +1653,7 @@
         VERTGUIDE, 272
         VERTGUIDE, 284
         TOPMARGIN, 7
-        BOTTOMMARGIN, 210
+        BOTTOMMARGIN, 216
     END
 
     IDD_RESOLVE, DIALOG
@@ -1853,7 +1855,7 @@
         VERTGUIDE, 230
         TOPMARGIN, 7
         BOTTOMMARGIN, 123
-    END
+END
 
     IDD_MERGEWIZARD_START, DIALOG
     BEGIN
@@ -3045,6 +3047,8 @@
                             "Caches the log messages to speed up log fetching"
     IDS_SETTINGS_SELECTFILESONCOMMIT_TT 
                             "When enabled, the versioned items listed in the commit dialog are automatically selected"
+    IDS_SETTINGS_DIFFBYDOUBLECLICK_TT 
+                            "If checked, double-clicking on a revision in the log list compares it with the previous revision"
     IDS_SETTINGS_HOOKS_SELECTFOLDERPATH "Select folder to run script for"
     IDS_SETTINGS_HOOKS_SELECTSCRIPTFILE "Select hook script file"
 END
Index: src/TortoiseProc/FileDiffDlg.cpp
===================================================================
--- src/TortoiseProc/FileDiffDlg.cpp	(revision 11095)
+++ src/TortoiseProc/FileDiffDlg.cpp	(working copy)
@@ -80,6 +80,7 @@
 	ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
 	ON_EN_CHANGE(IDC_FILTER, &CFileDiffDlg::OnEnChangeFilter)
 	ON_WM_TIMER()
+	ON_NOTIFY(NM_RETURN, IDC_FILELIST, &CFileDiffDlg::OnNMReturnFilelist)
 END_MESSAGE_MAP()
 
 
@@ -169,7 +170,10 @@
 		InterlockedExchange(&m_bThreadRunning, FALSE);
 		CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
 	}
-	return TRUE;
+
+	// Start with focus on file list
+	GetDlgItem(IDC_FILELIST)->SetFocus();
+	return FALSE;
 }
 
 svn_error_t* CFileDiffDlg::DiffSummarizeCallback(const CTSVNPath& path, 
@@ -215,6 +219,12 @@
 	m_cFilter.GetWindowText(sFilterText);
 	m_cFileList.SetRedraw(false);
 	Filter(sFilterText);
+	if (! m_arFileList.empty())
+	{
+		// Highlight first entry in file list
+		m_cFileList.SetSelectionMark(0);
+		m_cFileList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
+	}
 
 	int mincol = 0;
 	int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
@@ -975,3 +985,18 @@
 	}
 }
 
+
+void CFileDiffDlg::OnNMReturnFilelist(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	*pResult = 0;
+
+	// Return pressed in file list. Show diff, as for doubleclick
+	int selIndex = m_cFileList.GetSelectionMark();
+	if (selIndex < 0)
+		return;
+	if (selIndex >= (int)m_arFileList.size())
+		return;	
+
+	DoDiff(selIndex, m_bBlame);
+	return;
+}
Index: src/TortoiseProc/FileDiffDlg.h
===================================================================
--- src/TortoiseProc/FileDiffDlg.h	(revision 11095)
+++ src/TortoiseProc/FileDiffDlg.h	(working copy)
@@ -79,6 +79,7 @@
 	afx_msg LRESULT OnClickedCancelFilter(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnEnChangeFilter();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnNMReturnFilelist(NMHDR *pNMHDR, LRESULT *pResult);
 
 	DECLARE_MESSAGE_MAP()
 
Index: src/TortoiseProc/LogDlg.cpp
===================================================================
--- src/TortoiseProc/LogDlg.cpp	(revision 11095)
+++ src/TortoiseProc/LogDlg.cpp	(working copy)
@@ -158,6 +158,7 @@
 	ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage) 
 	ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)
 	ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)
+	ON_NOTIFY(NM_DBLCLK, IDC_LOGLIST, OnNMDblclkLoglist)
 	ON_WM_CONTEXTMENU()
 	ON_WM_SETCURSOR()
 	ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
@@ -188,6 +189,8 @@
 	ON_COMMAND(ID_LOGDLG_FIND,&CLogDlg::OnFind)
 	ON_COMMAND(ID_LOGDLG_FOCUSFILTER,&CLogDlg::OnFocusFilter)
 	ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
+	ON_NOTIFY(NM_RETURN, IDC_LOGLIST, &CLogDlg::OnNMReturnLoglist)
+	ON_NOTIFY(NM_RETURN, IDC_LOGMSG, &CLogDlg::OnNMReturnChangedFileList)
 END_MESSAGE_MAP()
 
 void CLogDlg::SetParams(const CTSVNPath& path, SVNRev pegrev, SVNRev startrev, SVNRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)
@@ -420,6 +423,7 @@
 		InterlockedExchange(&m_bNoDispUpdates, FALSE);
 		CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
 	}
+	GetDlgItem(IDC_LOGLIST)->SetFocus();
 	return FALSE;
 }
 
@@ -1493,6 +1497,12 @@
 {
 	// a doubleclick on an entry in the changed-files list has happened
 	*pResult = 0;
+
+	DiffSelectedFile();
+}
+
+void CLogDlg::DiffSelectedFile()
+{
 	if (m_bThreadRunning)
 		return;
 	UpdateLogInfoLabel();
@@ -1517,7 +1527,7 @@
 			}
 		}
 		rev2--;
-		// now we have both revisions selected in the log list, so we can do a diff of the doubleclicked
+		// now we have both revisions selected in the log list, so we can do a diff of the selected
 		// entry in the changed files list with these two revisions.
 		DoDiffFromLog(selIndex, rev1, rev2, false, false);
 	}
@@ -1597,6 +1607,69 @@
 	}
 }
 
+
+void CLogDlg::OnNMDblclkLoglist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
+{
+	// a doubleclick on an entry in the revision list has happened
+	*pResult = 0;
+
+  if (CRegDWORD(_T("Software\\TortoiseSVN\\DiffByDoubleClickInLog"), FALSE))
+	  DiffSelectedRevWithPrevious();
+}
+
+void CLogDlg::DiffSelectedRevWithPrevious()
+{
+	if (m_bThreadRunning)
+		return;
+	UpdateLogInfoLabel();
+	int selIndex = m_LogList.GetSelectionMark();
+	if (selIndex < 0)
+		return;
+	int selCount = m_LogList.GetSelectedCount();
+	if (selCount != 1)
+		return;
+
+	// Find selected entry in the log list
+	POSITION pos = m_LogList.GetFirstSelectedItemPosition();
+	PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));
+	long rev1 = pLogEntry->Rev;
+	long rev2 = rev1-1;
+  CTSVNPath path = m_path;
+
+  // See how many files under the relative root were changed in selected revision
+	int nChanged = 0;
+  LogChangedPath * changed = NULL;
+  for (INT_PTR c = 0; c < pLogEntry->pArChangedPaths->GetCount(); ++c)
+  {
+    LogChangedPath * cpath = pLogEntry->pArChangedPaths->GetAt(c);
+    if (cpath  &&  cpath -> sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
+    {
+      ++nChanged;
+      changed = cpath;
+    }
+  }
+
+	if (m_path.IsDirectory() && nChanged == 1) 
+  {
+		// We're looking at the log for a directory and only one file under dir was changed in the revision
+		// Do diff on that file instead of whole directory
+    path.AppendPathString(changed->sPath.Mid(m_sRelativeRoot.GetLength()));
+  } 
+
+  m_bCancelled = FALSE;
+  DialogEnableWindow(IDOK, FALSE);
+  SetPromptApp(&theApp);
+  theApp.DoWaitCursor(1);
+
+  SVNDiff diff(this, m_hWnd, true);
+  diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
+  diff.SetHEADPeg(m_LogRevision);
+  diff.ShowCompare(path, rev2, path, rev1);
+
+  theApp.DoWaitCursor(-1);
+  EnableOKButton();
+}
+
 void CLogDlg::DoDiffFromLog(int selIndex, svn_revnum_t rev1, svn_revnum_t rev2, bool blame, bool unified)
 {
 	DialogEnableWindow(IDOK, FALSE);
@@ -2746,7 +2819,8 @@
 			return;
 		}
 		CWnd * focusWnd = GetFocus();
-		bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO)));
+		bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
+			&& (focusWnd != GetDlgItem(IDC_LOGLIST)));
 		if (m_sFilterText.IsEmpty())
 		{
 			DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));
@@ -4394,3 +4468,15 @@
 	else
 		CopySelectionToClipBoard();
 }
+
+void CLogDlg::OnNMReturnLoglist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
+{
+	DiffSelectedRevWithPrevious();
+	*pResult = 0;
+}
+
+void CLogDlg::OnNMReturnChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
+{
+	DiffSelectedFile();
+	*pResult = 0;
+}
Index: src/TortoiseProc/LogDlg.h
===================================================================
--- src/TortoiseProc/LogDlg.h	(revision 11095)
+++ src/TortoiseProc/LogDlg.h	(working copy)
@@ -96,6 +96,7 @@
 	afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
 	afx_msg void OnBnClickedGetall();
 	afx_msg void OnNMDblclkChangedFileList(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMDblclkLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnBnClickedHelp();
 	afx_msg void OnBnClickedStatbutton();
@@ -122,6 +123,8 @@
 	afx_msg void OnFind();
 	afx_msg void OnFocusFilter();
 	afx_msg void OnEditCopy();
+	afx_msg void OnNMReturnLoglist(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMReturnChangedFileList(NMHDR *pNMHDR, LRESULT *pResult);
 
 	virtual void OnCancel();
 	virtual void OnOK();
@@ -162,6 +165,8 @@
 	bool ValidateRegexp(LPCTSTR regexp_str, rpattern& pat, bool bMatchCase = false);
 	void CheckRegexpTooltip();
 	void GetChangedPaths(std::vector<CString>& changedpaths, std::vector<LogChangedPath*>& changedlogpaths);
+	void DiffSelectedFile();
+	void DiffSelectedRevWithPrevious();
 	/**
 	 * Extracts part of commit message suitable for displaying in revision list.
 	 */
Index: src/TortoiseProc/resource.h
===================================================================
--- src/TortoiseProc/resource.h	(revision 11095)
+++ src/TortoiseProc/resource.h	(working copy)
@@ -298,6 +298,7 @@
 #define IDC_SORTBYCOMMITCOUNT           1126
 #define IDC_F5HINT                      1127
 #define IDC_IGNOREEOL2                  1127
+#define IDC_DIFFBYDOUBLECLICK           1127
 #define IDC_RADIOBDB                    1128
 #define IDC_RADIOFSFS                   1129
 #define IDC_CHECK_STOPONCOPY            1130
@@ -942,6 +943,7 @@
 #define IDS_SETTINGS_SAVEDDATA_REPOLOGHIST_TT 3139
 #define IDS_SETTINGS_CACHELOGS_TT       3140
 #define IDS_SETTINGS_SELECTFILESONCOMMIT_TT 3141
+#define IDS_SETTINGS_DIFFBYDOUBLECLICK_TT 3142
 #define IDS_SETTINGS_HOOKS_SELECTFOLDERPATH 3150
 #define IDS_SETTINGS_HOOKS_SELECTSCRIPTFILE 3151
 #define IDS_SETTINGS_HOOKS_TYPECOL      3152
Index: src/TortoiseProc/Settings/SetDialogs.cpp
===================================================================
--- src/TortoiseProc/Settings/SetDialogs.cpp	(revision 11095)
+++ src/TortoiseProc/Settings/SetDialogs.cpp	(working copy)
@@ -39,6 +39,7 @@
 	, m_sDefaultCheckoutPath(_T(""))
 	, m_sDefaultCheckoutUrl(_T(""))
 	, m_bCacheLogs(FALSE)
+	, m_bDiffByDoubleClick(FALSE)
 {
 	m_regAutoClose = CRegDWORD(_T("Software\\TortoiseSVN\\AutoClose"));
 	m_regDefaultLogs = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);
@@ -49,6 +50,7 @@
 	m_regDefaultCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\DefaultCheckoutPath"));
 	m_regDefaultCheckoutUrl = CRegString(_T("Software\\TortoiseSVN\\DefaultCheckoutUrl"));
 	m_regCacheLogs = CRegDWORD(_T("Software\\TortoiseSVN\\UseLogCache"), TRUE);
+	m_regDiffByDoubleClick = CRegDWORD(_T("Software\\TortoiseSVN\\DiffByDoubleClickInLog"), FALSE);
 }
 
 CSetDialogs::~CSetDialogs()
@@ -74,6 +76,7 @@
 	DDX_Text(pDX, IDC_CHECKOUTPATH, m_sDefaultCheckoutPath);
 	DDX_Text(pDX, IDC_CHECKOUTURL, m_sDefaultCheckoutUrl);
 	DDX_Check(pDX, IDC_CACHELOGS, m_bCacheLogs);
+	DDX_Check(pDX, IDC_DIFFBYDOUBLECLICK, m_bDiffByDoubleClick);
 }
 
 
@@ -88,6 +91,7 @@
 	ON_EN_CHANGE(IDC_CHECKOUTPATH, OnChange)
 	ON_EN_CHANGE(IDC_CHECKOUTURL, OnChange)
 	ON_BN_CLICKED(IDC_CACHELOGS, OnChange)
+	ON_BN_CLICKED(IDC_DIFFBYDOUBLECLICK, OnChange)
 END_MESSAGE_MAP()
 
 
@@ -122,6 +126,7 @@
 	m_sDefaultCheckoutPath = m_regDefaultCheckoutPath;
 	m_sDefaultCheckoutUrl = m_regDefaultCheckoutUrl;
 	m_bCacheLogs = m_regCacheLogs;
+	m_bDiffByDoubleClick = m_regDiffByDoubleClick;
 
 	SHAutoComplete(GetDlgItem(IDC_CHECKOUTPATH)->m_hWnd, SHACF_FILESYSTEM);
 	SHAutoComplete(GetDlgItem(IDC_CHECKOUTURL)->m_hWnd, SHACF_URLALL);
@@ -142,6 +147,7 @@
 	m_tooltips.AddTool(IDC_CHECKOUTPATH, IDS_SETTINGS_CHECKOUTPATH_TT);
 	m_tooltips.AddTool(IDC_CHECKOUTURL, IDS_SETTINGS_CHECKOUTURL_TT);
 	m_tooltips.AddTool(IDC_CACHELOGS, IDS_SETTINGS_CACHELOGS_TT);
+	m_tooltips.AddTool(IDC_DIFFBYDOUBLECLICK, IDS_SETTINGS_DIFFBYDOUBLECLICK_TT);
 
 	int count = 0;
 	for (int i=6; i<32; i=i+2)
@@ -222,6 +228,9 @@
 	m_regCacheLogs = m_bCacheLogs;
 	if (m_regCacheLogs.LastError != ERROR_SUCCESS)
 		CMessageBox::Show(m_hWnd, m_regCacheLogs.getErrorString(), _T("TortoiseSVN"), MB_ICONERROR);
+	m_regDiffByDoubleClick = m_bDiffByDoubleClick;
+	if (m_regDiffByDoubleClick.LastError != ERROR_SUCCESS)
+		CMessageBox::Show(m_hWnd, m_regDiffByDoubleClick.getErrorString(), _T("TortoiseSVN"), MB_ICONERROR);
 	SetModified(FALSE);
 	return ISettingsPropPage::OnApply();
 }
Index: src/TortoiseProc/Settings/SetDialogs.h
===================================================================
--- src/TortoiseProc/Settings/SetDialogs.h	(revision 11095)
+++ src/TortoiseProc/Settings/SetDialogs.h	(working copy)
@@ -71,6 +71,8 @@
 	CString			m_sDefaultCheckoutUrl;
 	CRegDWORD		m_regCacheLogs;
 	BOOL			m_bCacheLogs;
+	CRegDWORD		m_regDiffByDoubleClick;
+	BOOL			m_bDiffByDoubleClick;
 
 public:
 	virtual BOOL OnInitDialog();
