procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs--rel--22

Browse source 
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
This commit is contained in:
Miles Bader 2007-05-08 02:07:17 +00:00
commit 6e1504ad81
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
etc/NEWS
View file

@ -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

5
lisp/ChangeLog
View file

@ -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

2
lisp/progmodes/python.el
View file

@ -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))

4
src/ChangeLog
View file

@ -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.

3
src/editfns.c
View file

@ -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;
}