[Emacs-diffs] /srv/bzr/emacs/trunk r111366: * progmodes/python.el: Remove cl dependency.

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 111366
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-29 08:04:55 -0300
message:
  * progmodes/python.el: Remove cl dependency.
  (python-syntax-count-quotes): Replace incf call.
  (python-fill-string): Replace setf call.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 06:14:55 +0000
+++ b/lisp/ChangeLog    2012-12-29 11:04:55 +0000
@@ -1,3 +1,9 @@
+2012-12-29  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el: Remove cl dependency.
+       (python-syntax-count-quotes): Replace incf call.
+       (python-fill-string): Replace setf call.
+
 2012-12-29  Damien Cassou  <address@hidden>
 
        * info.el (info-other-window): New arg, for consistency with info.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-12-13 05:29:15 +0000
+++ b/lisp/progmodes/python.el  2012-12-29 11:04:55 +0000
@@ -204,7 +204,6 @@
 
 (require 'ansi-color)
 (require 'comint)
-(eval-when-compile (require 'cl-lib))
 
 ;; Avoid compiler warnings
 (defvar view-return-to-alist)
@@ -529,7 +528,7 @@
     (while (and (< i 3)
                 (or (not limit) (< (+ point i) limit))
                 (eq (char-after (+ point i)) quote-char))
-      (cl-incf i))
+      (setq i (1+ i)))
     i))
 
 (defun python-syntax-stringify ()
@@ -2487,12 +2486,12 @@
 JUSTIFY should be used (if applicable) as in `fill-paragraph'."
   (let* ((marker (point-marker))
          (str-start-pos
-          (let ((m (make-marker)))
-            (setf (marker-position m)
-                  (or (python-syntax-context 'string)
-                      (and (equal (string-to-syntax "|")
-                                  (syntax-after (point)))
-                           (point)))) m))
+          (set-marker
+           (make-marker)
+           (or (python-syntax-context 'string)
+               (and (equal (string-to-syntax "|")
+                           (syntax-after (point)))
+                    (point)))))
          (num-quotes (python-syntax-count-quotes
                       (char-after str-start-pos) str-start-pos))
          (str-end-pos