(remove, remq): New functions.

[gnu-emacs] / lisp / uniquify.el

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 5e4749389e5b2c5e410debdfeadf002433ef15ca..aa5faf0498c52ad8cce143ae007a37e78462af0a 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -85,6 +85,7 @@
 ;;; Code:
 
 (provide 'uniquify)
+(eval-when-compile (require 'cl))
 
 ;;; User-visible variables
 
@@ -127,11 +128,11 @@ other buffer names are changed."
   :group 'uniquify)
 
 (defcustom uniquify-ignore-buffers-re nil
-  "*Regular expression matching buffer names that should not be uniqified.
+  "*Regular expression matching buffer names that should not be uniquified.
 For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename
 draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the
 visited file name isn't the same as that of the buffer."
-  :type 'boolean
+  :type '(choice (const :tag "Uniquify all buffers" nil) regexp)
   :group 'uniquify)
 
 (defcustom uniquify-min-dir-content 0
@@ -159,20 +160,17 @@ variable is ignored."
 
 ;;; Utilities
 
-(defmacro uniquify-push (item list)
-  (` (setq (, list) (cons (, item) (, list)))))
-
 ;; For directories, return the last component, not the empty string.
 (defun uniquify-file-name-nondirectory (file-name)
   (file-name-nondirectory (directory-file-name file-name)))
 
 ;; uniquify-fix-list data structure
 (defmacro uniquify-fix-item-base (a)
-  (` (car (, a))))
+  `(car ,a))
 (defmacro uniquify-fix-item-filename (a)
-  (` (car (cdr (, a)))))
+  `(car (cdr ,a)))
 (defmacro uniquify-fix-item-buffer (a)
-  (` (car (cdr (cdr (, a))))))
+  `(car (cdr (cdr ,a))))
 ;; Not a macro: passed to mapcar.
 (defun uniquify-fix-item-unrationalized-buffer (item)
   (or (car (cdr (cdr (cdr item)))) nil))       ;maybe better in the future
@@ -213,9 +211,9 @@ file name elements.  Arguments cause only a subset of buffers to be renamed."
                                   (equal rawname
                                          (uniquify-file-name-nondirectory newbuffile))))))
          (if deserving
-             (uniquify-push (list rawname bfn buffer nil) fix-list)
-           (uniquify-push (list (buffer-name buffer))
-                          uniquify-non-file-buffer-names)))
+             (push (list rawname bfn buffer nil) fix-list)
+           (push (list (buffer-name buffer))
+                 uniquify-non-file-buffer-names)))
        (setq buffers (cdr buffers))))
     ;; selects buffers whose names may need changing, and others that
     ;; may conflict.
@@ -273,7 +271,7 @@ Works on dired buffers and ordinary file-visiting buffers, but no others."
              (uniquify-rationalize-conflicting-sublist
               conflicting-sublist old-name depth)
              (setq conflicting-sublist nil)))
-       (uniquify-push item conflicting-sublist)
+       (push item conflicting-sublist)
        (setq old-name proposed-name))
       (setq fix-list (cdr fix-list)))
     (uniquify-rationalize-conflicting-sublist