From: Fabián Ezequiel Gallina Date: Sat, 29 Dec 2012 11:04:55 +0000 (-0300) Subject: * progmodes/python.el: Remove cl dependency. X-Git-Tag: emacs-24.3.90~173^2~7^2~456 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66164d2f176b3f86ee5551b78f705d0fe776c611;p=emacs.git * progmodes/python.el: Remove cl dependency. (python-syntax-count-quotes): Replace incf call. (python-fill-string): Replace setf call. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab0aa12ffd6..d37ee561fc3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-12-29 Fabián Ezequiel Gallina + + * progmodes/python.el: Remove cl dependency. + (python-syntax-count-quotes): Replace incf call. + (python-fill-string): Replace setf call. + 2012-12-29 Damien Cassou * info.el (info-other-window): New arg, for consistency with info. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 67388c0339b..56a971f0c67 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -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 @@ is used to limit the scan." (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'." 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