[ELPA-diffs] UNNAMED PROJECT branch, master, updated. b72e08e1b156722f3149255394d7b8a9f04da685
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, master has been updated via b72e08e1b156722f3149255394d7b8a9f04da685 (commit) via fe154a977d7f9c0987233b5429a846e61d1d6f82 (commit) from 232a509cd50fdcdc616748dd827dbe3e2cc6e72c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit b72e08e1b156722f3149255394d7b8a9f04da685 Author: Stefan Monnier Date: Sat Aug 10 09:56:31 2013 -0400 Get "make -k" to go through diff --git a/.bzrignore b/.bzrignore index 9c9e22e..74d9174 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,8 +1,11 @@ *.elc +*~ +ChangeLog archive -site +core +externals-list packages/*/*-autoloads.el packages/*/*-pkg.el -core -ChangeLog packages/.changelog-witness +packages/dismal +site diff --git a/GNUmakefile b/GNUmakefile index 7f2061d..3199fcc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,34 +9,16 @@ SITE_DIR=site all: all-in-place -## Set up the source files for direct usage, by pointing -## `package-directory-list' to the site/ directory. -site: packages - mkdir -p $(SITE_DIR) - $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \ - --eval "(batch-make-site-dir \"packages\" \"$(SITE_DIR)\")" - -site/%: do-it - $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \ - --eval "(progn (setq debug-on-error t) (batch-make-site-package \"$@\"))" - ## Deploy the package archive to archive/, with packages in ## archive/packages/: archive: archive-tmp $(MAKE) $(MFLAGS) process-archive -archive-tmp: packages changelogs +archive-tmp: packages -rm -r $(ARCHIVE_TMP) mkdir -p $(ARCHIVE_TMP) cp -a packages/. $(ARCHIVE_TMP)/packages -# Refresh the ChangeLog files. This needs to be done in -# the source tree, because it needs the Bzr data! -changelogs: - cd packages; \ - $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \ - -f batch-prepare-packages - process-archive: # FIXME, we could probably speed this up significantly with # rules like "%.tar: ../%/ChangeLog" so we only rebuild the packages @@ -75,7 +57,7 @@ org-fetch: archive-tmp clean: rm -rf archive $(ARCHIVE_TMP) $(SITE_DIR) -## Rules for in-place installation ## +## Rules for in-place installation pkgs := $(foreach pkg, $(wildcard packages/*), \ $(if $(shell [ -d "$(pkg)" ] && echo true), $(pkg))) @@ -152,3 +134,7 @@ $(extra_elcs):; rm $@ all-in-place: $(extra_elcs) $(autoloads) # $(single_pkgs) # Do them in a sub-make, so that autoloads are done first. $(MAKE) elcs + + +### Rules to prepare the externals + diff --git a/admin/archive-contents.el b/admin/archive-contents.el index 56daa8e..5a5462a 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -1,4 +1,4 @@ -;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. +;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. -*- lexical-binding:t -*- ;; Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc @@ -24,6 +24,7 @@ (eval-when-compile (require 'cl)) (require 'lisp-mnt) (require 'package) +(require 'pcase) (defconst archive-contents-subdirectory-regexp "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)") @@ -86,7 +87,7 @@ Delete backup files also." (write-region nil nil "archive-contents" (defun batch-prepare-packages () - "Prepare the `packages' directory inside the Bzr checkout. + "Prepare the `packages' directory inside the Git checkout. Expects to be called from within the `packages' directory. \"Prepare\" here is for subsequent construction of the packages and archive, so it is meant to refresh any generated files we may need. @@ -218,6 +219,7 @@ package commentary to PKG-readme.txt. Return the descriptor." (if (file-readable-p "ChangeLog") (insert-file-contents "ChangeLog")) (let ((old-md5 (md5 (current-buffer (erase-buffer) + ;; git --no-pager log --date=short --format="%cd %aN <%ae>%n%n%w(80,8,8)%B%n" | sed 's/^/\t/' (call-process "bzr" nil (current-buffer) nil "log" "--gnu-changelog" ".") (if (equal old-md5 (md5 (current-buffer))) @@ -355,40 +357,95 @@ PKG-readme.txt. Return the descriptor." ((>= bytes 10) (format "%4.1f%s" bytes (car units))) (t (format "%4.2f%s" bytes (car units)) +(defun archive--get-prop (prop name srcdir mainsrcfile) + (let ((kprop (intern (format ":%s" (downcase prop) +
[ELPA-diffs] UNNAMED PROJECT branch, externals/dismal, updated. 527e7fa37e23797ab9b59c505d9b4870bd49854c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, externals/dismal has been updated via 527e7fa37e23797ab9b59c505d9b4870bd49854c (commit) from 912b349940d4d09b338a9839fe598ad7ed3c74c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 527e7fa37e23797ab9b59c505d9b4870bd49854c Author: Stefan Monnier Date: Sat Aug 10 23:23:57 2013 -0400 Get "make -k" to go through diff --git a/dismal.el b/dismal.el index db12b5a..3537e24 100644 --- a/dismal.el +++ b/dismal.el @@ -263,6 +263,7 @@ confirmed on entering.") dis-copy-to-dismal dis-grader dis-ungrader) "Functions the user can put in a cell.") +(define-obsolete-variable-alias 'dismal-map 'dismal-mode-map "Dismal-1.5") (defvar dismal-mode-map (let ((map (make-keymap))) (suppress-keymap map) @@ -415,7 +416,6 @@ confirmed on entering.") ;; dis-recalculate-matrix map) "Keymap for Dismal mode.") -(define-obsolete-variable-alias 'dismal-map 'dismal-mode-map "Dismal-1.5") vi. Requires and loads and autoloads @@ -430,7 +430,7 @@ confirmed on entering.") (require 'rmatrix) (require 'dismal-data-structures) (require 'dismal-simple-menus) -(require 'soar-misc) +;; (require 'soar-misc) ;; (require 'dismal-metacolumn) (autoload 'dis-set-metacolumn @@ -620,7 +620,7 @@ a list with up to four elements: (defvar dismal-default-column-format (vector dis-default-column-width dis-default-column-decimal - dis-default-column-alignment] + dis-default-column-alignment) "Columns corresponding to nil elements or elements beyond the end of dismal-column-formats are considered to have this format. An array that is width, decimals shown, and justification (default, left, right, center).") @@ -1793,7 +1793,7 @@ C-g when search is successful aborts and moves point to starting point." "Do nonincremental search forward for SEARCH-STRING times TIMES." (interactive "cDismal search: ") (if (not (stringp search-string)) - (error "Search string %s must be a string")) + (error "Search string %S must be a string" search-string)) (if (not (numberp times)) (setq times 1)) (let ((i dismal-current-row) (j dismal-current-col) @@ -2175,8 +2175,9 @@ argument, inserts the month first." ;;(require 'dismal-mouse-x) ;; moved down here so they would load, 19-Jun-96 -FER +(when t ;; Don't do those `require' at compile-time. (require 'dismal-mouse3) -(require 'dismal-menu3) +(require 'dismal-menu3)) ;; 2-8-93 - EMA: behaves just like move-to-window-line: (defun dis-move-to-window-line (arg) @@ -2884,42 +2885,42 @@ This gives the cell(s) characters all in upper case." ;; (heap-aref dismal-invalid-heap 0) (defun dismal-update-cycle () (let ((prev nil)) - (while (not (heap-empty dismal-invalid-heap)) -(let* ((addr (heap-deletemin dismal-invalid-heap)) - (r (dismal-address-row addr)) - (c (dismal-address-col addr)) - (new-val nil) - (old-val (dismal-get-val r c))) - (if dis-show-update - (message "Starting with old-val of %s:%s of %s" r c old-val)) - (if (equal addr prev) - nil -(setq new-val (dismal-set-val r c (dismal-eval (dismal-get-exp r c -;;(message "updat'n %s, got [%s] had [%s] equal= %s" -;;addr new-val old-val (equal old-val new-val)) (sit-for 1) -(if (not (equal old-val new-val)) -(let ((dismal-invalid-heap dismal-invalid-heap-not)) - (dismal-invalidate-cell addr))) -(dismal-redraw-cell r c t)) - (setq prev addr) +(while (not (heap-empty dismal-invalid-heap)) + (let* ((addr (heap-deletemin dismal-invalid-heap)) + (r (dismal-address-row addr)) + (c (dismal-address-col addr)) + (new-val nil) + (old-val (dismal-get-val r c))) +(if dis-show-update +(message "Starting with old-val of %s:%s of %s" r c old-val)) +(if (equal addr prev) +nil + (setq new-val (dismal-set-val r c (dismal-eval (dismal-get-exp r c + ;;(message "updat'n %s, got [%s] had [%s] equal= %s" + ;;addr new-val old-val (equal old-val new-val)) (sit-for 1) + (if (not (equal old-val new-val)) + (let ((dismal-invalid-heap dismal-invalid-heap-not)) +(dismal-invalidate-cell addr))) + (dismal-redraw-cell r c t)) +(setq prev addr) (defun dismal-invalidate-cell (addr) ;; Mark the cell at ADDR invalid (if necessary) and (recursively) all cells ;; that depend on it, by inserting their addresses into dismal-invalid-heap.
[ELPA-diffs] UNNAMED PROJECT branch, externals/dismal, updated. 629647abbf6587eddf1a7e271e724cd0b6321771
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, externals/dismal has been updated via 629647abbf6587eddf1a7e271e724cd0b6321771 (commit) from 527e7fa37e23797ab9b59c505d9b4870bd49854c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 629647abbf6587eddf1a7e271e724cd0b6321771 Author: Stefan Monnier Date: Sun Aug 11 00:26:44 2013 -0400 Get "make" to go through diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..36eb56c --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.elc +*-autoloads.el +*~ +ChangeLog diff --git a/heaps.el b/heaps.el index 1ea94f8..42b1c49 100644 --- a/heaps.el +++ b/heaps.el @@ -41,33 +41,34 @@ ;; (heap-last heap)- amount of space used, ;;address of last element -(defmacro heap-compare (h a b) +(defsubst heap-compare (h a b) "Use HEAP's compare function to compare elements A and B. Argument H " - (list 'apply (list 'aref h 0) a b nil)) + (funcall (aref h 0) a b)) -(defmacro heap-space (h) +(defsubst heap-space (h) "Return the amount of space available in HEAP's vector." - (list 'aref h 1)) + (aref h 1)) -(defmacro heap-last (h) +(defsubst heap-last (h) "Return the index of the element after the HEAP's last element." - (list 'aref h 2)) + (aref h 2)) -(defmacro heap-set-space (h v) (list 'aset h 1 v)) -(defmacro heap-set-last (h v) (list 'aset h 2 v)) +(defsubst heap-set-space (h v) (aset h 1 v)) +(defsubst heap-set-last (h v) (aset h 2 v)) -(defmacro heap-aref (h n) +(defsubst heap-aref (h n) "Return the HEAP's Nth element." - (list 'aref (list 'aref h 3) n)) + (aref (aref h 3) n)) -(defmacro heap-aset (h n v) +(defsubst heap-aset (h n v) "Set the HEAP's Nth element to V." - (list 'aset (list 'aref h 3) n v)) + (aset (aref h 3) n v)) -(defmacro heap-empty (h) - "Return t if HEAP is empty." - (list '= (list 'heap-last h) 0)) +(defsubst heap-empty-p (h) + "Return non-nil iff HEAP is empty." + (= (heap-last h) 0)) +(define-obsolete-function-alias 'heap-empty 'heap-empty-p "Dismal-1.5") (defsubst heap-swap (h i j) "Swap HEAP's I'th and J'th elements." @@ -76,7 +77,7 @@ Argument H " (heap-aset h i elem2) (heap-aset h j elem1))) -(defsubst heap-create (compare-function) +(defun heap-create (compare-function) "Create an empty priority queue (heap) with the given COMPARE-FUNCTION." (let ((heap (make-vector 4 nil))) (aset heap 0 compare-function) @@ -85,18 +86,18 @@ Argument H " (aset heap 3 (make-vector 1 nil)) heap)) -(defsubst heap-bubble-up (heap index) - "Helping function for heap-insert." - (if (> index 0) - (let* ((half (/ (1- index) 2)) - (elem (heap-aref heap index)) - (parent (heap-aref heap half)) - (comp (heap-compare heap parent elem))) -(if (<= comp 0) -() - (heap-aset heap index parent) - (heap-aset heap half elem) - (heap-bubble-up heap half) +(defun heap--bubble-up (heap index) + "Helping function for `heap-insert'." + (let* ((half (/ (1- index) 2)) + (elem (heap-aref heap index)) + (parent (heap-aref heap half)) + (comp (heap-compare heap parent elem))) +(if (<= comp 0) +() + (heap-aset heap index parent) + (heap-aset heap half elem) + (if (> index 0) + (heap--bubble-up heap half) (defsubst heap-insert (heap element) @@ -116,7 +117,8 @@ Argument H " ;; Put the new element in the next free position in the heap vector (heap-aset heap (heap-last heap) element) ;; Increment the element count -(heap-bubble-up heap (heap-last heap)) +(if (> index 0) +(heap--bubble-up heap (heap-last heap))) (heap-set-last heap (1+ (heap-last heap) (defun heap-deletemin (heap) diff --git a/log.el b/log.el index f87b6af..835eec2 100644 --- a/log.el +++ b/log.el @@ -151,6 +151,8 @@ ;;; Code: +(eval-when-compile (require 'cl)) + (defvar *log-data-directory* (concat (getenv "HOME") "/") ;; HERE: should write all files here diff --git a/make-km-aliases.el b/make-km-aliases.el index 6c72dff..0df64f9 100644 --- a/make-km-aliases.el +++ b/make-km-aliases.el @@ -92,9 +92,9 @@ word. \\[dismal-init-make-aliases] must be called first." (defun dismal--recursive-match-old-alias (alias cell set) "Return t if new alias matches but cell does not." (cond ((not set) nil) - ((string= alias (car (first set))) -(if (and (equal (car cell) (car (cdr (first set - (equal (cdr cell) (cdr (cdr (first set) + ((string= alias (car (car set))) +
