[Emacs-diffs] xwidget_mvp 5a90747 2/3: merge master

[Joakim Verona]

branch: xwidget_mvp
commit 5a907470e2076c5e0b0313ee46ebf17f436b2493
Merge: ef9db71 6148555
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>

    merge master
---
 ChangeLog.2        |  138 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile.in        |   16 ++----
 lisp/calculator.el |   67 +++++++++++++------------
 3 files changed, 176 insertions(+), 45 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index 3ebd2da..07a6c0e 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,139 @@
+2015-12-03  Glenn Morris  <address@hidden>
+
+       * Makefile.in: Avoid duplication.
+
+       (have-tests): New rule.
+       (check, check-maybe): Use it.
+
+2015-12-02  Phillip Lord  <address@hidden>
+
+       make check unconditional, check-maybe top-level.
+
+        * Makefile.in: Add check-maybe target.
+        * test/Makefile.in: Restore unconditional behaviour to make check.
+
+2015-12-01  Phillip Lord  <address@hidden>
+
+       Tests now support out-of-source-build.
+
+        * tests/Makefile.in,test/make-test-deps.emacs-lisp: Remove assumptions
+          about current working directory.
+
+2015-12-01  Artur Malabarba  <address@hidden>
+
+       * lisp/emacs-lisp/let-alist.el: Now an Elpa :core package
+
+2015-11-30  Phillip Lord  <address@hidden>
+
+       Improve documentation and clean up.
+
+        * test/Makefile.in: Improve documentation, use EMACS variable
+          correctly, and clean up makefile rules.
+
+2015-11-30  Phillip Lord  <address@hidden>
+
+       Update file headers for name change.
+
+        * (test/src/decompress-tests.el, test/src/alloc-tests.el): Update 
headers.
+
+2015-11-30  Phillip Lord  <address@hidden>
+
+       Test files renamed to new scheme.
+
+        * (finalizer-tests.el): Now renamed alloc-tests.el
+        * (zlib-tests.el): Now renamed decompress-tests.el.
+
+2015-11-30  Phillip Lord  <address@hidden>
+
+       Tests now depend on source files
+
+        * test/Makefile.in: Include dependences from tests to source files.
+        * test/make-test-deps.emacs-lisp: New file
+        * .gitignore: Ignore generated make include file
+
+2015-11-30  Stefan Monnier  <address@hidden>
+
+       * lisp/progmodes/which-func.el: Improve disabling the mode
+
+       Use lexical-binding.
+       (which-func-modes, which-func-non-auto-modes, which-func-maxout)
+       (which-func, which-func-format): Remove redundant :group arg.
+       (which-func-try-to-enable): New function.
+       (which-func-ff-hook, which-function-mode): Use it.
+       (mode-line-misc-info): Add ourselves here instead of in bindings.el.
+       * lisp/bindings.el (mode-line-misc-info): Remove which-func-mode entry.
+
+2015-11-30  Stefan Monnier  <address@hidden>
+
+       * lisp/calculator.el (calculator-define-key): Silence warning
+
+       ...about unknown calculator-mode-map.
+
+2015-11-29  Eli Barzilay  <address@hidden>
+
+       * lisp/calculator.el: more improvements and bugfixes.
+
+       - Mark `calculator-paste-decimals' as obsolete.  (It wasn't having an
+         effect anyway.)
+
+       - Simplify `calculator-number-to-string' by throwing most of the work
+         onto `number-to-string', leaving just some tweaks for decimal inputs.
+         This leads to some minor changes, for example, pasting "1x1" in hex
+         mode would warn that "x" is ignored and result in "11" (and it wasn't
+         done in decimal mode), whereas now it just ignores everything from the
+         "x" and on and result in a "1" just like in decimal input mode.  Also,
+         overflows are left for `number-to-string' to deal with.
+
+       - `calculator-paste' is very simple as a result.
+
+       - Extend the simplified `calculator-paste': with a prefix argument it
+         pastes a string as if the characters were entered.  This can be used
+         to reduce expressions, but note that it's a simple literal operation,
+         so precedence can be messed, a number can be paster while entering a
+         number, spaces and newlines matter, etc.
+
+       - Fix a minor bug where "e+" in hex mode wouldn't use "+" as an
+         operator.
+
+       - Fix a bug in `calculator-put-value': avoid grouping in the display
+         that is used to construct `calculator-curnum'.  This would trigger
+         when pasting or getting a value from a register in some radix mode
+         with a large enough value.  Another fix: make the output radix equal
+         the input one, otherwise numbers could be converted twice.
+
+2015-11-29  Eli Barzilay  <address@hidden>
+
+       * lisp/calculator.el: Re-do key bindings.
+
+       Use a helper function that arranges a parent keymap that binds alternate
+       case keys so if some letter key is unbound and it's un/shifted version
+       is, it will get used.  This makes the global-map trickery unnecessary.
+
+       Also switch to passing strings that name keys through `kbd'.
+
+2015-11-29  Eli Barzilay  <address@hidden>
+
+       * lisp/calculator.el: improve radix modes
+
+       Fix prompt for some input radix with decimal output (eg, "BD" instead of
+       the incorrect "B="); also, some minor docstring tweaks for these.
+
+2015-11-29  Eli Barzilay  <address@hidden>
+
+       * lisp/calculator.el: better reading of register names
+
+       Use `register-read-with-preview' with a dynamically bound
+       `register-alist' and a proper preview function to read register names.
+
+2015-11-29  Eli Barzilay  <address@hidden>
+
+       * lisp/calculator.el: General improvements
+
+       Use things like `when', `unless', and `push'.
+
+       Improve `calculator-last-input' so it doesn't barf when hitting `F1' in
+       non-electric mode.
+
 2015-11-28  Michael Albinus  <address@hidden>
 
        Fix a problem with gfilenotify in filenotify-tests.el
@@ -19897,7 +20033,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 9a2363ec04c24a6959902da9b8eff2f1559ab3e0 (inclusive).
+commit ffefb6e899fbcdcbd79cb34292d57b7bc3043fcc (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/Makefile.in b/Makefile.in
index 06e5b06..57e29d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -921,22 +921,16 @@ extraclean: $(extraclean_dirs:=_extraclean)
 TAGS tags: lib lib-src src
        $(MAKE) -C src tags
 
-
-check-maybe: all
+.PHONY: have-tests
+have-tests:
        @if test ! -d test; then \
          echo "You do not seem to have the test/ directory."; \
          echo "Maybe you are using a release tarfile, rather than a repository 
checkout."; \
-       else \
-         $(MAKE) -C test check-maybe; \
+        exit 1; \
        fi
 
-check: all
-       @if test ! -d test; then \
-         echo "You do not seem to have the test/ directory."; \
-         echo "Maybe you are using a release tarfile, rather than a repository 
checkout."; \
-       else \
-         $(MAKE) -C test check; \
-       fi
+check check-maybe: have-tests all
+       $(MAKE) -C test $@
 
 dist:
        cd ${srcdir}; ./make-dist
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 1d3715b..4f1ad76 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -379,6 +379,39 @@ Used for repeating operations in calculator-repR/L.")
 ;;;---------------------------------------------------------------------
 ;;; Key bindings
 
+(defun calculator-define-key (key cmd map)
+  ;; Arranges for unbound alphabetic keys to be used as their un/shifted
+  ;; versions if those are bound (mimics the usual Emacs global bindings).
+  ;; FIXME: We should adjust Emacs's native "fallback to unshifted binding"
+  ;; such that it can also be used here, rather than having to use a hack like
+  ;; this one.
+  (let* ((key  (if (stringp key) (kbd key) key))
+         (omap (keymap-parent map)))
+    (define-key map key cmd)
+    ;; "other" map, used for case-flipped bindings
+    (unless omap
+      (setq omap (make-sparse-keymap))
+      (suppress-keymap omap t)
+      (set-keymap-parent map omap))
+    (let ((m omap))
+      ;; Bind all case-flipped versions.
+      (dotimes (i (length key))
+        (let* ((c (aref key i))
+               (k (vector c))
+               (b (lookup-key m k))
+               (defkey (lambda (x)
+                         (define-key m k x)
+                         (when (and (characterp c)
+                                    (or (<= ?A c ?Z) (<= ?a c ?z)))
+                           (define-key m (vector (logxor 32 c)) x)))))
+          (cond ((= i (1- (length key)))
+                 ;; Prefer longer sequences.
+                 (unless (keymapp b) (funcall defkey cmd)))
+                ((keymapp b) (setq m b))
+                (t (let ((sub (make-sparse-keymap)))
+                     (funcall defkey sub)
+                     (setq m sub)))))))))
+
 (defvar calculator-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map t)
@@ -562,38 +595,6 @@ Used for repeating operations in calculator-repR/L.")
     map)
   "The calculator key map.")
 
-(defun calculator-define-key (key cmd &optional map)
-  ;; Arranges for unbound alphabetic keys to be used as their un/shifted
-  ;; versions if those are bound (mimics the usual Emacs global
-  ;; bindings).
-  (let* ((key  (if (stringp key) (kbd key) key))
-         (map  (or map calculator-mode-map))
-         (omap (keymap-parent map)))
-    (define-key map key cmd)
-    ;; "other" map, used for case-flipped bindings
-    (unless omap
-      (setq omap (make-sparse-keymap))
-      (suppress-keymap omap t)
-      (set-keymap-parent map omap))
-    (let ((m omap))
-      ;; Bind all case-flipped versions.
-      (dotimes (i (length key))
-        (let* ((c (aref key i))
-               (k (vector c))
-               (b (lookup-key m k))
-               (defkey (lambda (x)
-                         (define-key m k x)
-                         (when (and (characterp c)
-                                    (or (<= ?A c ?Z) (<= ?a c ?z)))
-                           (define-key m (vector (logxor 32 c)) x)))))
-          (cond ((= i (1- (length key)))
-                 ;; Prefer longer sequences.
-                 (unless (keymapp b) (funcall defkey cmd)))
-                ((keymapp b) (setq m b))
-                (t (let ((sub (make-sparse-keymap)))
-                     (funcall defkey sub)
-                     (setq m sub)))))))))
-
 ;;;---------------------------------------------------------------------
 ;;; Startup and mode stuff
 
@@ -801,7 +802,7 @@ Adds MORE-OPS to `calculator-operator', called initially to 
handle
   (let ((added-ops nil))
     (dolist (op more-ops)
       (unless (eq (car op) 'nobind)
-        (calculator-define-key (car op) 'calculator-op))
+        (calculator-define-key (car op) 'calculator-op calculator-mode-map))
       (push (if (eq (car op) 'nobind) (cdr op) op)
             added-ops))
     ;; added-ops come first, but in correct order