diff options
| author | Miles Bader <[email protected]> | 2007-05-08 02:07:17 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-05-08 02:07:17 +0000 |
| commit | 6e1504ad818d5dae59bdcbac62fbdbf444a989fd (patch) | |
| tree | 46825e25349335af2886ab7bdd2ed5417ef1c29c | |
| parent | 48b8e4a00450bfae2b1617856c90405ade2081fc (diff) | |
| parent | 11c4b29d3a3c1f3491e0822eb50fc3c285a047d2 (diff) | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 11)
- Update from CVS
2007-05-08 David Reitter <[email protected]>
* lisp/progmodes/python.el (python-guess-indent): Check non-nullness
before comparing indent against the 2..8 interval.
2007-05-07 Stefan Monnier <[email protected]>
* src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup
(YAILOM)
Revision: [email protected]/emacs--devo--0--patch-736
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 3 |
5 files changed, 14 insertions, 3 deletions
@@ -3456,6 +3456,9 @@ the command `undefined'. (In earlier Emacs versions, it used `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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index afba0b285e..6109001247 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-05-08 David Reitter <[email protected]> + + * progmodes/python.el (python-guess-indent): Check non-nullness + before comparing indent against the 2..8 interval. + 2007-05-07 YAMAMOTO Mitsuharu <[email protected]> * term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e57c7e639c..17d30e0d97 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -461,7 +461,7 @@ Set `python-indent' locally to the value guessed." (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)) diff --git a/src/ChangeLog b/src/ChangeLog index 4f44f7d083..59a0af5e2c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-05-07 Stefan Monnier <[email protected]> + + * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM) + 2007-05-07 Andreas Schwab <[email protected]> * keymap.c (Flookup_key): Fix typo in last change. diff --git a/src/editfns.c b/src/editfns.c index 2ab852d292..37498e3b6f 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4393,8 +4393,7 @@ Transposing beyond buffer boundaries is an error. */) 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; } |