Merge from emacs-23; up to 2010-06-13T18:15:45Z!eliz@gnu.org.

4 files changed, 28 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 614db7cf66c..00dd3ea11e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2011-06-08  Reuben Thomas <rrt@sc3d.org>
+
+	* progmodes/flymake.el (flymake-compilation-prevents-syntax-check):
+	Doc fix (Bug#8713).
+
+2011-06-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696).
+
+2011-06-08  Juanma Barranquero  <lekktu@gmail.com>
+
+	* loadhist.el (unload-feature-special-hooks):
+	Add `comint-output-filter-functions'.
+
 2011-06-08  Ivan Kanis  <gnu@kanis.fr>
 
 	* calendar/appt.el (appt-check): Move some initializations into the let.
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 3395c41d2ff..8e00c33cd81 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -117,16 +117,16 @@ from a file."
   '(after-change-functions after-insert-file-functions
     after-make-frame-functions auto-fill-function before-change-functions
     blink-paren-function buffer-access-fontify-functions
-    choose-completion-string-functions command-line-functions
-    comment-indent-function compilation-finish-functions delete-frame-functions
-    disabled-command-function find-file-not-found-functions
-    font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function
-    font-lock-fontify-region-function font-lock-mark-block-function
-    font-lock-syntactic-face-function font-lock-unfontify-buffer-function
-    font-lock-unfontify-region-function kill-buffer-query-functions
-    kill-emacs-query-functions lisp-indent-function mouse-position-function
-    redisplay-end-trigger-functions suspend-tty-functions
-    temp-buffer-show-function window-scroll-functions
+    choose-completion-string-functions comint-output-filter-functions
+    command-line-functions comment-indent-function compilation-finish-functions
+    delete-frame-functions disabled-command-function
+    find-file-not-found-functions font-lock-beginning-of-syntax-function
+    font-lock-fontify-buffer-function font-lock-fontify-region-function
+    font-lock-mark-block-function font-lock-syntactic-face-function
+    font-lock-unfontify-buffer-function font-lock-unfontify-region-function
+    kill-buffer-query-functions kill-emacs-query-functions lisp-indent-function
+    mouse-position-function redisplaylay-end-trigger-functions
+    suspend-tty-functions temp-buffer-show-function window-scroll-functions
     window-size-change-functions write-contents-functions write-file-functions
     write-region-annotate-functions)
   "A list of special hooks from Info node `(elisp)Standard Hooks'.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6200591fbbb..c01086c970e 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1118,7 +1118,7 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
      (flymake-log 1 "Failed to delete dir %s, error ignored" dir-name))))
 
 (defcustom flymake-compilation-prevents-syntax-check t
-  "If non-nil, syntax check won't be started in case compilation is running."
+  "If non-nil, don't start syntax check if compilation is running."
   :group 'flymake
   :type 'boolean)
 
diff --git a/lisp/repeat.el b/lisp/repeat.el
index b33039b609b..8bab8691b4f 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -123,7 +123,9 @@ if `repeat' is bound to C-x z, typing C-x z z z repeats the previous command
 only occurs if the final character by which `repeat' was invoked is a
 member of that sequence.  If this variable is nil, no re-execution occurs."
   :group 'convenience
-  :type 'boolean)
+  :type '(choice (const :tag "Repeat for all keys" t)
+		 (const :tag "Don't repeat" nil)
+		 (sexp :tag "Repeat for specific keys")))
 
 ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;;