xemacs-beta: lisp/modes/python-mode.el comparison

comparison lisp/modes/python-mode.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	441bb1e64a06
children	0d2f883870bc

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 ;;; python-mode.el --- Major mode for editing Python programs
 ;; Copyright (C) 1992,1993,1994  Tim Peters
-;; Author: 1995-1997 Barry A. Warsaw
+;; Author: 1995-1996 Barry A. Warsaw
 ;;         1992-1994 Tim Peters
 ;; Maintainer:    python-mode@python.org
 ;; Created:       Feb 1992
-;; Version:       2.90
+;; Version:       2.83
-;; Last Modified: 1997/02/24 03:37:22
+;; Last Modified: 1996/10/23 20:44:59
 ;; Keywords: python languages oop
 ;; This software is provided as-is, without express or implied
 ;; warranty.  Permission to use, copy, modify, distribute or sell this
 ;; software, without fee, for any purpose and by any individual or
 current value of (the general Emacs variable) `tab-width' does not
 equal <number>, `tab-width' is set to <number>, a message saying so is
 displayed in the echo area, and if `py-beep-if-tab-change' is non-nil
 the Emacs bell is also rung as a warning.")
-(defvar python-font-lock-keywords
+(defconst python-font-lock-keywords
 (let* ((keywords '("and"        "break"      "class"
 		     "continue"   "def"        "del"        "elif"
 		     "else:"      "except"     "except:"    "exec"
 		     "finally:"   "for"        "from"       "global"
 		     "if"         "import"     "in"         "is"
 ;; functions
 '("\\bdef[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
 1 font-lock-function-name-face)
 ))
 "Additional expressions to highlight in Python mode.")
-(put 'python-mode 'font-lock-defaults '(python-font-lock-keywords))
 (defvar imenu-example--python-show-method-args-p nil
 "*Controls echoing of arguments of functions & methods in the imenu buffer.
 When non-nil, arguments are printed.")
 ;; in previous version of python-mode.el, the hook was incorrectly
 ;; called py-mode-hook, and was not defvar'd.  deprecate its use.
 (and (fboundp 'make-obsolete-variable)
 (make-obsolete-variable 'py-mode-hook 'python-mode-hook))
-(defvar py-delete-function 'backward-delete-char-untabify
-"*Function called by `py-delete-char' when deleting characters.")
 (defvar py-mode-map ()
 "Keymap used in `python-mode' buffers.")
 (if py-mode-map
 "Regexp for finding a class name.
 If you change this, you probably have to change `py-current-defun' as well.
 This is only used by `py-current-defun' to find the name for add-log.el.")
-;; As of 30-Jan-1997, Emacs 19.34 works but XEmacs 19.15b90 and
-;; previous does not.  It is suspected that Emacsen before 19.34 are
-;; also broken.
-(defvar py-parse-partial-sexp-works-p
-(let ((buf (get-buffer-create " ---*---pps---*---"))
-	state status)
-(save-excursion
-(set-buffer buf)
-(erase-buffer)
-(insert "(line1\n line2)\nline3")
-(lisp-mode)
-(goto-char (point-min))
-(setq state (parse-partial-sexp (point) (save-excursion
-						(forward-line 1)
-						(point))))
-(parse-partial-sexp (point) (point-max) 0 nil state)
-(setq status (not (= (point) (point-max))))
-(kill-buffer buf)
-status))
-"Does `parse-partial-sexp' work in this Emacs?")
 ;; Menu definitions, only relevent if you have the easymenu.el package
 ;; (standard in the latest Emacs 19 and XEmacs 19 distributions).
 (defvar py-menu nil
 	(require 'easymenu)
 (error nil))
 (easy-menu-define
 py-menu py-mode-map "Python Mode menu"
 '("Python"
-["Comment Out Region"   py-comment-region  (mark)]
+["Comment Out Region"   comment-region  (mark)]
-["Uncomment Region"     (py-comment-region (point) (mark) '(4)) (mark)]
+["Uncomment Region"     (comment-region (point) (mark) '(4)) (mark)]
 "-"
 ["Mark current block"   py-mark-block t]
 ["Mark current def"     mark-python-def-or-class t]
 ["Mark current class"   (mark-python-def-or-class t) t]
 "-"
 (make-local-variable 'font-lock-defaults)
 (make-local-variable 'paragraph-separate)
 (make-local-variable 'paragraph-start)
 (make-local-variable 'require-final-newline)
 (make-local-variable 'comment-start)
-(make-local-variable 'comment-end)
 (make-local-variable 'comment-start-skip)
 (make-local-variable 'comment-column)
 (make-local-variable 'indent-region-function)
 (make-local-variable 'indent-line-function)
 (make-local-variable 'add-log-current-defun-function)
 ;;
 (set-syntax-table py-mode-syntax-table)
 (setq major-mode             'python-mode
 	mode-name              "Python"
 	local-abbrev-table     python-mode-abbrev-table
+	font-lock-defaults     '(python-font-lock-keywords)
 	paragraph-separate     "^[ \t]*$"
 	paragraph-start        "^[ \t]*$"
 	require-final-newline  t
 	comment-start          "# "
-	comment-end            ""
 	comment-start-skip     "# *"
 	comment-column         40
 	indent-region-function 'py-indent-region
 	indent-line-function   'py-indent-line
 	;; tell add-log.el how to find the current function/method/variable
 ;; Functions for Python style indentation
 (defun py-delete-char (count)
 "Reduce indentation or delete character.
 If point is at the leftmost column, deletes the preceding newline.
-Deletion is performed by calling the function in `py-delete-function'
-with a single argument (the number of characters to delete).
 Else if point is at the leftmost non-blank character of a line that is
 neither a continuation line nor a non-indenting comment line, or if
 point is at the end of a blank line, reduces the indentation to match
 that of the line that opened the current block of code.  The line that
 (if (or (/= (current-indentation) (current-column))
 	  (bolp)
 	  (py-continuation-line-p)
 	  (not py-honor-comment-indentation)
 	  (looking-at "#[^ \t\n]"))	; non-indenting #
-(funcall py-delete-function count)
+(backward-delete-char-untabify count)
 ;; else indent the same as the colon line that opened the block
 ;; force non-blank so py-goto-block-up doesn't ignore it
 (insert-char ?* 1)
 (backward-char)
 ;; if in nest, zip to the end of the nest
 (setq state (py-parse-state))
 (if (and (not (zerop (car state)))
 	       (not (eobp)))
 	  (progn
-	    (parse-partial-sexp (point) (point-max)
+	    ;; BUG ALERT: I could swear, from reading the docs, that
-				(if py-parse-partial-sexp-works-p
+	    ;; the 3rd argument should be plain 0
-				    0 (- 0 (car state)))
+	    (parse-partial-sexp (point) (point-max) (- 0 (car state))
 				nil state)
 	    (forward-line 1))))))
 ;; t iff statement opens a block == iff it ends with a colon that's
 ;; not in a comment.  point should be at the start of a statement
 		 py-this-is-lucid-emacs-p))
 	(move-marker last-input-end (point))) ; muck w/ shell-mode
 (set-buffer cbuf))
 (sit-for 0))
-;; older Emacsen don't have this function
-(if (not (fboundp 'match-string))
-(defun match-string (n)
-(let ((beg (match-beginning n))
-	    (end (match-end n)))
-	(if (and beg end)
-	    (buffer-substring beg end)
-	  nil))))
 (defun py-current-defun ()
 ;; tell add-log.el how to find the current function/method/variable
 (save-excursion
 (if (re-search-backward py-defun-start-re nil t)
 	(or (match-string 3)
 		  (concat (match-string 1) "." method)
 		method)))
 nil)))
-(defconst py-version "2.90"
+(defconst py-version "2.83"
 "`python-mode' version number.")
 (defconst py-help-address "python-mode@python.org"
 "Address accepting submission of bug reports.")
 (defun py-version ()

Mercurial > hg > xemacs-beta

comparison lisp/modes/python-mode.el @ 70:131b0175ea99 r20-0b30