branch: master
commit d6c339acde60d36d9d27482d28577bf030e841e4
Author: Michael Heerdegen <michael_heerde...@web.de>
Commit: Michael Heerdegen <michael_heerde...@web.de>
[el-search] Small fix for my last commit
Skip 'proper-list-p' test when that function is not defined. Bump
version to 1.9.6.
* packages/el-search/el-search.el (el-search--simple-regexp-like-p):
Only perform 'proper-list-p' test when the used Emacs version has
defined that function. Rename the function's argument.
---
packages/el-search/el-search.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 66f84e7..dc2b30c 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -7,7 +7,7 @@
;; Created: 29 Jul 2015
;; Keywords: lisp
;; Compatibility: GNU Emacs 25
-;; Version: 1.9.5
+;; Version: 1.9.6
;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
@@ -2087,12 +2087,12 @@ Introduction to El-Search
;;;; Additional pattern type definitions
-(defun el-search--simple-regexp-like-p (thing)
- (or (atom thing)
- (functionp thing)
- (and (consp thing)
- (proper-list-p thing)
- (not (consp (car thing))))))
+(defun el-search--simple-regexp-like-p (object)
+ (or (atom object)
+ (functionp object)
+ (and (consp object)
+ (if (fboundp 'proper-list-p) (proper-list-p object) t)
+ (not (consp (car object))))))
(defun el-search-regexp-like-p (object)
"Return non-nil when OBJECT is regexp like.
