From 0e9e6c6abce029feda6cced84cb1fa2dc1d6d1c1 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 23 Jun 2012 17:28:10 +0800 Subject: [PATCH] Mark python-mode abbrevs as system abbrevs. * progmodes/python.el (python-skeleton-define): Mark abbrevs as system abbrevs. * ansi-color.el (ansi-color-apply-on-region): Doc fix. --- lisp/ChangeLog | 7 +++++++ lisp/ansi-color.el | 11 ++++++----- lisp/progmodes/python.el | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f017f0f50..cbc7b493b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-06-23 Chong Yidong + + * progmodes/python.el (python-skeleton-define): Mark abbrevs as + system abbrevs. + + * ansi-color.el (ansi-color-apply-on-region): Doc fix. + 2012-06-23 Stefan Monnier * emacs-lisp/cl-macs.el (cl--make-usage-args): Handle improper lists diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index d677f70670..18b2c84627 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -358,11 +358,12 @@ it will override BEGIN, the start of the region. Set "Translates SGR control sequences into overlays or extents. Delete all other control sequences without processing them. -SGR control sequences are applied by setting foreground and -background colors to the text between BEGIN and END using -overlays. The colors used are given in `ansi-color-faces-vector' -and `ansi-color-names-vector'. See `ansi-color-apply-sequence' -for details. +SGR control sequences are applied by calling the function +specified by `ansi-color-apply-face-function'. The default +function sets foreground and background colors to the text +between BEGIN and END, using overlays. The colors used are given +in `ansi-color-faces-vector' and `ansi-color-names-vector'. See +`ansi-color-apply-sequence' for details. Every call to this function will set and use the buffer-local variable `ansi-color-context-region' to save position and current face. This diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a43dc1eb1d..ddedbdb7dd 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2152,7 +2152,8 @@ be added to `python-mode-abbrev-table'." (let* ((name (symbol-name name)) (function-name (intern (concat "python-skeleton-" name)))) `(progn - (define-abbrev python-mode-abbrev-table ,name "" ',function-name) + (define-abbrev python-mode-abbrev-table ,name "" ',function-name + :system t) (setq python-skeleton-available (cons ',function-name python-skeleton-available)) (define-skeleton ,function-name -- 2.20.1