Mercurial > emacs
changeset 80874:ca9519bf5703
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 11)
- Update from CVS
2007-05-08 David Reitter <david.reitter@gmail.com>
* lisp/progmodes/python.el (python-guess-indent): Check non-nullness
before comparing indent against the 2..8 interval.
2007-05-07 Stefan Monnier <monnier@iro.umontreal.ca>
* src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup
(YAILOM)
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-736
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 08 May 2007 02:07:17 +0000 |
| parents | c2c723c45f9a (current diff) 32334cd7302e (diff) |
| children | 51b85ee9ab0f |
| files | etc/NEWS lisp/ChangeLog lisp/progmodes/python.el src/ChangeLog |
| diffstat | 5 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Tue May 08 00:50:07 2007 +0000 +++ b/etc/NEWS Tue May 08 02:07:17 2007 +0000 @@ -3456,6 +3456,9 @@ `substitute-key-definition' to rebind self inserting characters to `undefined'.) +** The third argument of `accept-process-output' is now milliseconds. +It used to be microseconds. + ** The function find-operation-coding-system may be called with a cons (FILENAME . BUFFER) in the second argument if the first argument OPERATION is `insert-file-contents', and thus a function registered in
--- a/lisp/ChangeLog Tue May 08 00:50:07 2007 +0000 +++ b/lisp/ChangeLog Tue May 08 02:07:17 2007 +0000 @@ -1,3 +1,8 @@ +2007-05-08 David Reitter <david.reitter@gmail.com> + + * progmodes/python.el (python-guess-indent): Check non-nullness + before comparing indent against the 2..8 interval. + 2007-05-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is
--- a/lisp/progmodes/python.el Tue May 08 00:50:07 2007 +0000 +++ b/lisp/progmodes/python.el Tue May 08 02:07:17 2007 +0000 @@ -461,7 +461,7 @@ (let ((initial (current-indentation))) (if (zerop (python-next-statement)) (setq indent (- (current-indentation) initial))) - (if (and (>= indent 2) (<= indent 8)) ; sanity check + (if (and indent (>= indent 2) (<= indent 8)) ; sanity check (setq done t)))))) (when done (when (/= indent (default-value 'python-indent))
--- a/src/ChangeLog Tue May 08 00:50:07 2007 +0000 +++ b/src/ChangeLog Tue May 08 02:07:17 2007 +0000 @@ -1,3 +1,7 @@ +2007-05-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM) + 2007-05-07 Andreas Schwab <schwab@suse.de> * keymap.c (Flookup_key): Fix typo in last change.
--- a/src/editfns.c Tue May 08 00:50:07 2007 +0000 +++ b/src/editfns.c Tue May 08 02:07:17 2007 +0000 @@ -4393,8 +4393,7 @@ fix_start_end_in_overlays (start1, end2); } - signal_after_change (XINT (start1), XINT (end2 - start1), - XINT (end2 - start1)); + signal_after_change (start1, end2 - start1, end2 - start1); return Qnil; }