Commit b878827d authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(toplevel): Require CL at compile time.

(uniquify-push): Removed.
parent 5a7b9024
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
;;; Code: ;;; Code:
(provide 'uniquify) (provide 'uniquify)
(eval-when-compile (require 'cl))
;;; User-visible variables ;;; User-visible variables
...@@ -159,9 +160,6 @@ variable is ignored." ...@@ -159,9 +160,6 @@ variable is ignored."
;;; Utilities ;;; Utilities
(defmacro uniquify-push (item list)
`(setq ,list (cons ,item ,list)))
;; For directories, return the last component, not the empty string. ;; For directories, return the last component, not the empty string.
(defun uniquify-file-name-nondirectory (file-name) (defun uniquify-file-name-nondirectory (file-name)
(file-name-nondirectory (directory-file-name file-name))) (file-name-nondirectory (directory-file-name file-name)))
...@@ -213,9 +211,9 @@ file name elements. Arguments cause only a subset of buffers to be renamed." ...@@ -213,9 +211,9 @@ file name elements. Arguments cause only a subset of buffers to be renamed."
(equal rawname (equal rawname
(uniquify-file-name-nondirectory newbuffile)))))) (uniquify-file-name-nondirectory newbuffile))))))
(if deserving (if deserving
(uniquify-push (list rawname bfn buffer nil) fix-list) (push (list rawname bfn buffer nil) fix-list)
(uniquify-push (list (buffer-name buffer)) (push (list (buffer-name buffer))
uniquify-non-file-buffer-names))) uniquify-non-file-buffer-names)))
(setq buffers (cdr buffers)))) (setq buffers (cdr buffers))))
;; selects buffers whose names may need changing, and others that ;; selects buffers whose names may need changing, and others that
;; may conflict. ;; may conflict.
...@@ -273,7 +271,7 @@ Works on dired buffers and ordinary file-visiting buffers, but no others." ...@@ -273,7 +271,7 @@ Works on dired buffers and ordinary file-visiting buffers, but no others."
(uniquify-rationalize-conflicting-sublist (uniquify-rationalize-conflicting-sublist
conflicting-sublist old-name depth) conflicting-sublist old-name depth)
(setq conflicting-sublist nil))) (setq conflicting-sublist nil)))
(uniquify-push item conflicting-sublist) (push item conflicting-sublist)
(setq old-name proposed-name)) (setq old-name proposed-name))
(setq fix-list (cdr fix-list))) (setq fix-list (cdr fix-list)))
(uniquify-rationalize-conflicting-sublist (uniquify-rationalize-conflicting-sublist
......
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