[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104535: Merge from emacs-23; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104535: Merge from emacs-23; up to r100595. |
Date: |
Wed, 08 Jun 2011 00:17:26 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104535
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-08 00:17:26 -0700
message:
Merge from emacs-23; up to r100595.
modified:
lisp/ChangeLog
lisp/loadhist.el
lisp/progmodes/flymake.el
lisp/repeat.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-08 06:57:38 +0000
+++ b/lisp/ChangeLog 2011-06-08 07:17:26 +0000
@@ -1,3 +1,17 @@
+2011-06-08 Reuben Thomas <address@hidden>
+
+ * progmodes/flymake.el (flymake-compilation-prevents-syntax-check):
+ Doc fix (Bug#8713).
+
+2011-06-08 Chong Yidong <address@hidden>
+
+ * repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696).
+
+2011-06-08 Juanma Barranquero <address@hidden>
+
+ * loadhist.el (unload-feature-special-hooks):
+ Add `comint-output-filter-functions'.
+
2011-06-08 Ivan Kanis <address@hidden>
* calendar/appt.el (appt-check): Move some initializations into the let.
=== modified file 'lisp/loadhist.el'
--- a/lisp/loadhist.el 2011-01-25 04:08:28 +0000
+++ b/lisp/loadhist.el 2011-06-08 07:17:26 +0000
@@ -117,16 +117,16 @@
'(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'.
=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/flymake.el 2011-06-08 07:17:26 +0000
@@ -1118,7 +1118,7 @@
(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)
=== modified file 'lisp/repeat.el'
--- a/lisp/repeat.el 2011-01-25 04:08:28 +0000
+++ b/lisp/repeat.el 2011-06-08 07:17:26 +0000
@@ -123,7 +123,9 @@
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 ******************* ;;;;;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104535: Merge from emacs-23; up to r100595.,
Glenn Morris <=