Upgrade packages

elpa/archives/gnu/archive-contents

@@ -1403,7 +1403,7 @@
 	      (:maintainer "Michael Heerdegen" . "michael_heerdegen@web.de")
 	      (:url . "https://github.com/michael-heerdegen/on-screen.el"))])
  (org .
-      [(9 2 6)
+      [(9 3)
        nil "Outline-based notes management and organizer" tar
        ((:url . "https://orgmode.org")
 	(:maintainer "Carsten Dominik <carsten at orgmode dot org>")
@@ -1509,7 +1509,7 @@
 	     ("Phillip Lord" . "phillip.lord@russet.org.uk"))
 	    (:url . "http://elpa.gnu.org/packages/persist.html"))])
  (phps-mode .
-	    [(0 3 20)
+	    [(0 3 21)
 	     ((emacs
 	       (26)))
 	     "Major mode for PHP with Semantic integration" tar

elpa/berrys-theme-20191106.1423/berrys-theme-pkg.el

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "berrys-theme" "20191106.1423" "A light, clean and elegant theme" '((emacs "24.1")) :commit "1fcc22758abf33b42826750ed0774ee0f6601d2b" :authors '(("Slava Buzin" . "v8v.buzin@gmail.com")) :maintainer '("Slava Buzin" . "v8v.buzin@gmail.com") :url "https://github.com/vbuzin/berrys-theme")

elpa/berrys-theme-20191201.1609/berrys-theme-pkg.el

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "berrys-theme" "20191201.1609" "A light, clean and elegant theme" '((emacs "24.1")) :commit "888a14206b2fb3dc45b5273aeb05075f3e0b5f60" :authors '(("Slava Buzin" . "v8v.buzin@gmail.com")) :maintainer '("Slava Buzin" . "v8v.buzin@gmail.com") :url "https://github.com/vbuzin/berrys-theme")

elpa/berrys-theme-20191201.1609/berrys-theme.el

@@ -5,7 +5,7 @@
 ;; Title: Berrys Theme
 ;; Project: berrys-theme
 ;; Version: 0.1.0
-;; Package-Version: 20191106.1423
+;; Package-Version: 20191201.1609
 ;; URL: https://github.com/vbuzin/berrys-theme
 ;; Author: Slava Buzin <v8v.buzin@gmail.com>
 ;; Package-Requires: ((emacs "24.1"))
@@ -226,7 +226,7 @@
    `(helm-resume-need-update ((,class (:foreground ,berrys01 :background ,berrys10))))
    `(helm-selection ((,class (:inherit highlight))))
    `(helm-selection-line ((,class (:inherit highlight))))
-   `(helm-source-header ((,class (:foreground ,berrys02 :weight bold :height 1.3))))
+   `(helm-source-header ((,class (:foreground ,berrys02 :weight bold :height 1.2))))
    `(helm-separator ((,class (:foreground ,berrys02))))
    `(helm-visible-mark ((,class (:background ,berrys06))))
    `(helm-yas-key ((,class (:inherit helm-M-x-key))))
@@ -335,7 +335,7 @@
    `(org-agenda-dimmed-todo-face ((,class (:foreground ,berrys-comment :slant italic))))
    `(org-agenda-done ((,class (:foreground ,berrys-string :slant italic :strike-through t))))
    `(org-agenda-restriction-lock ((,class (:background ,berrys04))))
-   `(org-agenda-structure ((,class (:foreground ,berrys05 :weight bold :height 1.3))))
+   `(org-agenda-structure ((,class (:foreground ,berrys02 :weight bold :height 1.2))))
    `(org-block ((,class (:inherit berrys02))))
    `(org-clock-overlay ((,class (:inherit secondary-selection))))
    `(org-column ((,class (:foreground ,berrys-string :slant normal))))

elpa/company-20191206.33/company-capf.el

@@ -188,18 +188,20 @@ so we can't just use the preceding variable instead.")
 (defun company--capf-post-completion (arg)
   (let* ((res company-capf--current-completion-data)
          (exit-function (plist-get (nthcdr 4 res) :exit-function))
-         (table (nth 3 res))
-         (pred (plist-get (nthcdr 4 res) :predicate)))
+         (table (nth 3 res)))
     (if exit-function
-        ;; Follow the example of `completion--done'.
+        ;; We can more or less know when the user is done with completion,
+        ;; so we do something different than `completion--done'.
         (funcall exit-function arg
                  ;; FIXME: Should probably use an additional heuristic:
                  ;; completion-at-point doesn't know when the user picked a
                  ;; particular candidate explicitly (it only checks whether
                  ;; further completions exist). Whereas company user can press
                  ;; RET (or use implicit completion with company-tng).
-                 (if (eq (try-completion arg table pred) t)
-                     'finished 'sole)))))
+                 (if (= (car (completion-boundaries arg table nil ""))
+                        (length arg))
+                     'sole
+                   'finished)))))
 
 (provide 'company-capf)
 

elpa/company-20191206.33/company-clang.el

@@ -48,6 +48,16 @@ and `c-electric-colon', for automatic completion right after \">\" and
 \":\"."
   :type 'boolean)
 
+(defcustom company-clang-use-compile-flags-txt nil
+  "When non-nil, use flags from compile_flags.txt if present.
+
+The lines from that files will be appended to `company-clang-arguments'.
+
+And if such file is found, Clang is called from the directory containing
+it.  That allows the flags use relative file names within the project."
+  :type 'boolean
+  :safe 'booleanp)
+
 (defcustom company-clang-arguments nil
   "Additional arguments to pass to clang when completing.
 Prefix files (-include ...) can be selected with `company-clang-set-prefix'
@@ -249,13 +259,36 @@ or automatically through a custom `company-clang-prefix-guesser'."
   (append '("-fsyntax-only" "-Xclang" "-code-completion-macros")
           (unless (company-clang--auto-save-p)
             (list "-x" (company-clang--lang-option)))
-          company-clang-arguments
+          (company-clang--arguments)
           (when (stringp company-clang--prefix)
             (list "-include" (expand-file-name company-clang--prefix)))
           (list "-Xclang" (format "-code-completion-at=%s"
                                   (company-clang--build-location pos)))
           (list (if (company-clang--auto-save-p) buffer-file-name "-"))))
 
+(defun company-clang--arguments ()
+  (let ((fname "compile_flags.txt")
+        (args company-clang-arguments)
+        current-dir-rel)
+    (when company-clang-use-compile-flags-txt
+      (let ((dir (locate-dominating-file default-directory fname)))
+        (when dir
+          (setq current-dir-rel (file-relative-name default-directory dir))
+          (setq default-directory dir)
+          (with-temp-buffer
+            (insert-file-contents fname)
+            (setq args
+                  (append
+                   args
+                   (split-string (buffer-substring-no-properties
+                                  (point-min) (point-max))
+                                 "[\n\r]+"
+                                 t
+                                 "[ \t]+"))))
+          (unless (equal current-dir-rel "./")
+            (push (format "-I%s" current-dir-rel) args)))))
+    args))
+
 (defun company-clang--candidates (prefix callback)
   (and (company-clang--auto-save-p)
        (buffer-modified-p)
@@ -263,13 +296,14 @@ or automatically through a custom `company-clang-prefix-guesser'."
   (when (null company-clang--prefix)
     (company-clang-set-prefix (or (funcall company-clang-prefix-guesser)
                                   'none)))
-  (apply 'company-clang--start-process
-         prefix
-         callback
-         (company-clang--build-complete-args
-          (if (company-clang--check-version 4.0 9.0)
-              (point)
-            (- (point) (length prefix))))))
+  (let ((default-directory default-directory))
+    (apply 'company-clang--start-process
+           prefix
+           callback
+           (company-clang--build-complete-args
+            (if (company-clang--check-version 4.0 9.0)
+                (point)
+              (- (point) (length prefix)))))))
 
 (defun company-clang--prefix ()
   (if company-clang-begin-after-member-access

elpa/company-20191206.33/company-pkg.el

@@ -1,4 +1,4 @@
-(define-package "company" "20191127.16" "Modular text completion framework"
+(define-package "company" "20191206.33" "Modular text completion framework"
   '((emacs "24.3"))
   :keywords
   '("abbrev" "convenience" "matching")

elpa/ein-20191201.1831/ein-completer.el

@@ -109,44 +109,57 @@
 
 (defun ein:completions-get-cached (partial oinfo-cache)
   (cl-loop for candidate being the hash-keys of oinfo-cache
-    when (string-prefix-p partial candidate)
-    collect candidate))
+           when (string-prefix-p partial candidate)
+           collect candidate))
 
-(defun ein:completions--get-oinfo (obj)
+(defun ein:completions--get-oinfo (objs)
   (let ((d (deferred:new #'identity))
         (kernel (ein:get-kernel)))
     (if (ein:kernel-live-p kernel)
         (ein:kernel-execute
          kernel
-         (format "__ein_print_object_info_for(__ein_maybe_undefined_object(r\"%s\", locals()))" obj)
+         (format "__ein_generate_oinfo_data(%s, locals())" objs)
          (list
           :output `(,(lambda (d* &rest args) (deferred:callback-post d* args)) . ,d)))
       (deferred:callback-post d "kernel not live"))
     d))
 
-(defun ein:completions--build-oinfo-cache (objs)
-  (let ((kernel (ein:get-kernel)))
-    (dolist (o (-non-nil objs))
-      (deferred:$
-        (deferred:next
-          (lambda ()
-            (ein:completions--get-oinfo (ein:trim o "\\s-\\|\n\\|\\."))))
-        (deferred:nextc it
-          (lambda (output)
-            (if (stringp output)
-                (ein:display-warning output :error)
-              (ein:completions--prepare-oinfo output o kernel))))))))
+(defvar ein:oinfo-chunk-size 50)
 
-(defun ein:completions--prepare-oinfo (output obj kernel)
+(defun ein:completions--build-oinfo-cache (objects)
+  (cl-labels ((object-string (o)
+                             (format "'%s'" (ein:trim o "\\s-\\|\n\\|\\.")))
+              (to-ostrings (objs)
+                           (s-join ", " (-map #'(lambda (x) (object-string x))
+                                              objs)))
+              (do-completions (ostrings kernel)
+                              (deferred:$
+                                (deferred:next
+                                  (lambda ()
+                                    (ein:completions--get-oinfo ostrings)))
+                                (deferred:nextc it
+                                  (lambda (output)
+                                    (if (stringp output)
+                                        (ein:display-warning output :error)
+                                      (ein:completions--prepare-oinfo output objects kernel)))))))
+    (if (< (length objects) ein:oinfo-chunk-size)
+        (do-completions (format "[%s]" (to-ostrings (-non-nil objects))) (ein:get-kernel))
+      (dolist (chunk (-partition-all ein:oinfo-chunk-size (-non-nil objects)))
+        (do-completions (format "[%s]" (to-ostrings chunk)) (ein:get-kernel))))))
+
+
+(defun ein:completions--prepare-oinfo (output objs kernel)
   (condition-case err
       (cl-destructuring-bind (msg-type content _) output
         (ein:case-equal msg-type
           (("stream" "display_data" "pyout" "execute_result")
            (ein:aif (plist-get content :text)
-               (let ((oinfo (ein:json-read-from-string it)))
-                 (unless (string= (plist-get oinfo :string_form) "None")
-                   (setf (gethash obj (ein:$kernel-oinfo-cache kernel))
-                         oinfo)))))
+               (let ((all-oinfo (ein:json-read-from-string it)))
+                 (cl-loop for oinfo in all-oinfo
+                          for obj in objs
+                          doing (unless (string= (plist-get oinfo :string_form) "None")
+                                  (setf (gethash obj (ein:$kernel-oinfo-cache kernel))
+                                        oinfo))))))
           (("error" "pyerr")
            (ein:log 'verbose "ein:completions--prepare-oinfo: %s"
                     (plist-get content :traceback)))))
@@ -154,8 +167,7 @@
      (ein:log 'verbose "ein:completions--prepare-oinfo: [%s]"
               (error-message-string err))
      (let (eval-expression-print-length eval-expression-print-level)
-       (prin1 output #'external-debugging-output))
-     (setf (gethash obj (ein:$kernel-oinfo-cache kernel)) :json-false))))
+       (prin1 output #'external-debugging-output)))))
 
 ;;; Support for Eldoc