Package: emacs;
Reported by: Paul Eggert <eggert <at> cs.ucla.edu>
Date: Mon, 14 Nov 2011 21:47:01 UTC
Severity: minor
Tags: patch
Found in version 24.0.91
Done: Paul Eggert <eggert <at> cs.ucla.edu>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Paul Eggert <eggert <at> cs.ucla.edu> Cc: tracker <at> debbugs.gnu.org Subject: bug#10048: closed (uniquify -> uniquify, for more-consistent function names) Date: Mon, 05 Mar 2018 02:05:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sun, 4 Mar 2018 18:03:49 -0800 with message-id <de48f952-09e3-05a1-8c11-c6f3c689fc0f <at> cs.ucla.edu> and subject line Re: uniquify -> uniquify, for more-consistent function names has caused the debbugs.gnu.org bug report #10048, regarding uniquify -> uniquify, for more-consistent function names to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 10048: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10048 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Paul Eggert <eggert <at> cs.ucla.edu> To: bug-gnu-emacs <at> gnu.org Subject: uniquify -> uniquify, for more-consistent function names Date: Mon, 14 Nov 2011 13:45:42 -0800Package: emacs Version: 24.0.91 Severity: minor Tags: patch Although Emacs normally uses the spelling "uniquify" for functions like uniquify-buffer-file-name, there are two exceptions. It's better if Emacs uses a consistent spelling. Also, in the wider English-speaking world "uniquify" is the more-common spelling, so using that spelling will help reduce confusion a bit. Here's a proposed patch. Since this changes the API it would have to wait until after Emacs 24.1 comes out. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-14 20:23:26 +0000 +++ lisp/ChangeLog 2011-11-14 20:46:44 +0000 @@ -1,3 +1,12 @@ +2011-11-14 Paul Eggert <eggert <at> cs.ucla.edu> + + uniqify -> uniquify, since that spelling is more common, + both within Emacs and in English-language sources in general. + * eshell/esh-util.el (eshell-uniquify-list): Rename from + eshell-uniqify-list. All callers changed. + * pcomplete.el (pcomplete-uniquify-list): Rename from + pcomplete-uniqify-list. All callers changed. + 2011-11-14 Glenn Morris <rgm <at> gnu.org> * progmodes/executable.el === modified file 'lisp/eshell/em-cmpl.el' --- lisp/eshell/em-cmpl.el 2011-03-05 04:11:05 +0000 +++ lisp/eshell/em-cmpl.el 2011-11-14 20:38:57 +0000 @@ -427,7 +427,7 @@ (setq comps-in-path (cdr comps-in-path))) (setq paths (cdr paths))) ;; Add aliases which are currently visible, and Lisp functions. - (pcomplete-uniqify-list + (pcomplete-uniquify-list (if glob-name completions (setq completions === modified file 'lisp/eshell/em-dirs.el' --- lisp/eshell/em-dirs.el 2011-03-05 04:11:05 +0000 +++ lisp/eshell/em-dirs.el 2011-11-14 20:38:26 +0000 @@ -279,7 +279,7 @@ (defvar pcomplete-stub) (defvar pcomplete-last-completion-raw) (declare-function pcomplete-actual-arg "pcomplete") -(declare-function pcomplete-uniqify-list "pcomplete") +(declare-function pcomplete-uniquify-list "pcomplete") (defun eshell-complete-user-reference () "If there is a user reference, complete it." @@ -290,7 +290,7 @@ (throw 'pcomplete-completions (progn (eshell-read-user-names) - (pcomplete-uniqify-list + (pcomplete-uniquify-list (mapcar (function (lambda (user) === modified file 'lisp/eshell/em-pred.el' --- lisp/eshell/em-pred.el 2011-05-23 17:57:17 +0000 +++ lisp/eshell/em-pred.el 2011-11-14 20:38:19 +0000 @@ -127,7 +127,7 @@ (?e . #'(lambda (lst) (mapcar 'file-name-extension lst))) (?t . #'(lambda (lst) (mapcar 'file-name-nondirectory lst))) (?q . #'(lambda (lst) (mapcar 'eshell-escape-arg lst))) - (?u . #'(lambda (lst) (eshell-uniqify-list lst))) + (?u . #'(lambda (lst) (eshell-uniquify-list lst))) (?o . #'(lambda (lst) (sort lst 'string-lessp))) (?O . #'(lambda (lst) (nreverse (sort lst 'string-lessp)))) (?j . (eshell-join-members)) === modified file 'lisp/eshell/esh-util.el' --- lisp/eshell/esh-util.el 2011-03-10 07:16:04 +0000 +++ lisp/eshell/esh-util.el 2011-11-14 20:39:17 +0000 @@ -296,7 +296,7 @@ (nconc new-list (list a)))) (cdr new-list))) -(defun eshell-uniqify-list (l) +(defun eshell-uniquify-list (l) "Remove occurring multiples in L. You probably want to sort first." (let ((m l)) (while m === modified file 'lisp/org/org-pcomplete.el' --- lisp/org/org-pcomplete.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-pcomplete.el 2011-11-14 20:36:26 +0000 @@ -139,7 +139,7 @@ (concat x " ") x)) (delq nil - (pcomplete-uniqify-list + (pcomplete-uniquify-list (append (mapcar (lambda (x) (if (string-match "^#\\+\\([A-Z_]+:?\\)" x) @@ -147,12 +147,12 @@ (org-split-string (org-get-current-options) "\n")) org-additional-option-like-keywords))))) (substring pcomplete-stub 2))) - + (defvar org-startup-options) (defun pcomplete/org-mode/file-option/startup () "Complete arguments for the #+STARTUP file option." (while (pcomplete-here - (let ((opts (pcomplete-uniqify-list + (let ((opts (pcomplete-uniquify-list (mapcar 'car org-startup-options)))) ;; Some options are mutually exclusive, and shouldn't be completed ;; against if certain other options have already been seen. @@ -174,7 +174,7 @@ (defun pcomplete/org-mode/link () "Complete against defined #+LINK patterns." (pcomplete-here - (pcomplete-uniqify-list + (pcomplete-uniquify-list (copy-sequence (append (mapcar 'car org-link-abbrev-alist-local) (mapcar 'car org-link-abbrev-alist)))))) @@ -184,13 +184,13 @@ "Complete against TeX-style HTML entity names." (require 'org-entities) (while (pcomplete-here - (pcomplete-uniqify-list (remove nil (mapcar 'car-safe org-entities))) + (pcomplete-uniquify-list (remove nil (mapcar 'car-safe org-entities))) (substring pcomplete-stub 1)))) (defvar org-todo-keywords-1) (defun pcomplete/org-mode/todo () "Complete against known TODO keywords." - (pcomplete-here (pcomplete-uniqify-list (copy-sequence org-todo-keywords-1)))) + (pcomplete-here (pcomplete-uniquify-list (copy-sequence org-todo-keywords-1)))) (defvar org-todo-line-regexp) (defun pcomplete/org-mode/searchhead () @@ -205,7 +205,7 @@ (push (org-make-org-heading-search-string (match-string-no-properties 3) t) tbl)) - (pcomplete-uniqify-list tbl))) + (pcomplete-uniquify-list tbl))) (substring pcomplete-stub 1)))) (defvar org-tag-alist) @@ -214,7 +214,7 @@ (while (pcomplete-here (mapcar (lambda (x) (concat x ":")) - (let ((lst (pcomplete-uniqify-list + (let ((lst (pcomplete-uniquify-list (or (remove nil (mapcar (lambda (x) @@ -232,7 +232,7 @@ (pcomplete-here (mapcar (lambda (x) (concat x ": ")) - (let ((lst (pcomplete-uniqify-list + (let ((lst (pcomplete-uniquify-list (copy-sequence (org-buffer-property-keys nil t t))))) (dolist (prop (org-entry-properties)) === modified file 'lisp/pcmpl-cvs.el' --- lisp/pcmpl-cvs.el 2011-09-29 07:21:06 +0000 +++ lisp/pcmpl-cvs.el 2011-11-14 20:36:41 +0000 @@ -122,7 +122,7 @@ (let (cmds) (while (re-search-forward "^\\s-+\\([a-z]+\\)" nil t) (setq cmds (cons (match-string 1) cmds))) - (pcomplete-uniqify-list cmds)))) + (pcomplete-uniquify-list cmds)))) (defun pcmpl-cvs-modules () "Return a list of available modules under CVS." @@ -132,7 +132,7 @@ (let (entries) (while (re-search-forward "\\(\\S-+\\)$" nil t) (setq entries (cons (match-string 1) entries))) - (pcomplete-uniqify-list entries)))) + (pcomplete-uniquify-list entries)))) (defun pcmpl-cvs-tags (&optional opers) "Return all the tags which could apply to the files related to OPERS." @@ -149,7 +149,7 @@ (error "Error in output from `cvs status -v'")) (setq tags (cons (match-string 1) tags)) (forward-line)))) - (pcomplete-uniqify-list tags))) + (pcomplete-uniquify-list tags))) (defun pcmpl-cvs-entries (&optional opers) "Return the Entries for the current directory. @@ -186,6 +186,6 @@ (setq entries (cons text entries)))) (forward-line)))) (setq pcomplete-stub nondir) - (pcomplete-uniqify-list entries))) + (pcomplete-uniquify-list entries))) ;;; pcmpl-cvs.el ends here === modified file 'lisp/pcmpl-gnu.el' --- lisp/pcmpl-gnu.el 2011-10-02 01:04:01 +0000 +++ lisp/pcmpl-gnu.el 2011-11-14 20:35:53 +0000 @@ -120,7 +120,7 @@ (while (re-search-forward (concat "^\\s-*\\([^\n#%.$][^:=\n]*\\)\\s-*:[^=]") nil t) (setq rules (append (split-string (match-string 1)) rules)))) - (pcomplete-uniqify-list rules)))) + (pcomplete-uniquify-list rules)))) (defcustom pcmpl-gnu-tarfile-regexp "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'" === modified file 'lisp/pcmpl-linux.el' --- lisp/pcmpl-linux.el 2011-07-04 20:08:02 +0000 +++ lisp/pcmpl-linux.el 2011-11-14 20:38:50 +0000 @@ -42,7 +42,7 @@ "Completion for GNU/Linux `kill', using /proc filesystem." (if (pcomplete-match "^-\\(.*\\)" 0) (pcomplete-here - (pcomplete-uniqify-list + (pcomplete-uniquify-list (split-string (pcomplete-process-result "kill" "-l"))) (pcomplete-match-string 1 0))) @@ -81,7 +81,7 @@ (args (split-string line " "))) (setq points (cons (nth 1 args) points))) (forward-line))) - (pcomplete-uniqify-list points)))) + (pcomplete-uniquify-list points)))) (defun pcomplete-pare-list (l r) "Destructively remove from list L all elements matching any in list R. @@ -108,7 +108,7 @@ (setq points (cons (nth 1 args) points))) (forward-line))) (pcomplete-pare-list - (pcomplete-uniqify-list points) + (pcomplete-uniquify-list points) (cons "swap" (pcmpl-linux-mounted-directories)))))) ;;; pcmpl-linux.el ends here === modified file 'lisp/pcmpl-rpm.el' --- lisp/pcmpl-rpm.el 2011-06-15 18:40:00 +0000 +++ lisp/pcmpl-rpm.el 2011-11-14 20:38:57 +0000 @@ -41,7 +41,7 @@ (pcomplete-process-result "rpm" "-q" (car pkgs) flag))) (setq pkgs (cdr pkgs))) - (pcomplete-uniqify-list (cdr provs)))) + (pcomplete-uniquify-list (cdr provs)))) (defsubst pcmpl-rpm-files () (pcomplete-dirs-or-entries "\\.rpm\\'")) === modified file 'lisp/pcmpl-unix.el' --- lisp/pcmpl-unix.el 2011-10-14 18:39:16 +0000 +++ lisp/pcmpl-unix.el 2011-11-14 20:38:42 +0000 @@ -111,7 +111,7 @@ (point))) ":"))) (setq names (cons (nth 0 fields) names))) (forward-line)))) - (pcomplete-uniqify-list names))) + (pcomplete-uniquify-list names))) (defsubst pcmpl-unix-group-names () "Read the contents of /etc/group for group names." === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2011-10-03 16:49:56 +0000 +++ lisp/pcomplete.el 2011-11-14 20:39:26 +0000 @@ -999,7 +999,7 @@ (function (lambda (opt) (concat "-" opt))) - (pcomplete-uniqify-list choices)))) + (pcomplete-uniquify-list choices)))) (let ((arg (pcomplete-arg))) (when (and (> (length arg) 1) (stringp arg) @@ -1318,7 +1318,7 @@ ;; general utilities -(defun pcomplete-uniqify-list (l) +(defun pcomplete-uniquify-list (l) "Sort and remove multiples in L." (setq l (sort l 'string-lessp)) (let ((m l))
[Message part 3 (message/rfc822, inline)]
From: Paul Eggert <eggert <at> cs.ucla.edu> To: 10048-done <at> debbugs.gnu.org Subject: Re: uniquify -> uniquify, for more-consistent function names Date: Sun, 4 Mar 2018 18:03:49 -0800[Message part 4 (text/plain, inline)]I installed the attached and am closing this old bug report.[0001-uniqify-uniquify.patch (text/x-patch, attachment)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.