[Emacs-diffs] /srv/bzr/emacs/trunk r108694: Mark python-mode abbrevs as system abbrevs.

[Chong Yidong]

------------------------------------------------------------
revno: 108694
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-23 17:28:10 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/ansi-color.el
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-23 04:24:06 +0000
+++ b/lisp/ChangeLog    2012-06-23 09:28:10 +0000
@@ -1,3 +1,10 @@
+2012-06-23  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl--make-usage-args): Handle improper lists

=== modified file 'lisp/ansi-color.el'
--- a/lisp/ansi-color.el        2012-06-02 10:56:09 +0000
+++ b/lisp/ansi-color.el        2012-06-23 09:28:10 +0000
@@ -358,11 +358,12 @@
   "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

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-06-19 16:04:47 +0000
+++ b/lisp/progmodes/python.el  2012-06-23 09:28:10 +0000
@@ -2152,7 +2152,8 @@
   (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