diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 787ad8b9545..7794e110c76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2008-11-02  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (save-selected-window-norecord): New macro
+	(walk-windows): Use save-selected-window-norecord and call
+	select-window with NORECORD set.  (Bug#1237)
+	(set-window-text-height, fit-window-to-buffer): Use
+	save-selected-window-norecord and call select-window with
+	NORECORD set.
+	* subr.el (with-selected-window): Call set-frame-selected-window
+	with new argument NORECORD set.  Update doc-string.
+	(with-selected-frame): Call select-frame with new argument
+	NORECORD set.  Update doc-string.
+	* emacs-lisp/lisp-mode.el (save-selected-window-norecord): Put
+	indent-function for save-selected-window-norecord.
+	* font-lock.el (lisp-font-lock-keywords-2): Add
+	save-selected-window-norecord.
+
 2008-11-01  Juanma Barranquero  <lekktu@gmail.com>
 
 	* cus-edit.el (customize-apropos-options, custom-comment)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index dc1af6c61d7..8ad51b19206 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2257,9 +2257,9 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
 	       '("cond" "if" "while" "while-no-input" "let" "let*"
 		 "prog" "progn" "progv" "prog1" "prog2" "prog*"
 		 "inline" "lambda" "save-restriction" "save-excursion"
-		 "save-window-excursion" "save-selected-window"
-		 "save-match-data" "save-current-buffer" "unwind-protect"
-		 "condition-case" "track-mouse"
+		 "save-selected-window" "save-selected-window-norecord"
+		 "save-window-excursion" "save-match-data" "save-current-buffer"
+		 "unwind-protect" "condition-case" "track-mouse"
 		 "eval-after-load" "eval-and-compile" "eval-when-compile"
 		 "eval-when" "eval-at-startup" "eval-next-after-load"
 		 "with-case-table" "with-category-table"