* progmodes/python.el: Remove cl dependency.

(python-syntax-count-quotes): Replace incf call.
(python-fill-string): Replace setf call.
parent e7ae8039
2012-12-29 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el: Remove cl dependency.
(python-syntax-count-quotes): Replace incf call.
(python-fill-string): Replace setf call.
2012-12-29 Damien Cassou <damien.cassou@gmail.com> 2012-12-29 Damien Cassou <damien.cassou@gmail.com>
* info.el (info-other-window): New arg, for consistency with info. * info.el (info-other-window): New arg, for consistency with info.
......
...@@ -204,7 +204,6 @@ ...@@ -204,7 +204,6 @@
(require 'ansi-color) (require 'ansi-color)
(require 'comint) (require 'comint)
(eval-when-compile (require 'cl-lib))
;; Avoid compiler warnings ;; Avoid compiler warnings
(defvar view-return-to-alist) (defvar view-return-to-alist)
...@@ -529,7 +528,7 @@ is used to limit the scan." ...@@ -529,7 +528,7 @@ is used to limit the scan."
(while (and (< i 3) (while (and (< i 3)
(or (not limit) (< (+ point i) limit)) (or (not limit) (< (+ point i) limit))
(eq (char-after (+ point i)) quote-char)) (eq (char-after (+ point i)) quote-char))
(cl-incf i)) (setq i (1+ i)))
i)) i))
(defun python-syntax-stringify () (defun python-syntax-stringify ()
...@@ -2487,12 +2486,12 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." ...@@ -2487,12 +2486,12 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'."
JUSTIFY should be used (if applicable) as in `fill-paragraph'." JUSTIFY should be used (if applicable) as in `fill-paragraph'."
(let* ((marker (point-marker)) (let* ((marker (point-marker))
(str-start-pos (str-start-pos
(let ((m (make-marker))) (set-marker
(setf (marker-position m) (make-marker)
(or (python-syntax-context 'string) (or (python-syntax-context 'string)
(and (equal (string-to-syntax "|") (and (equal (string-to-syntax "|")
(syntax-after (point))) (syntax-after (point)))
(point)))) m)) (point)))))
(num-quotes (python-syntax-count-quotes (num-quotes (python-syntax-count-quotes
(char-after str-start-pos) str-start-pos)) (char-after str-start-pos) str-start-pos))
(str-end-pos (str-end-pos
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment