Commits

Anonymous committed eb7e8d4 Merge

Merged in changes from CVS trunk

Patches applied:

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-200
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-201
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-202
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-203
Add entry for macroexpand-all to NEWS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-204
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-205
Add macroexpand-all to lisp reference manual

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-206
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-207
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-208
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-209
Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
More RCS keyword removal

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-211
File-permission tweaks

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-212
Checkout from CVS with unexpanded RCS keywords

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-136

Comments (0)

Files changed (73)

 
 ** M-x diff uses diff-mode instead of compilation-mode.
 
+** M-x compare-windows now can automatically skip non-matching text to
+resync points in both windows.
+
 ** New command `strokes-global-set-stroke-string'.
 This is like `strokes-global-set-stroke', but it allows you to bind
 the stroke directly to a string to insert.  This is convenient for
 ** New command `kill-whole-line' kills an entire line at once.
 By default, it is bound to C-S-<backspace>.
 
+** Dired mode:
+
+*** New faces dired-header, dired-mark, dired-marked, dired-flagged,
+dired-ignored, dired-directory, dired-symlink, dired-warning
+introduced for Dired mode instead of font-lock faces.
+
+*** New Dired command `dired-compare-directories' to mark files with
+different file attributes in two dired buffers.
+
++++
+*** In Dired's ! command (dired-do-shell-command), `*' and `?' now
+control substitution of the file names only when they are surrounded
+by whitespace.  This means you can now use them as shell wildcards
+too.  If you want to use just plain `*' as a wildcard, type `*""'; the
+doublequotes make no difference in the shell, but they prevent
+special treatment in `dired-do-shell-command'.
+
++++
+*** Dired's v command now runs external viewers to view certain
+types of files.  The variable `dired-view-command-alist' controls
+what external viewers to use and when.
+
+*** In Dired, the w command now copies the current line's file name
+into the kill ring.
+
 ** Info mode:
 +++
 *** Info now hides node names in menus and cross references by default.
 Info files on your system for a string, and builds a menu of the
 possible matches.
 
++++
+*** The default value for `Info-scroll-prefer-subnodes' is now nil.
+
+---
+*** Info-index offers completion.
+
 ** Support for the SQLite interpreter has been added to sql.el by calling
 'sql-sqlite'.
 
 in a directory or in a file.  See the documentation of the user option
 `display-time-mail-directory'.
 
-+++
-** The default value for `Info-scroll-prefer-subnodes' is now nil.
-
 ---
 ** LDAP support now defaults to ldapsearch from OpenLDAP version 2.
 
 screen size.  (For now, this does not work with some window managers.)
 
 ---
-** Info-index offers completion.
-
----
 ** Emacs now tries to set up buffer coding systems for HTML/XML files
 automatically.
 
 changes the behavior of motion commands like C-e and C-p.
 
 +++
-** In Dired's ! command (dired-do-shell-command), `*' and `?' now
-control substitution of the file names only when they are surrounded
-by whitespace.  This means you can now use them as shell wildcards
-too.  If you want to use just plain `*' as a wildcard, type `*""'; the
-doublequotes make no difference in the shell, but they prevent
-special treatment in `dired-do-shell-command'.
-
-+++
-** Dired's v command now runs external viewers to view certain
-types of files.  The variable `dired-view-command-alist' controls
-what external viewers to use and when.
-
-+++
 ** Unquoted `$' in file names do not signal an error any more when
 the corresponding environment variable does not exist.
 Instead, the `$ENVVAR' text is left as is, so that `$$' quoting
 if the arg is negative, it marks the current and the preceding
 paragraphs.
 
-** In Dired, the w command now copies the current line's file name
-into the kill ring.
-
 +++
 ** The variables dired-free-space-program and dired-free-space-args
 have been renamed to directory-free-space-program and
 to the text before point.  If there is text in the buffer after point,
 it remains unchanged.
 
+** Visual feedback of *Completions* buffer is enhanced.
+Faces are put on the common prefix substrings and the first uncommon
+charachters of each completion candidate in the *Completions* buffer.
+`completion-de-emphasis' is put on the common prefix substrings as the
+face; and `completion-emphasis' is put on the first uncommon
+charachters. By default `completion-de-emphasis' is inherited from
+`default' face. `completion-emphasis' is inherited from `bold' face.
+
 +++
 ** New user option `inhibit-startup-buffer-menu'.
 When loading many files, for instance with `emacs *', Emacs normally
 
 * New modes and packages in Emacs 21.4
 
+** The new python.el package is used to edit Python and Jython programs.
+
 ** The URL package (which had been part of W3) is now part of Emacs.
 
 +++
 `format' are now documented.  Some flags that were accepted but not
 implemented (such as "*") are no longer accepted.
 
