Merge branch 'parsebib'

Split out the functions used for reading .bib files into a separate
library `parsebib'.

Conflicts:
	ebib-db.el
	ebib-utils.el
	ebib.el
	ebib.info

1 files changed, 10 insertions, 10 deletions

diff --git a/ebib-keywords.el b/ebib-keywords.el
index c1c751a..1fd7aff 100644
--- a/ebib-keywords.el
+++ b/ebib-keywords.el
@@ -113,21 +113,21 @@ Also automatically remove duplicates."
   "Check if there is a keywords file for DB and make sure it is loaded."
   (unless (or (not ebib-keywords-file)
               (file-name-directory ebib-keywords-file))
-    (let ((dir (expand-file-name (file-name-directory (ebib--db-get-filename db)))))
+    (let ((dir (expand-file-name (file-name-directory (ebib-db-get-filename db)))))
       (if dir
           (let ((keyword-list (ebib--read-file-to-list (concat dir ebib-keywords-file))))
             ;; note: even if keyword-list is empty, we store it, because the user
             ;; may subsequently add keywords.
             (add-to-list 'ebib--keywords-files-alist    ; add the dir if not in the list yet
                          (list dir keyword-list nil)   ; the extra empty list is for new keywords
-                         t #'(lambda (x y) (equal (car x) (car y)))))))))
+                         t (lambda (x y) (equal (car x) (car y)))))))))
 
 (defun ebib--keywords-add-keyword (keyword db)
   "Add KEYWORD to the list of keywords for DB."
   (if (not ebib-keywords-file)        ; only the general list exists
       (add-to-list 'ebib--keywords-list-per-session keyword t)
     (let ((dir (or (file-name-directory ebib-keywords-file)      ; a single keywords file
-                   (file-name-directory (ebib--db-get-filename db)))))    ; per-directory keywords files
+                   (file-name-directory (ebib-db-get-filename db)))))    ; per-directory keywords files
       (push keyword (cl-third (assoc dir ebib--keywords-files-alist))))))
 
 (defun ebib--keywords-for-database (db)
@@ -137,7 +137,7 @@ When the keywords come from a file, add the keywords in
   (if (not ebib-keywords-file)        ; only the general list exists
       ebib--keywords-list-per-session
     (let* ((dir (or (file-name-directory ebib-keywords-file)     ; a single keywords file
-                    (file-name-directory (ebib--db-get-filename db))))    ; per-directory keywords files
+                    (file-name-directory (ebib-db-get-filename db))))    ; per-directory keywords files
            (lst (assoc dir ebib--keywords-files-alist)))
       (append (cl-second lst) (cl-third lst)))))
 
@@ -146,7 +146,7 @@ When the keywords come from a file, add the keywords in
   (if (and ebib-keywords-file ; TODO not sure if this function'll work correctly if ebib--keywords-file is NIL.
            (file-name-directory ebib-keywords-file))
       ebib-keywords-file
-    (concat (file-name-directory (ebib--db-get-filename db)) ebib-keywords-file)))
+    (concat (file-name-directory (ebib-db-get-filename db)) ebib-keywords-file)))
 
 (defun ebib--keywords-save-to-file (keyword-file-descr)
   "Save all keywords in KEYWORD-FILE-DESCR to the associated file.
@@ -159,8 +159,8 @@ keywords and the third the keywords added in this session."
                 (concat (car keyword-file-descr) ebib-keywords-file))))
     (if (file-writable-p file)
         (with-temp-buffer
-          (mapc #'(lambda (keyword)
-                    (insert (format "%s\n" keyword)))
+          (mapc (lambda (keyword)
+                  (insert (format "%s\n" keyword)))
                 (append (cl-second keyword-file-descr) (cl-third keyword-file-descr)))
           (write-region (point-min) (point-max) file))
       (ebib--log 'warning "Could not write to keyword file `%s'" file))))
@@ -192,7 +192,7 @@ Optional argument DB specifies the database to check for."
   (if db
       (let* ((dir (or (and ebib-keywords-file
                            (file-name-directory ebib-keywords-file)) ; a single keywords file
-                      (file-name-directory (ebib--db-get-filename db)))) ; per-directory keywords files
+                      (file-name-directory (ebib-db-get-filename db)))) ; per-directory keywords files
              (lst (assoc dir ebib--keywords-files-alist)))
         (if (cl-third lst)
             lst))
@@ -208,8 +208,8 @@ Optional argument DB specifies the database to check for."
                    (and (eq ebib-keywords-file-save-on-exit 'ask)
                         (y-or-n-p (format "New keywords were added. Save '%s'? "
                                           (file-name-nondirectory ebib-keywords-file)))))) ; strip path for succinctness
-      (mapc #'(lambda (elt)
-                (ebib--keywords-save-to-file elt))
+      (mapc (lambda (elt)
+              (ebib--keywords-save-to-file elt))
             new))))
 
 (provide 'ebib-keywords)