procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/play/cookie1.el (cookie-apropos): Minor simplification.

Browse source
This commit is contained in:
Glenn Morris 2013-06-21 20:37:18 -04:00
parent 3d94f3ad81
commit 2663dd23eb
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -1,5 +1,7 @@
2013-06-22 Glenn Morris <rgm@fencepost.gnu.org>
* play/cookie1.el (cookie-apropos): Minor simplification.
* progmodes/gdb-mi.el (gdb-mapcar*): Remove, replace with cl-mapcar.
2013-06-22 Dmitry Gutov <dgutov@yandex.ru>

36
lisp/play/cookie1.el
View file

@ -194,34 +194,28 @@ If called interactively, or if DISPLAY is non-nil, display a list of matches."
(if (or current-prefix-arg (not cookie-file))
(read-file-name "Cookie file: " nil
cookie-file t cookie-file)
cookie-file)))
cookie-file) t))
(setq phrase-file (cookie-check-file phrase-file))
;; Make sure phrases are loaded.
(cookie phrase-file)
(let* ((case-fold-search t)
(cookie-table-symbol (intern phrase-file cookie-cache))
(string-table (symbol-value cookie-table-symbol))
(matches nil)
(len (length string-table))
(i 0))
(save-match-data
(while (< i len)
(and (string-match regexp (aref string-table i))
(setq matches (cons (aref string-table i) matches)))
(setq i (1+ i))))
(and matches
(matches nil))
(and (dotimes (i (length string-table) matches)
(and (string-match-p regexp (aref string-table i))
(setq matches (cons (aref string-table i) matches))))
(setq matches (sort matches 'string-lessp)))
(and (or display (called-interactively-p 'interactive))
(cond ((null matches)
(message "No matches found."))
(t
(let ((l matches))
(with-output-to-temp-buffer "*Cookie Apropos*"
(while l
(princ (car l))
(setq l (cdr l))
(and l (princ "\n\n")))
(help-print-return-message))))))
(and display
(if matches
(let ((l matches))
(with-output-to-temp-buffer "*Cookie Apropos*"
(while l
(princ (car l))
(setq l (cdr l))
(and l (princ "\n\n")))
(help-print-return-message)))
(message "No matches found.")))
matches))