mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 22:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

changes by Barry, e.g. font lock & email addresses

Browse source
This commit is contained in:
Guido van Rossum 1995-08-28 03:12:57 +00:00
parent e7017ba0f7
commit d4901c890a
1 changed files with 97 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

140
Misc/python-mode-old.el
View file

@ -2,12 +2,12 @@
;; Copyright (C) 1992,1993,1994 Tim Peters ;; Copyright (C) 1992,1993,1994 Tim Peters
;; Author: 1995 Barry A. Warsaw <bwarsaw@cnri.reston.va.us> ;; Author: 1995 Barry A. Warsaw
;; 1992-1994 Tim Peters <tim@ksr.com> ;; 1992-1994 Tim Peters
;; Maintainer: bwarsaw@cnri.reston.va.us ;; Maintainer: python-mode@python.org
;; Created: Feb 1992 ;; Created: Feb 1992
;; Version: 2.19 ;; Version: 2.26
;; Last Modified: 1995/03/20 18:32:14 ;; Last Modified: 1995/07/05 23:26:15
;; Keywords: python editing language major-mode ;; Keywords: python editing language major-mode
;; This software is provided as-is, without express or implied ;; This software is provided as-is, without express or implied
@ -58,6 +58,7 @@
;; - even better support for outdenting. Guido suggests outdents of ;; - even better support for outdenting. Guido suggests outdents of
;; at least one level after a return, raise, break, or continue ;; at least one level after a return, raise, break, or continue
;; statement. ;; statement.
;; - de-electrify colon inside literals (e.g. comments and strings)
;; If you can think of more things you'd like to see, drop me a line. ;; If you can think of more things you'd like to see, drop me a line.
;; If you want to report bugs, use py-submit-bug-report (C-c C-b). ;; If you want to report bugs, use py-submit-bug-report (C-c C-b).
@ -67,9 +68,9 @@
;; patches. ;; patches.
;; LCD Archive Entry: ;; LCD Archive Entry:
;; python-mode|Barry A. Warsaw|bwarsaw@cnri.reston.va.us ;; python-mode|Barry A. Warsaw|python-mode@python.org
;; |Major mode for editing Python programs ;; |Major mode for editing Python programs
;; |1995/03/20 18:32:14|2.19| ;; |1995/07/05 23:26:15|2.26|
;;; Code: ;;; Code:
@ -162,30 +163,75 @@ 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 displayed in the echo area, and if `py-beep-if-tab-change' is non-nil
the Emacs bell is also rung as a warning.") the Emacs bell is also rung as a warning.")
;; These were the previous font-lock keywords, but I think I now
;; prefer the ones from XEmacs 19.12's font-lock.el. I've merged the
;; two into the new definition below.
;;
;;(defvar python-font-lock-keywords
;; (list
;; (cons
;; (concat
;; "\\<\\("
;; (mapconcat
;; 'identity
;; '("access" "and" "break" "continue"
;; "del" "elif" "else" "except"
;; "exec" "finally" "for" "from"
;; "global" "if" "import" "in"
;; "is" "lambda" "not" "or"
;; "pass" "print" "raise" "return"
;; "try" "while" "def" "class"
;; )
;; "\\|")
;; "\\)\\>")
;; 1)
;; ;; functions
;; '("\\bdef\\s +\\(\\sw+\\)(" 1 font-lock-function-name-face)
;; ;; classes
;; '("\\bclass\\s +\\(\\sw+\\)[(:]" 1 font-lock-function-name-face)
;; )
;; "*Additional keywords to highlight `python-mode' buffers.")
;; These are taken from XEmacs 19.12's font-lock.el file, but have the
;; more complete list of keywords from the previous definition in
;; python-mode.el. There are a few other minor stylistic changes as
;; well.
;;
(defvar python-font-lock-keywords (defvar python-font-lock-keywords
(list (list
(cons (cons (concat
(concat "\\b\\("
"\\<\\(" (mapconcat
(mapconcat 'identity
'identity '("access" "and" "break" "continue"
'("access" "and" "break" "continue" "del" "elif" "else:" "except"
"del" "elif" "else" "except" "except:" "exec" "finally:" "for"
"exec" "finally" "for" "from" "from" "global" "if" "import"
"global" "if" "import" "in" "in" "is" "lambda" "not"
"is" "lambda" "not" "or" "or" "pass" "print" "raise"
"pass" "print" "raise" "return" "return" "try:" "while"
"try" "while" "def" "class" )
) "\\|")
"\\|") "\\)[ \n\t(]")
"\\)\\>") 1)
1) ;; classes
;; functions '("\\bclass[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
'("\\bdef\\s +\\(\\sw+\\)(" 1 font-lock-function-name-face) 1 font-lock-type-face)
;; classes ;; functions
'("\\bclass\\s +\\(\\sw+\\)[(:]" 1 font-lock-function-name-face) '("\\bdef[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
) 1 font-lock-function-name-face)
"*Additional keywords to highlight `python-mode' buffers.") )
"*Additional expressions to highlight in Python mode.")
;; R Lindsay Todd <toddr@rpi.edu> suggests these changes to the
;; original keywords, which wouldn't be necessary if we go with the
;; XEmacs defaults, but which I agree makes sense without them.
;;
;; functions
;; '("\\bdef\\s +\\(\\sw+\\)\\s *(" 1 font-lock-function-name-face)
;; classes
;; '("\\bclass\\s +\\(\\sw+\\)\\s *[(:]" 1 font-lock-type-face)
;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -525,7 +571,8 @@ filter."
(progn (progn
(require 'shell) (require 'shell)
(switch-to-buffer-other-window (switch-to-buffer-other-window
(make-shell "Python" py-python-command)))) (apply (if (boundp 'make-shell) 'make-shell 'make-comint)
"Python" py-python-command nil))))
(make-local-variable 'shell-prompt-pattern) (make-local-variable 'shell-prompt-pattern)
(setq shell-prompt-pattern "^>>> \\|^\\.\\.\\. ") (setq shell-prompt-pattern "^>>> \\|^\\.\\.\\. ")
(set-process-filter (get-buffer-process (current-buffer)) (set-process-filter (get-buffer-process (current-buffer))
@ -615,6 +662,7 @@ See the `\\[py-shell]' docs for additional warnings."
(set-buffer pbuf) (set-buffer pbuf)
(let* ((start (point)) (let* ((start (point))
(goback (< start pmark)) (goback (< start pmark))
(goend (and (not goback) (= start (point-max))))
(buffer-read-only nil)) (buffer-read-only nil))
(goto-char pmark) (goto-char pmark)
(insert string) (insert string)
@ -631,14 +679,18 @@ See the `\\[py-shell]' docs for additional warnings."
(if py-scroll-process-buffer (if py-scroll-process-buffer
(let* ((pop-up-windows t) (let* ((pop-up-windows t)
(pwin (display-buffer pbuf))) (pwin (display-buffer pbuf)))
(set-window-point pwin (point)))))) (set-window-point pwin (point)))))
(set-buffer curbuf) (set-buffer curbuf)
(if file-finished (if file-finished
(progn (progn
(py-delete-file-silently (car py-file-queue)) (py-delete-file-silently (car py-file-queue))
(setq py-file-queue (cdr py-file-queue)) (setq py-file-queue (cdr py-file-queue))
(if py-file-queue (if py-file-queue
(py-execute-file pyproc (car py-file-queue))))))) (py-execute-file pyproc (car py-file-queue)))))
(and goend
(progn (set-buffer pbuf)
(goto-char (point-max))))
)))
(defun py-execute-buffer () (defun py-execute-buffer ()
"Send the contents of the buffer to a Python interpreter. "Send the contents of the buffer to a Python interpreter.
@ -1893,10 +1945,12 @@ local bindings to py-newline-and-indent."))
(set-buffer pbuf) (set-buffer pbuf)
(goto-char (point-max)) (goto-char (point-max))
(move-marker (process-mark process) (point)) (move-marker (process-mark process) (point))
(if (not py-this-is-emacs-19-p) (if (not (or py-this-is-emacs-19-p
py-this-is-lucid-emacs-p))
(move-marker last-input-start (point))) ; muck w/ shell-mode (move-marker last-input-start (point))) ; muck w/ shell-mode
(funcall (process-filter process) process string) (funcall (process-filter process) process string)
(if (not py-this-is-emacs-19-p) (if (not (or py-this-is-emacs-19-p
py-this-is-lucid-emacs-p))
(move-marker last-input-end (point))) ; muck w/ shell-mode (move-marker last-input-end (point))) ; muck w/ shell-mode
(set-buffer cbuf)) (set-buffer cbuf))
(sit-for 0)) (sit-for 0))
@ -1910,9 +1964,9 @@ local bindings to py-newline-and-indent."))
(setq zmacs-region-stays t))) (setq zmacs-region-stays t)))
(defconst py-version "2.19" (defconst py-version "2.26"
"`python-mode' version number.") "`python-mode' version number.")
(defconst py-help-address "bwarsaw@cnri.reston.va.us" (defconst py-help-address "python-mode@python.org"
"Address accepting submission of bug reports.") "Address accepting submission of bug reports.")
(defun py-version () (defun py-version ()