diff options
| author | Mark Oteiza | 2016-09-27 13:34:29 -0400 |
|---|---|---|
| committer | Mark Oteiza | 2016-09-27 13:34:29 -0400 |
| commit | 329e0274ec6a4ae82f86905b8cf844971b943085 (patch) | |
| tree | 4f805f66173aa106b4c2cb1a84b757960ad8f355 | |
| parent | 739c538cf818c3884c07b6a9c7e8a5abe279cb1d (diff) | |
| download | emacs-329e0274ec6a4ae82f86905b8cf844971b943085.tar.gz emacs-329e0274ec6a4ae82f86905b8cf844971b943085.zip | |
; Fix previous change
* lisp/woman.el (woman-parse-man.conf, woman-manpath-add-locales)
(woman-cached-data): Use :test #'equal for instances of cl-pushnew.
| -rw-r--r-- | lisp/woman.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/woman.el b/lisp/woman.el index 9c3fb2ab4cd..3822ce6f1a5 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -572,7 +572,7 @@ MANPATH_MAP[ \t]+\\(\\S-+\\)[ \t]+\\(\\S-+\\)\\)" nil t) | |||
| 572 | (match-string 1) | 572 | (match-string 1) |
| 573 | (cons (match-string 2) | 573 | (cons (match-string 2) |
| 574 | (match-string 3))) | 574 | (match-string 3))) |
| 575 | manpath)) | 575 | manpath :test #'equal)) |
| 576 | manpath)) | 576 | manpath)) |
| 577 | )) | 577 | )) |
| 578 | (setq path (cdr path))) | 578 | (setq path (cdr path))) |
| @@ -626,9 +626,9 @@ of `woman-expand-locale' on `woman-locale' added, where they exist." | |||
| 626 | (cl-pushnew (if (consp elem) | 626 | (cl-pushnew (if (consp elem) |
| 627 | (cons (car elem) dir) | 627 | (cons (car elem) dir) |
| 628 | dir) | 628 | dir) |
| 629 | lst))) | 629 | lst :test #'equal))) |
| 630 | ;; Non-locale-specific has lowest precedence. | 630 | ;; Non-locale-specific has lowest precedence. |
| 631 | (cl-pushnew elem lst))))) | 631 | (cl-pushnew elem lst :test #'equal))))) |
| 632 | 632 | ||
| 633 | (defcustom woman-manpath | 633 | (defcustom woman-manpath |
| 634 | ;; Locales could also be added in woman-expand-directory-path. | 634 | ;; Locales could also be added in woman-expand-directory-path. |
| @@ -1197,7 +1197,8 @@ Called both to generate and to check the cache!" | |||
| 1197 | (setq path | 1197 | (setq path |
| 1198 | (split-string (getenv "PATH") path-separator t))) | 1198 | (split-string (getenv "PATH") path-separator t))) |
| 1199 | (setq dir (and (member (car dir) path) (cdr dir)))) | 1199 | (setq dir (and (member (car dir) path) (cdr dir)))) |
| 1200 | (when dir (cl-pushnew (substitute-in-file-name dir) lst)))) | 1200 | (when dir |
| 1201 | (cl-pushnew (substitute-in-file-name dir) lst :test #'equal)))) | ||
| 1201 | (mapcar 'substitute-in-file-name woman-path))) | 1202 | (mapcar 'substitute-in-file-name woman-path))) |
| 1202 | 1203 | ||
| 1203 | (defun woman-read-directory-cache () | 1204 | (defun woman-read-directory-cache () |