Mercurial > emacs
view lisp/autoarg.el @ 92053:bd92ee83d7ae
* progmodes/sym-comp.el: New file.
* progmodes/python.el: Merge from Dave Love's 2008-01-20 version.
Require sym-comp. Add Python buffer to same-window-buffer-names.
Fixup whitespaces.
(python-font-lock-keywords): Add highlighting for Python builtins.
(python-font-lock-syntactic-keywords): Rewrite.
(python-quote-syntax): Use syntax-ppss-context instead of parsing
ppss directly.
(python-mode-map): Add binding for python-find-function.
(python-calculate-indentation): Clean up the logic.
(python-beginning-of-defun): Explicitly set return value.
(python-beginning-of-statement): Stop looping if we get stuck
going backwards.
(python-next-statement): Stop looping if we somehow end up inside
a string while advancing.
(python-preoutput-continuation, python-version-checked): New vars.
(python-check-version): New function.
(run-python): Set default command to python-command instead of
python-python-command.
(run-python): Use python-check-version. Give PYTHONPATH
precedence over data-directory in the process environment. Load
function definitions in python process after.
(python-check-comint-prompt): New function.
(python-send-command, python-send-receive): Use it.
(python-complete-symbol, python-try-complete): Functions deleted.
Use symbol-complete instead of python-complete-symbol throughout.
(python-fill-paragraph): Further refine the fenced-string regexp.
(def-python-skeleton): Expand to the original abbrev instead if in
a comment or string. Tweak skeletons for `if', `while', `for',
`try/except', `try/finally', `name'.
(python-pea-hook, python-abbrev-pc-hook): New functions.
(python-abbrev-syntax-table): New var.
(python-mode): Add python-pea-hook to pre-abbrev-expand-hook. Use
symbol-completion-try-complete for hippie expansion. Turn on font
lock unconditionally.
(python-mode-hook): Defcustom it. No need to use make-local
variable on indent-tabs-mode in "Turn off Indent Tabs mode"
option, since it's buffer-local.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 21 Feb 2008 17:03:10 +0000 |
parents | 73661ddc7ac7 |
children | 606f2d163a64 1e3a407766b9 |
line wrap: on
line source
;;; autoarg.el --- make digit keys supply prefix args ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Created: 1998-09-04 ;; Keywords: abbrev, emulations ;; This file is part of GNU Emacs. ;; GNU Emacs 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 3, or (at your option) ;; any later version. ;; GNU Emacs 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., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This provides `autoarg-mode', a global minor mode meant to emulate ;; a facility reported from Twenex Emacs whereby digit keys supplied ;; prefix args rather than self inserting, with a digit sequence ;; terminated by space acting to insert the digits. ;; The bindings of DIGIT and C-DIGIT are swapped and a command bound ;; to SPC deals with a numeric prefix arg or acts normally without ;; such an arg. (In the absence of a suitable terminal, you'd ;; probably want to swap DIGIT and M-DIGIT.) See the mode doc. ;; You probably don't really want to use this. ;; Also provides `autoarg-kp-mode' which is similar, but leaves the ;; digit keys alone and redefines the `keypad' keys, `kp-1' &c as ;; digit arguments. (Use `NumLock' if necessary to generate kp-N.) ;; You're more likely to want to use this. ;;; Code: (defvar autoarg-mode-map (let ((map (make-sparse-keymap))) ;; Loop over digit characters to set up keymap. (dotimes (i 10) (define-key map `[,(+ ?0 i)] 'digit-argument) (define-key map `[(control ,(+ ?0 i))] 'self-insert-command)) (define-key map " " 'autoarg-terminate) map) "Keymap for Autoarg mode.") ;; Logical additions: ;; (define-key autoarg-mode-map [?-] 'negative-argument) ;; (define-key autoarg-mode-map [(control ?-)] 'self-insert-command) ;; A sensible/addition? ;; (define-key autoarg-mode-map [?\r] 'autoarg-terminate) (defvar autoarg-kp-digits (let (alist) (dotimes (i 10 alist) (push (cons (intern (format "kp-%d" i)) i) alist)))) (defun autoarg-kp-digit-argument (arg) "Part of the numeric argument for the next command, like `digit-argument'." (interactive "P") (let ((digit (cdr (assq last-command-char autoarg-kp-digits)))) (cond ((integerp arg) (setq prefix-arg (+ (* arg 10) (if (< arg 0) (- digit) digit)))) ((eq arg '-) ;; Treat -0 as just -, so that -01 will work. (setq prefix-arg (if (zerop digit) '- (- digit)))) (t (setq prefix-arg digit)))) (setq universal-argument-num-events (length (this-command-keys))) (setq overriding-terminal-local-map universal-argument-map)) (defvar autoarg-kp-mode-map (let ((map (make-sparse-keymap))) ;; Loop over digit characters to set up keymap. (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key map (vector sym) 'autoarg-kp-digit-argument))) (define-key map [kp-subtract] 'negative-argument) map) "Keymap for Autoarg-KP mode.") ;;;###autoload (define-minor-mode autoarg-mode "Toggle Autoarg minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. \\<autoarg-mode-map> In Autoarg mode digits are bound to `digit-argument' -- i.e. they supply prefix arguments as C-DIGIT and M-DIGIT normally do -- and C-DIGIT inserts DIGIT. \\[autoarg-terminate] terminates the prefix sequence and inserts the digits of the autoarg sequence into the buffer. Without a numeric prefix arg the normal binding of \\[autoarg-terminate] is invoked, i.e. what it would be with Autoarg mode off. For example: `6 9 \\[autoarg-terminate]' inserts `69' into the buffer, as does `C-6 C-9'. `6 9 a' inserts 69 `a's into the buffer. `6 9 \\[autoarg-terminate] \\[autoarg-terminate]' inserts `69' into the buffer and then invokes the normal binding of \\[autoarg-terminate]. `C-u \\[autoarg-terminate]' invokes the normal binding of \\[autoarg-terminate] four times. \\{autoarg-mode-map}" nil " Aarg" autoarg-mode-map :global t :group 'keyboard) ;;;###autoload (define-minor-mode autoarg-kp-mode "Toggle Autoarg-KP minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. \\<autoarg-kp-mode-map> This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' etc. to supply digit arguments. \\{autoarg-kp-mode-map}" nil " Aakp" autoarg-kp-mode-map :global t :group 'keyboard (if autoarg-kp-mode (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key universal-argument-map (vector sym) 'autoarg-kp-digit-argument))) (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key universal-argument-map (vector sym) nil))))) (defun autoarg-terminate (n) "Maybe terminate a digit prefix sequence. With a non-negative numeric prefix arg, insert the digits comprising the arg into the current buffer. Otherwise use the binding of the key which invoked this function, excluding the Autoarg keymap." (interactive "P") (if (numberp n) (insert (number-to-string n)) (let* ((autoarg-mode nil) ; hide the bindings (binding (key-binding (this-single-command-keys)))) (if binding (call-interactively binding))))) (provide 'autoarg) ;;; arch-tag: 2ba2ab4f-d60e-402a-ae4d-37e29af723c2 ;;; autoarg.el ends here