+** New function `macroexpand-all' expands all macros in a form.
+It is similar to the Common-Lisp function of the same name.
+One difference is that it guarantees to return the original argument
+if no expansion is done, which may be tested using `eq'.
+
 +++
 ** New function `delete-dups' destructively removes `equal' duplicates
 from a list.  Of several `equal' occurrences of an element in the list,
 *** RCS customization.
 
 There is a new variable vc-consult-headers.  If it is t (the default),
-VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.9 2003/09/01 15:44:58 miles Exp $') and
+VC searches for RCS headers in working files (like `$Id$') and
 determines the state of the file from them, not from the master file.
 This is fast and more reliable when you use branches.  (The variable
 was already present in Emacs 19.29, but didn't get mentioned in the
 % Title:  GNU Emacs Survival Card
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 %
-% $Revision: 1.3 $
-% $Date: 2003/09/01 15:44:59 $
-%
 %**start of header
 
 % User interface is `plain.tex' and macros described below
   \endinput
 \fi
 
-% Copyright (c) 2000 Free Software Foundation, Inc.
+% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 % Title:  GNU Emacs Survival Card
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 %
-% $Revision: 1.3 $
-% $Date: 2003/09/01 15:44:59 $
-%
 %**start of header
 
 % User interface is `plain.tex' and macros described below
   \endinput
 \fi
 
-% Copyright (c) 2000 Free Software Foundation, Inc.
+% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 %&mex
 %=====================================================================
-% $Revision: 1.4 $
-% $Date: 2003/09/01 15:44:59 $
-%=====================================================================
 % Reference Card for GNU Emacs version 20 on Unix systems was
 % translated into Polish language by W{\l}odek Bzyl (matwb@univ.gda.pl)
 % who also added new section on `Dired' and added info about Polish
 
 \columnsperpage=2
 
-% Copyright (c) 1999 Free Software Foundation, Inc.
+% Copyright (c) 1999, 2004 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 % Title:  GNU Emacs Survival Card
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 %
-% $Revision: 1.3 $
-% $Date: 2003/09/01 15:44:59 $
-%
 %**start of header
 
 % User interface is `plain.tex' and macros described below
   \endinput
 \fi
 
-% Copyright (c) 2000 Free Software Foundation, Inc.
+% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 #
 #------------------------------------------------------------------------------
 #	Version 10.2.1
-#	$Date: 2003/02/04 14:30:42 $
 #	terminfo syntax
 #
 #	Eric S. Raymond		(current maintainer)

leim/CXTERM-DIC/4Corner.tit

-# $Id: 4Corner.tit,v 1.3 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2

leim/CXTERM-DIC/CCDOSPY.tit

-# $Id: CCDOSPY.tit,v 1.2 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1

leim/CXTERM-DIC/Punct.tit

-# $Id: Punct.tit,v 1.2 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1

leim/CXTERM-DIC/QJ.tit

-# $Id: QJ.tit,v 1.2 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1

leim/CXTERM-DIC/SW.tit

-# $Id: SW.tit,v 1.2 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1

leim/CXTERM-DIC/TONEPY.tit

-# $Id: TONEPY.tit,v 1.2 2003/09/01 15:44:59 miles Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 1
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.6 $';
+my($version) = '$Revision$';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.53 2004/02/15 07:41:58 uid65632 Exp $'
+Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
 # 2004 Free Software Foundation, Inc.
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-# Copyright (C) 1992, 1993, 1995, 1997, 2001
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 #
-#	$Id: vcdiff,v 1.8 2003/09/01 15:45:03 miles Exp $
-#
 
 DIFF="diff"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
+2004-04-12  Joe Buehler  <jbuehler@hekiman.com>
+
+	* loadup.el: Add cygwin to system-type list, for unexec() support.
+
+2004-04-12  John Paul Wallington  <jpw@gnu.org>
+
+	* ibuffer.el (ibuffer-delete-window-on-quit): Remove.
+	(ibuffer-restore-window-config-on-quit): New variable to replace
+	`ibuffer-delete-window-on-quit'.  Update all references.
+	(ibuffer-prev-window-config): New variable.
+	(ibuffer-quit): Restore previous window configuration instead of
+	deleting window.
+	(ibuffer): Save window configuration before showing Ibuffer buffer.
+
+	* help.el (describe-mode): Doc fix.
+
+	* url/url-cookie.el (url-cookie-handle-set-cookie): Replace calls
+	to obsolete `assoc-ignore-case' with calls to `assoc-string'.
+
+2004-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el (compilation-mode-font-lock-keywords): Fix test
+	not to treat nil as a function.
+
+	* vc-arch.el (vc-arch-root): Be a bit more careful.
+	(vc-arch-register): Save the buffer if we modified it.
+	(vc-arch-delete-rej-if-obsolete): Save excursion.
+	(vc-arch-find-file-hook): Use the simpler after-save-hook.
+	(vc-arch-responsible-p, vc-arch-init-version): New functions.
+
+	* net/ldap.el (ldap-search): Use list*.
+
+2004-04-12  Juri Linkov  <juri@jurta.org>
+
+	* info.el (Info-follow-reference): Allow multiline reference name.
+
+2004-04-11  Dave Love  <fx@gnu.org>
+
+	* url/url-mailto.el (url-mailto):
+	* url/url-history.el (url-history-setup-save-timer):
+	* url/url-cookie.el (url-cookie-setup-save-timer): Avoid warnings.
+
+	* url/url-file.el (url-file-build-filename): Don't use
+	directory-sep-char.
+
+	* url/url-auth.el (url-register-auth-scheme): Fix `format' call.
+
+	* url/url-about.el (url-scheme-registry): Defvar.
+	(url-about): Use text/plain.
+
+	* url/url-vars.el (cl): Don't require.
+	(url): Add :version.
+	(url-bug-address): Use bug-gnu-emacs.
+
+	* url/url-util.el (url-hexify-string): Don't give multibyte error
+	for char <16.
+	(mail-header-extract): Autoload.
+
+	* url/url-parse.el: Doc fixes.
+
+	* url/url-ldap.el (ldap): Require.
+	(url-ldap): Fix `format' call.
+	(url-ldap-certificate-formatter): Avoid warning.
+
+	* url/url-https.el (url-https-create-secure-wrapper): Use modern
+	backquotes.
+
+	* url/url-dav.el (url-dav-rename-file): Fix args of `signal'.
+	(url-intersection): New.
+	(url-dav-supported-p): Use it.
+	(url-dav-save-resource): Declare url-http-response-status special.
+
+	* url/url-cache.el (url-util): Require.
+
+	* emacs-lisp/bytecomp.el (byte-compile-cond): Fix last change.
+
+	* progmodes/python.el: New file.
+
+2004-04-11  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc-hooks.el (vc-arg-list): Function removed.
+	(vc-default-workfile-unchanged-p): Use condition-case to check for
+	backward compatibility.
+
+	* vc.el (vc-print-log): Use condition-case to check for backward
+	compatibility.
+
+2004-04-11  Juri Linkov  <juri@jurta.org>
+
+	* dired.el (dired-faces): New defgroup.
+	(dired-header, dired-mark, dired-marked, dired-flagged)
+	(dired-warning, dired-directory, dired-symlink, dired-ignored):
+	New faces.
+	(dired-header-face, dired-mark-face, dired-marked-face)
+	(dired-flagged-face, dired-warning-face, dired-directory-face)
+	(dired-symlink-face, dired-ignored-face): New face variables.
+	(dired-font-lock-keywords): Use them instead of font-lock faces.
+	Split the rule for dired marks into 3 separate rules: for marks,
+	marked file names and flagged file names.
+
+	* help-mode.el (help-make-xrefs): Add a final newline to the
+	*Help* buffer.
+
+2004-04-11  John Paul Wallington  <jpw@gnu.org>
+
+	* replace.el (occur-engine): Distinguish between one and several
+	matches in the matches per buffer heading.
+
 2004-04-11  Kim F. Storm  <storm@cua.dk>
 
 	* ido.el (ido-confirm-unique-completion): New defcustom.
 ;;;_  : Version
 ;;;_   = allout-version
 (defvar allout-version
-  (let ((rcs-rev "$Revision: 1.48 $"))
+  (let ((rcs-rev "$Revision$"))
     (condition-case err
 	(save-match-data
 	  (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev)
 of the line (\\n or \\r).
 Subexpression 2 must end right before the \\n or \\r.")
 
+(defgroup dired-faces nil
+  "Faces used by dired."
+  :group 'dired
+  :group 'faces)
+
+(defface dired-header
+  '((t (:inherit font-lock-type-face)))
+  "Face used for directory headers."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-header-face 'dired-header
+  "Face name used for directory headers.")
+
+(defface dired-mark
+  '((t (:inherit font-lock-constant-face)))
+  "Face used for dired marks."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-mark-face 'dired-mark
+  "Face name used for dired marks.")
+
+(defface dired-marked
+  '((t (:inherit font-lock-warning-face)))
+  "Face used for marked files."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-marked-face 'dired-marked
+  "Face name used for marked files.")
+
+(defface dired-flagged
+  '((t (:inherit font-lock-warning-face)))
+  "Face used for flagged files."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-flagged-face 'dired-flagged
+  "Face name used for flagged files.")
+
+(defface dired-warning
+  '((t (:inherit font-lock-comment-face)))
+  "Face used to highlight a part of a buffer that needs user attention."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-warning-face 'dired-warning
+  "Face name used for a part of a buffer that needs user attention.")
+
+(defface dired-directory
+  '((t (:inherit font-lock-function-name-face)))
+  "Face used for subdirectories."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-directory-face 'dired-directory
+  "Face name used for subdirectories.")
+
+(defface dired-symlink
+  '((t (:inherit font-lock-keyword-face)))
+  "Face used for symbolic links."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-symlink-face 'dired-symlink
+  "Face name used for symbolic links.")
+
+(defface dired-ignored
+  '((t (:inherit font-lock-string-face)))
+  "Face used for files suffixed with `completion-ignored-extensions'."
+  :group 'dired-faces
+  :version "21.4")
+(defvar dired-ignored-face 'dired-ignored
+  "Face name used for files suffixed with `completion-ignored-extensions'.")
+
 (defvar dired-font-lock-keywords
   (list
    ;;
    ;; Directory headers.
-   (list dired-subdir-regexp '(1 font-lock-type-face))
+   (list dired-subdir-regexp '(1 dired-header-face))
+   ;;
+   ;; Dired marks.
+   (list dired-re-mark '(0 dired-mark-face))
    ;;
    ;; We make heavy use of MATCH-ANCHORED, since the regexps don't identify the
    ;; file name itself.  We search for Dired defined regexps, and then use the
    ;; Dired defined function `dired-move-to-filename' before searching for the
    ;; simple regexp ".+".  It is that regexp which matches the file name.
    ;;
-   ;; Dired marks.
-   (list dired-re-mark
-	 '(0 font-lock-constant-face)
-	 '(".+" (dired-move-to-filename) nil (0 font-lock-warning-face)))
+   ;; Marked files.
+   (list (concat "^[" (char-to-string dired-marker-char) "]")
+         '(".+" (dired-move-to-filename) nil (0 dired-marked-face)))
+   ;;
+   ;; Flagged files.
+   (list (concat "^[" (char-to-string dired-del-marker) "]")
+         '(".+" (dired-move-to-filename) nil (0 dired-flagged-face)))
    ;; People who are paranoid about security would consider this more
    ;; important than other things such as whether it is a directory.
    ;; But we don't want to encourage paranoia, so our default
 ;;;   ;; Files that are group or world writable.
 ;;;   (list (concat dired-re-maybe-mark dired-re-inode-size
 ;;;		 "\\([-d]\\(....w....\\|.......w.\\)\\)")
-;;;	 '(1 font-lock-comment-face)
-;;;	 '(".+" (dired-move-to-filename) nil (0 font-lock-comment-face)))
+;;;	 '(1 dired-warning-face)
+;;;	 '(".+" (dired-move-to-filename) nil (0 dired-warning-face)))
    ;; However, we don't need to highlight the file name, only the
    ;; permissions, to win generally.  -- fx.
    ;; Fixme: we could also put text properties on the permission
    ;; fields with keymaps to frob the permissions, somewhat a la XEmacs.
    (list (concat dired-re-maybe-mark dired-re-inode-size
 		 "[-d]....\\(w\\)....")	; group writable
-	 '(1 font-lock-comment-face))
+	 '(1 dired-warning-face))
    (list (concat dired-re-maybe-mark dired-re-inode-size
 		 "[-d].......\\(w\\).")	; world writable
-	 '(1 font-lock-comment-face))
+	 '(1 dired-warning-face))
    ;;
    ;; Subdirectories.
    (list dired-re-dir
-	 '(".+" (dired-move-to-filename) nil (0 font-lock-function-name-face)))
+	 '(".+" (dired-move-to-filename) nil (0 dired-directory-face)))
    ;;
    ;; Symbolic links.
    (list dired-re-sym
-	 '(".+" (dired-move-to-filename) nil (0 font-lock-keyword-face)))
+	 '(".+" (dired-move-to-filename) nil (0 dired-symlink-face)))
    ;;
    ;; Files suffixed with `completion-ignored-extensions'.
    '(eval .
      ;; It is quicker to first find just an extension, then go back to the
      ;; start of that file name.  So we do this complex MATCH-ANCHORED form.
      (list (concat "\\(" (regexp-opt completion-ignored-extensions) "\\|#\\)$")
-	   '(".+" (dired-move-to-filename) nil (0 font-lock-string-face)))))
+	   '(".+" (dired-move-to-filename) nil (0 dired-ignored-face)))))
   "Additional expressions to highlight in Dired mode.")
 
 ;;; Macros must be defined before they are used, for the byte compiler.

lisp/emacs-lisp/bytecomp.el

 		 (byte-compile-goto 'byte-goto donetag)
 		 (byte-compile-out-tag nexttag)))))
     ;; Last clause
-    (and (cdr clause) (not (eq (car clause) t))
-	 (progn (byte-compile-maybe-guarded (car clause)
-					    (byte-compile-form (car clause)))
-		(byte-compile-goto-if nil for-effect donetag)
-		(setq clause (cdr clause))))
-    (byte-compile-body-do-effect clause)
+    (let ((guard (car clause)))
+      (and (cdr clause) (not (eq guard t))
+	   (progn (byte-compile-form guard)
+		  (byte-compile-goto-if nil for-effect donetag)
+		  (setq clause (cdr clause))))
+      (byte-compile-maybe-guarded guard
+	(byte-compile-body-do-effect clause)))
     (byte-compile-out-tag donetag)))
 
 (defun byte-compile-and (form)
 	(goto-char (point-max))
 	(while (and (not (bobp)) (bolp))
 	  (delete-char -1))
+        (insert "\n")
         ;; Make a back-reference in this buffer if appropriate.
         (when help-xref-stack
-	  (insert "\n\n")
+	  (insert "\n")
 	  (help-insert-xref-button help-back-label 'help-back
-				   (current-buffer))))
+				   (current-buffer))
+          (insert "\n")))
       ;; View mode steals RET from us.
       (set (make-local-variable 'minor-mode-overriding-map-alist)
            (list (cons 'view-mode help-xref-override-view-map)))
 
 (defun describe-mode (&optional buffer)
   "Display documentation of current major mode and minor modes.
-The major mode description comes first, followed by the minor modes,
-each on a separate page.
-For this to work correctly for a minor mode, the mode's indicator variable
-\(listed in `minor-mode-alist') must also be a function whose documentation
-describes the minor mode."
+A brief summary of the minor modes comes first, followed by the
+major mode description.  This is followed by detailed
+descriptions of the minor modes, each on a separate page.
+
+For this to work correctly for a minor mode, the mode's indicator
+variable \(listed in `minor-mode-alist') must also be a function
+whose documentation describes the minor mode."
   (interactive)
   (help-setup-xref (list #'describe-mode (or buffer (current-buffer)))
 		   (interactive-p))
     (define-key map [down-mouse-3] 'ibuffer-mouse-popup-menu)
     map))
 
-(defvar ibuffer-delete-window-on-quit nil
-  "Whether or not to delete the window upon exiting `ibuffer'.")
+(defvar ibuffer-restore-window-config-on-quit nil
+  "If non-nil, restore previous window configuration upon exiting `ibuffer'.")
+
+(defvar ibuffer-prev-window-config nil
+  "Window configuration before starting Ibuffer.")
 
 (defvar ibuffer-did-modification nil)
 
 
 (defun ibuffer-quit ()
   "Quit this `ibuffer' session.
-Delete the current window iff `ibuffer-delete-window-on-quit' is non-nil."
+Try to restore the previous window configuration iff
+`ibuffer-restore-window-config-on-quit' is non-nil."
   (interactive)
-  (if ibuffer-delete-window-on-quit
-      (progn
+  (if ibuffer-restore-window-config-on-quit
+      (progn 
 	(bury-buffer)
 	(unless (= (count-windows) 1)
-	  (delete-window)))
+	  (set-window-configuration ibuffer-prev-window-config)))
     (bury-buffer)))
 
 ;;;###autoload
   (interactive "P")
   (when ibuffer-use-other-window
     (setq other-window-p t))
+  (setq ibuffer-prev-window-config (current-window-configuration))
   (let ((buf (get-buffer-create (or name "*Ibuffer*"))))
     (if other-window-p
 	(funcall (if noselect #'(lambda (buf) (display-buffer buf t)) #'pop-to-buffer) buf)
 	(select-window (get-buffer-window buf))
 	(or (eq major-mode 'ibuffer-mode)
 	    (ibuffer-mode))
-	(setq ibuffer-delete-window-on-quit other-window-p)
+	(setq ibuffer-restore-window-config-on-quit other-window-p)
 	(when shrink
 	  (setq ibuffer-shrink-to-minimum-size shrink))
 	(when qualifiers
   (set (make-local-variable 'ibuffer-cached-eliding-string) nil)
   (set (make-local-variable 'ibuffer-cached-elide-long-columns) nil)
   (set (make-local-variable 'ibuffer-current-format) nil)
-  (set (make-local-variable 'ibuffer-delete-window-on-quit) nil)
+  (set (make-local-variable 'ibuffer-restore-window-config-on-quit) nil)
   (set (make-local-variable 'ibuffer-did-modification) nil)
   (set (make-local-variable 'ibuffer-tmp-hide-regexps) nil)
   (set (make-local-variable 'ibuffer-tmp-show-regexps) nil)
           (if (and (save-excursion
                      (goto-char (+ (point) 5)) ; skip a possible *note
                      (re-search-backward "\\*note[ \n\t]+" nil t)
-                     (looking-at (concat "\\*note[ \n\t]+" (Info-following-node-name-re))))
+                     (looking-at (concat "\\*note[ \n\t]+"
+                                         (Info-following-node-name-re "^.,\t"))))
                    (<= (point) (match-end 0)))
               (goto-char (match-beginning 0))))
       ;; Go to the reference closest to point
       (dump-emacs "emacs" "temacs")
       (message "%d pure bytes used" pure-bytes-used)
       ;; Recompute NAME now, so that it isn't set when we dump.
-      (if (not (memq system-type '(ms-dos windows-nt)))
+      (if (not (memq system-type '(ms-dos windows-nt cygwin)))
 	  (let ((name (concat "emacs-" emacs-version)))
 	    (while (string-match "[^-+_.a-zA-Z0-9]+" name)
 	      (setq name (concat (downcase (substring name 0 (match-beginning 0)))
 ;;; ldap.el --- client interface to LDAP for Emacs
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 02, 2004  Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Jan�k <Pavel@Janik.cz>
 ;;; Code:
 
 (require 'custom)
+(eval-when-compile (require 'cl))
 
 (defgroup ldap nil
   "Lightweight Directory Access Protocol."
       (error "No LDAP host specified"))
   (let ((host-plist (cdr (assoc host ldap-host-parameters-alist)))
 	result)
-    (setq result (ldap-search-internal (append host-plist
-					       (list 'host host
-						     'filter filter
-						     'attributes attributes
-						     'attrsonly attrsonly
-						     'withdn withdn))))
+    (setq result (ldap-search-internal (list* 'host host
+					      'filter filter
+					      'attributes attributes
+					      'attrsonly attrsonly
+					      'withdn withdn
+					      host-plist)))
     (if ldap-ignore-attribute-codings
 	result
-      (mapcar (function
-	       (lambda (record)
-		 (mapcar 'ldap-decode-attribute record)))
+      (mapcar (lambda (record)
+		(mapcar 'ldap-decode-attribute record))
 	      result))))
 
 

lisp/progmodes/compile.el

 	  (if (consp line) (setq end-line (cdr line) line (car line)))
 	  (if (consp col)	(setq end-col (cdr col)	  col (car col)))
 	  
-	  (if (symbolp line)
+	  (if (functionp line)
 	      ;; The old compile.el had here an undocumented hook that
 	      ;; allowed `line' to be a function that computed the actual
 	      ;; error location.  Let's do our best.
   (interactive (list last-input-event))
   (or (compilation-buffer-p (current-buffer))
       (error "Not in a compilation buffer"))
-  (let ((pos (if event (posn-point (event-end event)) (point))))
-    (if (get-text-property (point) 'directory)
-	(dired-other-window (car (get-text-property pos 'directory)))
-      (push-mark)
-      (setq compilation-current-error pos)
-      (next-error 0))))
+  (let* ((loc (event-end event))
+	 (pos (posn-point loc)))
+    (with-selected-window (posn-window loc)
+      (if (get-text-property pos 'directory)
+	  (dired-other-window (car (get-text-property pos 'directory)))
+	(push-mark)
+	(setq compilation-current-error pos)
+	(next-error 0)))))
 
 ;; Return a compilation buffer.
 ;; If the current buffer is a compilation buffer, return it.

lisp/progmodes/python.el

+;;; python.el --- silly walks for Python
+
+;; Copyright (C) 2003, 04  Free Software Foundation, Inc.
+
+;; Author: Dave Love <fx@gnu.org>
+;; Created: Nov 2003
+;; Keywords: languages
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Major mode for editing Python, with support for inferior processes.
+
+;; There is another Python mode, python-mode.el, used by XEmacs and
+;; maintained with Python.  That isn't covered by an FSF copyright
+;; assignment, unlike this code, and seems not to be well-maintained
+;; for Emacs (though I've submitted fixes).  This mode is rather
+;; simpler and is, perhaps, better in other ways.  In particular,
+;; using the syntax functions with text properties maintained by
+;; font-lock should make it more correct with arbitrary string and
+;; comment contents.
+
+;; This doesn't implement all the facilities of python-mode.el.  Some
+;; just need doing, e.g. catching exceptions in the inferior Python
+;; buffer (but see M-x pdb for debugging).  [Atually, the use of
+;; `compilation-minor-mode' now is probably enough for that.]  Others
+;; don't seem appropriate.  For instance, `forward-into-nomenclature'
+;; should be done separately, since it's not specific to Python, and
+;; I've installed a minor mode to do the job properly in Emacs 22.
+;; Other things seem more natural or canonical here, e.g. the
+;; {beginning,end}-of-defun implementation dealing with nested
+;; definitions, and the inferior mode following `cmuscheme'.  (The
+;; inferior mode should be able to find the source of errors from
+;; `python-send-region' & al via `compilation-minor-mode', but I can't
+;; make that work with the current (March '04) compile.el.)
+;; Successive TABs cycle between possible indentations for the line.
+
+;; Even where it has similar facilities, this is incompatible with
+;; python-mode.el in various respects.  For instance, various key
+;; bindings are changed to obey Emacs conventions, and things like
+;; marking blocks and `beginning-of-defun' behave differently.
+
+;;; Code:
+
+(require 'syntax)			; ensure appropriate version
+;; It's messy to autoload the relevant comint functions so that comint
+;; is only required when inferior Python is used.
+(require 'comint)
+
+(defgroup python nil
+  "Silly walks in the Python language"
+  :group 'languages
+  :link '(emacs-commentary-link "python"))
+
+;;;###autoload
+(add-to-list 'interpreter-mode-alist '("jython" . jython-mode))
+;;;###autoload
+(add-to-list 'interpreter-mode-alist '("python" . python-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
+
+;;;; Font lock
+
+(defvar python-font-lock-keywords
+  `(,(rx (and word-start
+	      ;; From v 2.3 reference.
+	      ;; def and class dealt with separately below
+	      (or "and" "assert" "break" "continue" "del" "elif" "else"
+		  "except" "exec" "finally" "for" "from" "global" "if"
+		  "import" "in" "is" "lambda" "not" "or" "pass" "print"
+		  "raise" "return" "try" "while" "yield"
+		  ;; Future keywords
+		  "as" "None")
+	      word-end))
+   (,(rx (and word-start (group "class") (1+ space) (group (1+ word))))
+    (1 font-lock-keyword-face) (2 font-lock-type-face))
+   (,(rx (and word-start (group "def") (1+ space) (group (1+ word))))
+    (1 font-lock-keyword-face) (2 font-lock-function-name-face))))
+
+(defconst python-font-lock-syntactic-keywords
+  ;; Make outer chars of matching triple-quote sequences into generic
+  ;; string delimiters.  Fixme: Is there a better way?
+  `((,(rx (and (group (optional (any "uUrR"))) ; prefix gets syntax property
+	       (optional (any "rR"))	; possible second prefix
+	       (group (syntax string-quote))	; maybe gets property
+	       (backref 2)			; per first quote
+	       (group (backref 2))))		; maybe gets property
+     (1 (python-quote-syntax 1)) (2 (python-quote-syntax 2))
+     (3 (python-quote-syntax 3)))
+    ;; This doesn't really help.
+;;;     (,(rx (and ?\\ (group ?\n))) (1 " "))
+    ))
+
+(defun python-quote-syntax (n)
+  "Put `syntax-table' property correctly on triple quote.
+Used for syntactic keywords.  N is the match number (1, 2 or 3)."
+  ;; Given a triple quote, we have to look backwards for a previous
+  ;; occurrence of the sequence to know whether this is an opening or
+  ;; closing triple.  We also have to sort out a possible prefix --
+  ;; well, we don't _have_ to, but I think it should be treated as
+  ;; part of the string.
+  (let ((tag (save-excursion
+	       (goto-char (match-beginning 0))
+	       (unless (eq ?\\ (char-before))
+		 (cond
+		  ;; Look for a previous string fence.
+		  ((or (zerop (skip-syntax-backward "^|"))
+		       (bobp))
+		   'start)		; no previous string fence
+		  ;; Check fence on a matching quote.
+		  ((eq (char-before) (char-after (match-beginning 2)))
+		   (if (eq (char-before) (char-after))
+		       'end		; fence ended string
+		     'start))		; began string
+		  ;; Check for matching prefixed string.
+		  ((and (memq (char-before) '(?u ?U ?r ?R))
+			(skip-chars-forward "rR"))
+		   (if (eq (char-after) (char-after (match-beginning 2)))
+		       'end))	       ; else non-matching: return nil
+		  ;; For non-matching quote,  start new string.
+		  ((/= (char-before) (char-after))
+		   'start))))))
+    (if (if (eq tag 'start)		; Maybe starts a new string.
+	    ;; Initial property if this is the prefix (empty or not) or
+	    ;; isn't the prefix and the prefix is empty.
+	    (or (= n 1) (and (= n 2) (= (match-beginning 1) (match-end 1))))
+	  (and (eq tag 'end)		; Maybe ends existing string.
+	       (= n 3)))		; Match is at end.
+	(eval-when-compile (string-to-syntax "|"))
+      ;; Otherwise the property is nil, which is OK.
+      )))
+
+;; This isn't currently in `font-lock-defaults' as probably not worth
+;; it -- we basically only mess with a few normally-symbol characters.
+
+;; (defun python-font-lock-syntactic-face-function (state)
+;;   "`font-lock-syntactic-face-function' for Python mode.
+;; Returns the string or comment face as usual, with side effect of putting
+;; a `syntax-table' property on the inside of the string or comment which is
+;; the standard syntax table."
+;;   (if (nth 3 state)
+;;       (save-excursion
+;; 	(goto-char (nth 8 state))
+;; 	(condition-case nil
+;; 	    (forward-sexp)
+;; 	  (error nil))
+;; 	(put-text-property (1+ (nth 8 state)) (1- (point))
+;; 			   'syntax-table (standard-syntax-table))
+;; 	'font-lock-string-face)
+;;     (put-text-property (1+ (nth 8 state)) (line-end-position)
+;; 			   'syntax-table (standard-syntax-table))
+;;     'font-lock-comment-face))
+
+;;;; Keymap and syntax
+
+(defvar python-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; Mostly taken from python-mode.el.
+    (define-key map ":" 'python-electric-colon)
+    (define-key map "\177" 'python-backspace)
+    (define-key map "\C-c<" 'python-shift-left)
+    (define-key map "\C-c>" 'python-shift-right)
+    (define-key map "\C-c\C-k" 'python-mark-block)
+    (define-key map "\C-c\C-n" 'python-next-statement)
+    (define-key map "\C-c\C-p" 'python-previous-statement)
+    (define-key map "\C-c\C-u" 'python-beginning-of-block)
+    (define-key map "\C-c\C-f" 'python-describe-symbol)
+    (define-key map "\C-c\C-w" 'python-check)
+    (define-key map "\C-c\C-v" 'python-check) ; a la sgml-mode
+    (define-key map "\C-c\C-s" 'python-send-string)
+    (define-key map [?\C-\M-x] 'python-send-defun)
+    (define-key map "\C-c\C-r" 'python-send-region)
+    (define-key map "\C-c\M-r" 'python-send-region-and-go)
+    (define-key map "\C-c\C-c" 'python-send-buffer)
+    (define-key map "\C-c\C-z" 'python-switch-to-python)
+    (define-key map "\C-c\C-m" 'python-load-file)
+    (define-key map "\C-c\C-l" 'python-load-file) ; a la cmuscheme
+    ;; Fixme: Add :help to menu.
+    (easy-menu-define python-menu map "Python Mode menu"
+      '("Python"
+	["Shift region left" python-shift-left :active mark-active]
+	["Shift region right" python-shift-right :active mark-active]
+	"-"
+	["Mark block" python-mark-block]
+	["Mark def/class" mark-defun
+	 :help "Mark innermost definition around point"]
+	"-"
+	["Start of block" python-beginning-of-block]
+	["End of block" python-end-of-block]
+	["Start of def/class" beginning-of-defun
+	 :help "Go to start of innermost definition around point"]
+	["End of def/class" end-of-defun
+	 :help "Go to end of innermost definition around point"]
+	"-"
+	["Start interpreter" run-python
+	 :help "Run `inferior' Python in separate buffer"]
+	["Import/reload file" python-load-file
+	 :help "Load into inferior Python session"]
+	["Eval buffer" python-send-buffer
+	 :help "Evaluate buffer en bloc in inferior Python session"]
+	["Eval region" python-send-region :active mark-active
+	 :help "Evaluate region en bloc in inferior Python session"]
+	["Eval def/class" python-send-defun
+	 :help "Evaluate current definition in inferior Python session"]
+	["Switch to interpreter" python-switch-to-python
+	 :help "Switch to inferior Python buffer"]
+	["Check file" python-check :help "Run pychecker"]
+	["Debugger" pdb :help "Run pdb under GUD"]
+	"-"
+	["Help on symbol" python-describe-symbol
+	 :help "Use pydoc on symbol at point"]))
+    map))
+
+(defvar python-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    ;; Give punctuation syntax to ASCII that normally has symbol
+    ;; syntax or has word syntax and isn't a letter.
+    (let ((symbol (string-to-syntax "_"))
+	  (sst (standard-syntax-table)))
+      (dotimes (i 128)
+	(unless (= i ?_)
+	  (if (equal symbol (aref sst i))
+	      (modify-syntax-entry i "." table)))))
+    (modify-syntax-entry ?$ "." table)
+    (modify-syntax-entry ?% "." table)
+    ;; exceptions
+    (modify-syntax-entry ?# "<" table)
+    (modify-syntax-entry ?\n ">" table)
+    (modify-syntax-entry ?' "\"" table)
+    (modify-syntax-entry ?` "$" table)
+    table))
+
+;;;; Utility stuff
+
+(defsubst python-in-string/comment ()
+  "Return non-nil if point is in a Python literal (a comment or string).
+Optional argument LIM indicates the beginning of the containing form,
+i.e. the limit on how far back to scan."
+  (syntax-ppss-context (syntax-ppss)))
+
+(defconst python-space-backslash-table
+  (let ((table (copy-syntax-table python-mode-syntax-table)))
+    (modify-syntax-entry ?\\ " " table)
+    table)
+  "`python-mode-syntax-table' with backslash given whitespace syntax.")
+
+(defun python-skip-comments/blanks (&optional backward)
+  "Skip comments and blank lines.
+BACKWARD non-nil means go backwards, otherwise go forwards.  Backslash is
+treated as whitespace so that continued blank lines are skipped.
+Doesn't move out of comments -- should be outside or at end of line."
+  (with-syntax-table python-space-backslash-table
+    (forward-comment (if backward
+			 most-negative-fixnum
+		       most-positive-fixnum))))
+
+(defun python-backslash-continuation-line-p ()
+  "Non-nil if preceding line ends with backslash that is not in a comment."
+  (and (eq ?\\ (char-before (line-end-position 0)))
+       (not (syntax-ppss-context (syntax-ppss)))))
+
+(defun python-continuation-line-p ()
+  "Return non-nil if current line continues a previous one.
+The criteria are that the previous line ends in a backslash outside
+comments and strings, or that the bracket/paren nesting depth is nonzero."
+  (or (and (eq ?\\ (char-before (line-end-position 0)))
+	   (not (syntax-ppss-context (syntax-ppss))))
+      (/= 0 (syntax-ppss-depth
+	     (save-excursion	  ; syntax-ppss with arg changes point
+	       (syntax-ppss (line-beginning-position)))))))
+
+(defun python-comment-line-p ()
+  "Return non-nil if current line has only a comment or is blank."
+  (save-excursion
+    (back-to-indentation)
+    (looking-at (rx (or (syntax comment-start) line-end)))))
+
+(defun python-beginning-of-string ()
+  "Go to beginning of string around point.
+Do nothing if not in string."
+  (let ((state (syntax-ppss)))
+    (when (nth 3 state)
+      (goto-char (nth 8 state)))))
+
+(defun python-open-block-statement-p (&optional bos)
+  "Return non-nil if statement at point opens a block.
+BOS non-nil means point is known to be at beginning of statement."
+  (save-excursion
+    (unless bos (python-beginning-of-statement))
+    (and (not (python-comment-line-p))
+	 (re-search-forward (rx (and ?: (0+ space)
+				     (optional (and (syntax comment-start)
+						    (0+ not-newline)))
+				     line-end))
+			    (save-excursion (python-end-of-statement))
+			    t)
+	 (not (python-in-string/comment)))))
+
+(defun python-close-block-statement-p (&optional bos)
+  "Return non-nil if current line is a statement closing a block.
+BOS non-nil means point is at beginning of statement.
+The criteria are that the line isn't a comment or in string and starts with
+keyword `raise', `break', `continue' or `pass'."
+  (save-excursion
+    (unless bos (python-beginning-of-statement))
+    (back-to-indentation)
+    (looking-at (rx (and (or "return" "raise" "break" "continue" "pass")
+			 word-end)))))
+
+(defun python-outdent-p ()
+  "Return non-nil if current line should outdent a level."
+  (save-excursion
+    (back-to-indentation)
+    (and (looking-at (rx (and (or (and (or "else" "finally") word-end)
+				  (and (or "except" "elif") word-end
+				       (1+ (not (any ?:)))))
+			      (optional space) ":" (optional space)
+			      (or (syntax comment-start) line-end))))
+	 (progn (end-of-line)
+		(not (python-in-string/comment)))
+	 ;; Ensure there's a previous statement and move to it.
+	 (zerop (python-previous-statement))
+	 (not (python-close-block-statement-p t))
+	 ;; Fixme: check this
+	 (not (looking-at (rx (and (or (and (or "if" "elif" "except"
+						"for" "while")
+					    word-end (1+ (not (any ?:))))
+				       (and "try" word-end))
+				   (optional space) ":" (optional space)
+				   (or (syntax comment-start) line-end)))))
+	 (progn (end-of-line)
+		(not (python-in-string/comment))))))
+
+;;;; Indentation.
+
+(defcustom python-indent 4
+  "*Number of columns for a unit of indentation in Python mode.
+See also `\\[python-guess-indent]'"
+  :group 'python
+  :type 'integer)
+
+(defcustom python-guess-indent t
+  "*Non-nil means Python mode guesses `python-indent' for the buffer."
+  :type 'boolean
+  :group 'python)
+
+(defcustom python-indent-string-contents t
+  "*Non-nil means indent contents of multi-line strings together.
+This means indent them the same as the preceding non-blank line.
+Otherwise indent them to column zero."
+  :type '(choice (const :tag "Align with preceding" t)
+		 (const :tag "Indent to column 0" nil))
+  :group 'python)
+
+(defcustom python-honour-comment-indentation nil
+  "Non-nil means indent relative to preceding comment line.
+Only do this for comments where the leading comment character is followed
+by space."
+  :type 'boolean
+  :group 'python)
+
+(defcustom python-continuation-offset 4
+  "*Number of columns of additional indentation for continuation lines.
+Continuation lines follow a backslash-terminated line starting a statement."
+  :group 'python
+  :type 'integer)
+
+(defun python-guess-indent ()
+  "Guess step for indentation of current buffer.
+Set `python-indent' locally to the value guessed."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (let (done indent)
+      (while (and (not done) (not (eobp)))
+	(when (and (re-search-forward (rx (and ?: (0+ space)
+					       (or (syntax comment-start)
+						   line-end)))
+				      nil 'move)
+		   (python-open-block-statement-p))
+	  (save-excursion
+	    (python-beginning-of-statement)
+	    (let ((initial (current-indentation)))
+	      (if (zerop (python-next-statement))
+		  (setq indent (- (current-indentation) initial)))
+	      (if (and (>= indent 2) (<= indent 8)) ; sanity check
+		  (setq done t))))))
+      (when done
+	(when (/= indent (default-value 'python-indent))
+	  (set (make-local-variable 'python-indent) indent)
+	  (unless (= tab-width python-indent)
+	    (setq indent-tabs-mode nil)))
+	indent))))
+
+(defun python-calculate-indentation ()
+  "Calculate Python indentation for line at point."
+  (save-excursion
+    (beginning-of-line)
+    (let ((syntax (syntax-ppss))
+	  start)
+      (cond
+       ((eq 'string (syntax-ppss-context syntax)) ; multi-line string
+	(if (not python-indent-string-contents)
+	    0
+	  (save-excursion
+	    ;; Find indentation of preceding non-blank line within string.
+	    (setq start (nth 8 syntax))
+	    (forward-line -1)
+	    (while (and (< start (point)) (looking-at "\\s-*$"))
+	      (forward-line -1))
+	    (current-indentation))))
+       ((python-continuation-line-p)
+	(let ((point (point))
+	      (open-start (cadr syntax)))
+	  (if open-start
+	      ;; Inside bracketed expression.
+	      (progn
+		(goto-char (1+ open-start))
+		;; Look for first item in list (preceding point) and
+		;; align with it, if found.
+		(if (with-syntax-table python-space-backslash-table
+		      (let ((parse-sexp-ignore-comments t))
+			(condition-case ()
+			    (progn (forward-sexp)
+				   (backward-sexp)
+				   (< (point) point))
+			  (error nil))))
+		    (current-column)
+		  ;; Otherwise indent relative to statement start, one
+		  ;; level per bracketing level.
+		  (goto-char (1+ open-start))
+		  (python-beginning-of-statement)
+		  (+ (current-indentation) (* (car syntax) python-indent))))
+	    ;; Otherwise backslash-continued.
+	    (forward-line -1)
+	    (if (python-continuation-line-p)
+		;; We're past first continuation line.  Align with
+		;; previous line.
+		(current-indentation)
+	      ;; First continuation line.  Indent one step, with an
+	      ;; extra one if statement opens a block.
+	      (save-excursion
+		(python-beginning-of-statement)
+		(+ (current-indentation) python-continuation-offset
+		   (if (python-open-block-statement-p t)
+		       python-indent
+		     0)))))))
+       ((bobp) 0)
+       ;; Fixme: Like python-mode.el; not convinced by this.
+       ((looking-at (rx (and (0+ space) (syntax comment-start)
+			     (not (any " \t\n"))))) ; non-indentable comment
+	(current-indentation))
+       (t (let ((point (point)))
+	    (if python-honour-comment-indentation
+		;; Back over whitespace, newlines, non-indentable comments.
+		(catch 'done
+		  (while t
+		    (if (cond ((bobp))
+			      ;; not at comment start
+			      ((not (forward-comment -1))
+			       (python-beginning-of-statement)
+			       t)
+			      ;; trailing comment
+			      ((/= (current-column) (current-indentation))
+			       (python-beginning-of-statement)
+			       t)
+			      ;; indentable comment like python-mode.el
+			      ((and (looking-at (rx (and (syntax comment-start)
+							 (or space line-end))))
+				    (/= 0 (current-column)))))
+			(throw 'done t))))
+	      ;; Else back over all comments.
+	      (python-skip-comments/blanks t)
+	      (python-beginning-of-statement))
+	    ;; don't lose on bogus outdent
+	    (max 0 (+ (current-indentation)
+		      (or (cond ((python-open-block-statement-p t)
+				 python-indent)
+				((python-close-block-statement-p t)
+				 (- python-indent)))
+			  (progn (goto-char point)
+				 (if (python-outdent-p)
+				     (- python-indent)))
+			  0)))))))))
+
+;;;; Cycling through the possible indentations with successive TABs.
+
+;; These don't need to be buffer-local since they're only relevant
+;; during a cycle.
+
+;; Alist of possible indentations and start of statement they would close.
+(defvar python-indent-list nil
+  "Internal use.")
+;; Length of the above
+(defvar python-indent-list-length nil
+  "Internal use.")
+;; Current index into the alist.
+(defvar python-indent-index nil
+  "Internal use.")
+
+(defun python-initial-text ()
+  "Text of line following indentation and ignoring any trailing comment."
+  (buffer-substring (+ (line-beginning-position) (current-indentation))
+		    (save-excursion
+		      (end-of-line)
+		      (forward-comment -1)
+		      (point))))
+
+(defun python-indentation-levels ()
+  "Return a list of possible indentations for this statement.
+Includes the default indentation and those which would close all
+enclosing blocks."
+  (save-excursion
+    (let ((levels (list (cons (current-indentation) nil))))
+      ;; Only one possibility if we immediately follow a block open or
+      ;; are in a continuation line.
+      (unless (or (python-continuation-line-p)
+		  (save-excursion (and (python-previous-statement)
+				       (python-open-block-statement-p t))))
+	(while (python-beginning-of-block)
+	  (push (cons (current-indentation) (python-initial-text))
+		levels)))
+      levels)))
+
+;; This is basically what `python-indent-line' would be if we didn't
+;; do the cycling.
+(defun python-indent-line-1 ()
+  "Subroutine of `python-indent-line'."
+  (let ((target (python-calculate-indentation))
+	(pos (- (point-max) (point))))
+    (if (= target (current-indentation))
+	(if (< (current-column) (current-indentation))
+	    (back-to-indentation))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (indent-to target)
+      (if (> (- (point-max) pos) (point))
+	  (goto-char (- (point-max) pos))))))
+
+;; Fixme: Is the arg necessary?
+(defun python-indent-line (&optional arg)
+  "Indent current line as Python code.
+When invoked via `indent-for-tab-command', cycle through possible
+indentations for current line.  The cycle is broken by a command different
+from `indent-for-tab-command', i.e. successive TABs do the cycling."
+  (interactive)
+  ;; Don't do extra work if invoked via `indent-region', for instance.
+  (if (not (eq this-command 'indent-for-tab-command))
+      (python-indent-line-1)
+    (if (eq last-command this-command)
+	(if (= 1 python-indent-list-length)
+	    (message "Sole indentation")
+	  (progn (setq python-indent-index (% (1+ python-indent-index)
+					      python-indent-list-length))
+		 (beginning-of-line)
+		 (delete-horizontal-space)
+		 (indent-to (car (nth python-indent-index python-indent-list)))
+		 (let ((text (cdr (nth python-indent-index
+				       python-indent-list))))
+		   (if text (message "Closes: %s" text)))))
+      (python-indent-line-1)
+      (setq python-indent-list (python-indentation-levels)
+	    python-indent-list-length (length python-indent-list)
+	    python-indent-index (1- python-indent-list-length)))))
+
+;;;; Movement.
+
+(defun python-beginning-of-defun ()
+  "`beginning-of-defun-function' for Python.
+Finds beginning of innermost nested class or method definition.
+Returns the name of the definition found at the end, or nil if reached
+start of buffer."
+  (let ((ci (current-indentation))
+	(def-re (rx (and line-start (0+ space) (or "def" "class")
+			 (1+ space)
+			 (group (1+ (or word (syntax symbol)))))))
+	point found lep def-line)
+    (if (python-comment-line-p)
+	(setq ci most-positive-fixnum))
+    (while (and (not (bobp)) (not found))
+      ;; Treat bol at beginning of function as outside function so
+      ;; that successive C-M-a makes progress backwards.
+      (setq def-line (looking-at def-re))
+      (unless (bolp) (end-of-line))
+      (setq lep (line-end-position))
+      (if (and (re-search-backward def-re nil 'move)
+	       ;; Must be less indented or matching top level, or
+	       ;; equally indented if we started on a definition line.
+	       (let ((in (current-indentation)))
+	       (or (and (zerop ci) (zerop in))
+		   (= lep (line-end-position)) ; on initial line
+		   (and def-line (= in ci))
+		   (< in ci)))
+	       (not (python-in-string/comment)))
+	  (setq found t)))))
+
+(defun python-end-of-defun ()
+  "`end-of-defun-function' for Python.
+Finds end of innermost nested class or method definition."
+  (let ((orig (point))
+	(pattern (rx (and line-start (0+ space)
+			  (or "def" "class") space))))
+    ;; Go to start of current block and check whether it's at top
+    ;; level.  If it is, and not a block start, look forward for
+    ;; definition statement.
+    (when (python-comment-line-p)
+      (end-of-line)
+      (forward-comment most-positive-fixnum))
+    (if (not (python-open-block-statement-p))
+	(python-beginning-of-block))
+    (if (zerop (current-indentation))
+	(unless (python-open-block-statement-p)
+	  (while (and (re-search-forward pattern nil 'move)
+		      (python-in-string/comment))) ; just loop
+	  (unless (eobp)
+	    (beginning-of-line)))
+      ;; Don't move before top-level statement that would end defun.
+      (end-of-line)
+      (python-beginning-of-defun))
+    ;; If we got to the start of buffer, look forward for
+    ;; definition statement.
+    (if (and (bobp) (not (looking-at "def\\|class")))
+	(while (and (not (eobp))
+		    (re-search-forward pattern nil 'move)
+		    (python-in-string/comment)))) ; just loop
+    ;; We're at a definition statement (or end-of-buffer).
+    (unless (eobp)
+      (python-end-of-block)
+      ;; Count trailing space in defun (but not trailing comments).
+      (skip-syntax-forward " >")
+      (beginning-of-line))
+    ;; Catch pathological case like this, where the beginning-of-defun
+    ;; skips to a definition we're not in:
+    ;; if ...:
+    ;;     ...
+    ;; else:
+    ;;     ...  # point here
+    ;;     ...
+    ;;     def ...
+    (if (< (point) orig)
+	(goto-char (point-max)))))
+
+(defun python-beginning-of-statement ()
+  "Go to start of current statement.
+Accounts for continuation lines, multi-line strings, and multi-line bracketed
+expressions."
+  (beginning-of-line)
+  (python-beginning-of-string)
+  (while (python-continuation-line-p)
+    (beginning-of-line)
+    (if (python-backslash-continuation-line-p)
+	(while (python-backslash-continuation-line-p)
+	  (forward-line -1))
+      (python-beginning-of-string)
+      ;; Skip forward out of nested brackets.
+      (condition-case ()		; beware invalid syntax
+	  (progn (backward-up-list (syntax-ppss-depth (syntax-ppss))) t)
+	(error (end-of-line)))))
+  (back-to-indentation))
+
+(defun python-end-of-statement ()
+  "Go to the end of the current statement and return point.
+Usually this is the start of the next line, but if this is a
+multi-line statement we need to skip over the continuation lines.
+On a comment line, go to end of line."
+  (end-of-line)
+  (while (let (comment)
+	   ;; Move past any enclosing strings and sexps, or stop if
+	   ;; we're in a comment.
+	   (while (let ((s (syntax-ppss)))
+		    (cond ((eq 'comment (syntax-ppss-context s))
+			   (setq comment t)
+			   nil)
+			  ((eq 'string (syntax-ppss-context s))
+			   ;; Go to start of string and skip it.
+			   (goto-char (nth 8 s))
+			   (condition-case () ; beware invalid syntax
+			       (progn (forward-sexp) t)
+			     (error (end-of-line))))
+			  ((> (syntax-ppss-depth s) 0)
+			   ;; Skip forward out of nested brackets.
+			   (condition-case () ; beware invalid syntax
+			       (progn (backward-up-list
+				       (- (syntax-ppss-depth s)))
+				      t)
+			     (error (end-of-line))))))
+	     (end-of-line))
+	   (unless comment
+	     (eq ?\\ (char-before))))	; Line continued?
+    (end-of-line 2))			; Try next line.
+  (point))
+
+(defun python-previous-statement (&optional count)
+  "Go to start of previous statement.
+With argument COUNT, do it COUNT times.  Stop at beginning of buffer.
+Return count of statements left to move."
+  (interactive "p")
+  (unless count (setq count 1))
+  (if (< count 0)
+      (python-next-statement (- count))
+    (python-beginning-of-statement)
+    (while (and (> count 0) (not (bobp)))
+      (python-skip-comments/blanks t)
+      (python-beginning-of-statement)
+      (unless (bobp) (setq count (1- count))))
+    count))
+
+(defun python-next-statement (&optional count)
+  "Go to start of next statement.
+With argument COUNT, do it COUNT times.  Stop at end of buffer.
+Return count of statements left to move."
+  (interactive "p")
+  (unless count (setq count 1))
+  (if (< count 0)
+      (python-previous-statement (- count))
+    (beginning-of-line)
+    (while (and (> count 0) (not (eobp)))
+      (python-end-of-statement)
+      (python-skip-comments/blanks)
+      (setq count (1- count)))
+    count))
+
+(defun python-beginning-of-block (&optional arg)
+  "Go to start of current block.
+With numeric arg, do it that many times.  If ARG is negative, call
+`python-end-of-block' instead.
+If point is on the first line of a block, use its outer block.
+If current statement is in column zero, don't move and return nil.
+Otherwise return non-nil."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (cond
+   ((zerop arg))
+   ((< arg 0) (python-end-of-block (- arg)))
+   (t
+    (let ((point (point)))
+      (if (python-comment-line-p)
+	  (python-skip-comments/blanks t))
+      (python-beginning-of-statement)
+      (let ((ci (current-indentation)))
+	(if (zerop ci)
+	    (not (goto-char point))	; return nil
+	  ;; Look upwards for less indented statement.
+	  (if (catch 'done
+;;; This is slower than the below.
+;;; 	  (while (zerop (python-previous-statement))
+;;; 	    (when (and (< (current-indentation) ci)
+;;; 		       (python-open-block-statement-p t))
+;;; 	      (beginning-of-line)
+;;; 	      (throw 'done t)))
+		(while (and (zerop (forward-line -1)))
+		  (when (and (< (current-indentation) ci)
+			     (not (python-comment-line-p))
+			     ;; Move to beginning to save effort in case
+			     ;; this is in string.
+			     (progn (python-beginning-of-statement) t)
+			     (python-open-block-statement-p t))
+		    (beginning-of-line)
+		    (throw 'done t)))
+		(not (goto-char point))) ; Failed -- return nil
+	      (python-beginning-of-block (1- arg)))))))))
+
+(defun python-end-of-block (&optional arg)
+  "Go to end of current block.
+With numeric arg, do it that many times.  If ARG is negative, call
+`python-beginning-of-block' instead.
+If current statement is in column zero and doesn't open a block, don't
+move and return nil.  Otherwise return t."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (if (< arg 0)
+      (python-beginning-of-block (- arg)))
+  (while (and (> arg 0)
+	      (let* ((point (point))
+		     (_ (if (python-comment-line-p)
+			    (python-skip-comments/blanks t)))
+		     (ci (current-indentation))
+		     (open (python-open-block-statement-p)))
+		(if (and (zerop ci) (not open))
+		    (not (goto-char point))
+		  (catch 'done
+		    (while (zerop (python-next-statement))
+		      (when (or (and open (<= (current-indentation) ci))
+				(< (current-indentation) ci))
+			(python-skip-comments/blanks t)
+			(beginning-of-line 2)
+			(throw 'done t)))
+		    (not (goto-char point))))))
+    (setq arg (1- arg)))
+  (zerop arg))
+
+;;;; Imenu.
+
+(defun python-imenu-create-index ()
+  "`imenu-create-index-function' for Python.
+
+Makes nested Imenu menus from nested `class' and `def' statements.
+The nested menus are headed by an item referencing the outer
+definition; it has a space prepended to the name so that it sorts
+first with `imenu--sort-by-name'."
+  (unless (boundp 'recursing)		; dynamically bound below
+    (goto-char (point-min)))		; normal call from Imenu
+  (let (index-alist			; accumulated value to return
+	name is-class pos)
+    (while (re-search-forward
+	    (rx (and line-start (0+ space) ; leading space
+		     (or (group "def") (group "class"))	    ; type
+		     (1+ space) (group (1+ (or word ?_))))) ; name
+	    nil t)
+      (unless (python-in-string/comment)
+	(let ((pos (match-beginning 0))
+	      (name (match-string-no-properties 3)))
+	  (if (match-beginning 2)	; def or class?
+	      (setq name (concat "class " name)))
+	  (save-restriction
+	    (narrow-to-defun)
+	    (let* ((recursing t)
+		   (sublist (python-imenu-create-index)))
+	      (if sublist
+		  (progn (push (cons (concat " " name) pos) sublist)
+			 (push (cons name sublist) index-alist))
+		(push (cons name pos) index-alist)))))))
+    (nreverse index-alist)))
+
+;;;; `Electric' commands.
+
+(defun python-electric-colon (arg)
+  "Insert a colon and maybe outdent the line if it is a statement like `else'.
+With numeric ARG, just insert that many colons.  With \\[universal-argument],
+just insert a single colon."
+  (interactive "*P")
+  (self-insert-command (if (not (integerp arg)) 1 arg))
+  (and (not arg)
+       (eolp)
+       (python-outdent-p)
+       (not (python-in-string/comment))
+       (> (current-indentation) (python-calculate-indentation))
+       (python-indent-line)))		; OK, do it
+(put 'python-electric-colon 'delete-selection t)
+
+(defun python-backspace (arg)
+  "Maybe delete a level of indentation on the current line.
+If not at the end of line's indentation, or on a comment line, just call
+`backward-delete-char-untabify'.  With ARG, repeat that many times."
+  (interactive "*p")
+  (if (or (/= (current-indentation) (current-column))
+	  (bolp)
+	  (python-continuation-line-p))
+      (backward-delete-char-untabify arg)
+    (let ((indent 0))
+      (save-excursion
+	(while (and (> arg 0) (python-beginning-of-block))
+	  (setq arg (1- arg)))
+	(when (zerop arg)
+	  (setq indent (current-indentation))
+	  (message "Closes %s" (python-initial-text))))
+      (delete-horizontal-space)
+      (indent-to indent))))
+(put 'python-backspace 'delete-selection 'supersede)
+
+;;;; pychecker
+
+(defcustom python-check-command "pychecker --stdlib"
+  "*Command used to check a Python file."
+  :type 'string
+  :group 'python)
+
+(defvar python-saved-check-command nil
+  "Internal use.")
+
+(autoload 'compilation-start "compile")
+
+;; After `sgml-validate-command'.
+(defun python-check (command)
+  "Check a Python file (default current buffer's file).
+Runs COMMAND, a shell command, as if by `compile'.
+See `python-check-command' for the default."
+  (interactive
+   (list (read-string "Checker command: "
+		      (or python-saved-check-command
+			  (concat python-check-command " "
+				  (let ((name (buffer-file-name)))
+				    (if name
+					(file-name-nondirectory name))))))))
+  (setq python-saved-check-command command)
+  (save-some-buffers (not compilation-ask-about-save) nil)
+  (compilation-start command))
+
+;;;; Inferior mode stuff (following cmuscheme).
+
+(defcustom python-python-command "python"
+  "*Shell command to run Python interpreter.
+Any arguments can't contain whitespace."
+  :group 'python
+  :type 'string)
+
+(defcustom python-jython-command "jython"
+  "*Shell command to run Jython interpreter.
+Any arguments can't contain whitespace."
+  :group 'python
+  :type 'string)
+
+(defvar python-command python-python-command
+  "Actual command used to run Python.
+May be `python-python-command' or `python-jython-command'.
+Additional arguments are added when the command is used by `run-python'
+et al.")
+
+(defvar python-buffer nil
+  "*The current python process buffer.
+To run multiple Python processes, start the first with \\[run-python].
+It will be in a buffer named *Python*.  Rename that with
+\\[rename-buffer].  Now start a new process with \\[run-python].  It
+will be in a new buffer, named *Python*.  Switch between the different
+process buffers with \\[switch-to-buffer].
+
+Commands that send text from source buffers to Python processes have
+to choose a process to send to.  This is determined by global variable
+`python-buffer'.  Suppose you have three inferior Pythons running:
+    Buffer	Process
+    foo		python
+    bar		python<2>
+    *Python*    python<3>
+If you do a \\[python-send-region-and-go] command on some Python source
+code, what process does it go to?
+
+- In a process buffer (foo, bar, or *Python*), send it to that process.
+- In some other buffer (e.g. a source file), send it to the process
+  attached to `python-buffer'.
+Process selection is done by function `python-proc'.
+
+Whenever \\[run-python] starts a new process, it resets `python-buffer'
+to be the new process's buffer.  If you only run one process, this will
+do the right thing.  If you run multiple processes, you can change
+`python-buffer' to another process buffer with \\[set-variable].")
+
+(define-derived-mode inferior-python-mode comint-mode "Inferior Python"
+  "Major mode for interacting with an inferior Python process.
+A Python process can be started with \\[run-python].
+
+Hooks `comint-mode-hook' and `inferior-python-mode-hook' are run in
+that order.
+
+You can send text to the inferior Python process from other buffers containing
+Python source.
+ * `python-switch-to-python' switches the current buffer to the Python
+    process buffer.
+ * `python-send-region' sends the current region to the Python process.
+ * `python-send-region-and-go' switches to the Python process buffer
+    after sending the text.
+For running multiple processes in multiple buffers, see `python-buffer'.
+
+\\{inferior-python-mode-map}"
+  :group 'python
+  (set-syntax-table python-mode-syntax-table)
+  (setq mode-line-process '(":%s"))
+  ;; Fixme: Maybe install some python-mode bindings too.
+  (define-key inferior-python-mode-map "\C-c\C-l" 'python-load-file)
+  (define-key inferior-python-mode-map "\C-c\C-z" 'python-switch-to-python)
+  (setq comint-input-filter #'python-input-filter))
+
+(defcustom inferior-python-filter-regexp "\\`\\s-*\\S-?\\S-?\\s-*\\'"
+  "*Input matching this regexp is not saved on the history list.
+Default ignores all inputs of 0, 1, or 2 non-blank characters."
+  :type 'regexp
+  :group 'python)
+
+(defvar python-orig-start-line nil
+  "Line number at start of region sent to inferior Python.")
+
+(defvar python-orig-file nil
+  "File name to associate with errors found in inferior Python.")
+
+(defun python-input-filter (str)
+  "`comint-input-filter' function for inferior Python.
+Don't save anything matching `inferior-python-filter-regexp'.
+Also resets variables for adjusting error messages."
+  (setq python-orig-file nil
+	python-orig-start-line 1)
+  (not (string-match inferior-python-filter-regexp str)))
+
+;; Fixme: Loses with quoted whitespace.
+(defun python-args-to-list (string)
+  (let ((where (string-match "[ \t]" string)))
+    (cond ((null where) (list string))
+	  ((not (= where 0))
+	   (cons (substring string 0 where)
+		 (python-args-to-list (substring string (+ 1 where)))))
+	  (t (let ((pos (string-match "[^ \t]" string)))
+	       (if pos (python-args-to-list (substring string pos))))))))
+
+(defvar compilation-minor-mode-map)
+(defvar compilation-error-list)
+(defvar compilation-parsing-end)
+
+(defconst python-compilation-regexp-alist
+  `((,(rx (and line-start (1+ (any " \t")) "File \""
+	       (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c
+	       "\", line " (group (1+ digit))))
+     1 python-compilation-line-number))
+  "`compilation-error-regexp-alist' for inferior Python.")
+
+(defun python-compilation-line-number (file col)
+  "Return error descriptor of error found for FILE, column COL.
+Used as line-number hook function in `python-compilation-regexp-alist'."
+  (let ((line (save-excursion
+		(goto-char (match-beginning 2))
+		(read (current-buffer)))))
+    (list (point-marker) (if python-orig-file
+			     (list python-orig-file default-directory)
+			   file)
+	  (+ line (1- python-orig-start-line))
+	  nil)))
+
+;;;###autoload
+(defun run-python (cmd)
+  "Run an inferior Python process, input and output via buffer *Python*.
+CMD is the Python command to run.
+If there is a process already running in `*Python*', switch to
+that buffer.  With argument, allows you to edit the initial
+command line (default is the value of `python-command'); `-i' and
+`-c' args will be added to this to support evaluations in the
+REPL.  Runs the hooks `inferior-python-mode-hook' \(after the
+`comint-mode-hook' is run).  \(Type \\[describe-mode] in the
+process buffer for a list of commands.)"
+  (interactive (list (if current-prefix-arg
+			 (read-string "Run Python: " python-command)
+		       python-command)))
+  ;; Fixme: Consider making `python-buffer' buffer-local as a buffer
+  ;; (not a name) in Python buffers from which `run-python' &c is
+  ;; invoked.  Would support multiple processes better.
+  (if (not (comint-check-proc "*Python*"))
+      (let ((cmdlist (append (python-args-to-list cmd)
+			     '("-i" "-c" "\
+from os import remove as _emacs_rem
+def _emacs_execfile (file):
+    try:
+        execfile (file)
+    finally:
+        _emacs_rem (file)
+"))))
+	(set-buffer (apply 'make-comint "Python" (car cmdlist) nil
+			   (cdr cmdlist)))
+	(inferior-python-mode)
+	(setq comint-output-filter-functions nil)))
+  (setq python-command cmd)
+  (setq python-buffer "*Python*")
+  (pop-to-buffer "*Python*")
+  (compilation-minor-mode 1)
+  (add-hook 'comint-input-filter-functions 'python-input-filter nil t)
+  ;; Avoid clobbering comint bindings.
+  (set (make-local-variable 'minor-mode-overriding-map-alist)
+       `((compilation-minor-mode
+	  . ,(let ((map (make-sparse-keymap)))
+	       ;; It would be useful to put keymap properties on the
+	       ;; error lines so that we could use RET and mouse-2 on
+	       ;; them directly.  These bindings will only DTRT with
+	       ;; the font-lock-style compilation mode.
+	       (define-key map [mouse-2] #'python-mouse-2-command)
+	       (define-key map "\C-m" #'python-RET-command)
+	       (if (boundp 'compilation-menu-map)
+		   (define-key map [menu-bar compilation]
+		     (cons "Errors" compilation-menu-map)))
+	       map))))
+  (set (make-local-variable 'compilation-error-regexp-alist)
+       python-compilation-regexp-alist))
+
+(defun python-mouse-2-command (event)
+  "Command bound to `mouse-2' in inferior Python buffer.
+Selects Comint or Compilation mode command as appropriate."
+  (interactive "e")
+  ;; This only works with the font-lock-based compilation mode.
+  (call-interactively
+   (lookup-key (if (save-window-excursion
+		     (save-excursion
+		       (mouse-set-point event)
+		       (consp (get-text-property (line-beginning-position)
+						 'message))))
+		   compilation-mode-map
+		 comint-mode-map)
+	       [mouse-2])))
+
+(defun python-RET-command ()
+  "Command bound to `RET' in inferior Python buffer.
+Selects Comint or Compilation mode command as appropriate."
+  (interactive)
+  ;; This only works with the font-lock-based compilation mode.
+  (call-interactively
+   (lookup-key (if (consp (get-text-property (line-beginning-position)
+					     'message))
+		   compilation-mode-map
+		 comint-mode-map)
+	       "\C-m")))
+
+(defun python-send-region (start end)
+  "Send the region to the inferior Python process."
+  ;; The region is evaluated from a temporary file.  This avoids
+  ;; problems with blank lines, which have different semantics
+  ;; interactively and in files.  It also saves the inferior process
+  ;; buffer filling up with interpreter prompts.  We need a function
+  ;; to remove the temporary file when it has been evaluated, which
+  ;; unfortunately means using a not-quite pristine interpreter
+  ;; initially.  Unfortunately we also get tracebacks which look like:
+  ;; 
+  ;; >>> Traceback (most recent call last):
+  ;;   File "<stdin>", line 1, in ?
+  ;;   File "<string>", line 4, in _emacs_execfile
+  ;;   File "/tmp/py7734RSB", line 11
+  ;;
+  ;; The compilation-minor-mode parsing takes care of relating the
+  ;; reference to the temporary file to the source.  Fixme:
+  ;; comint-filter the first two lines of the traceback?
+  (interactive "r")
+  (let* ((f (make-temp-file "py"))
+	 (command (format "_emacs_execfile(%S)\n" f))
+	 (orig-file (buffer-file-name))
+	 (orig-line (save-restriction
+		      (widen)
+		      (line-number-at-pos start))))
+    (if (save-excursion
+	  (goto-char start)
+	  (/= 0 (current-indentation)))	; need dummy block
+	(write-region "if True:\n" nil f nil 'nomsg))
+    (write-region start end f t 'nomsg)
+    (when python-buffer
+      (with-current-buffer python-buffer
+	(let ((end (marker-position (process-mark
+				     (get-buffer-process python-buffer)))))
+	  (set (make-local-variable 'python-orig-file) orig-file)
+	  (set (make-local-variable 'python-orig-start-line) orig-line)
+	  (set (make-local-variable 'compilation-error-list) nil)
+	  ;; (set (make-local-variable 'compilation-old-error-list) nil)
+	  (let ((comint-input-filter-functions
+		 (delete 'python-input-filter comint-input-filter-functions)))
+	    (comint-send-string (python-proc) command))
+	  (set-marker compilation-parsing-end end)
+	  (setq compilation-last-buffer (current-buffer)))))))
+
+(defun python-send-string (string)
+  "Evaluate STRING in inferior Python process."
+  (interactive "sPython command: ")
+  (comint-send-string (python-proc) string))
+
+(defun python-send-buffer ()
+  "Send the current buffer to the inferior Python process."
+  (interactive)
+  (python-send-region (point-min) (point-max)))
+
+(defun python-send-defun ()
+  "Send the current defun (class or method) to the inferior Python process."
+  (interactive)
+  (save-excursion (python-send-region (progn (beginning-of-defun) (point))
+				      (progn (end-of-defun) (point)))))
+
+(defun python-switch-to-python (eob-p)
+  "Switch to the Python process buffer.
+With prefix arg,