Merge branch 'master' into feature/tramp-thread-safe

diff --cc doc/lispref/files.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/net/trampver.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
index 7313d3b65ad3b5e7181c5f02b73d2c53a2021c8c,9e880bc880ef86dca71bf15a279c45b115706128..8d04da842f1f3656052725ae92b0facdbb4d1d35
--- 1/lisp/subr.el
--- 2/lisp/subr.el
+++ b/lisp/subr.el
@@@ -366,11 -366,27 +366,32 @@@ was called.
    (declare (compiler-macro (lambda (_) `(= 0 ,number))))
    (= 0 number))
  
+ (defun fixnump (object)
+   "Return t if OBJECT is a fixnum."
+   (and (integerp object)
+        (<= most-negative-fixnum object most-positive-fixnum)))
+ 
+ (defun bignump (object)
+   "Return t if OBJECT is a bignum."
+   (and (integerp object) (not (fixnump object))))
+ 
+ (defun lsh (value count)
+   "Return VALUE with its bits shifted left by COUNT.
+ If COUNT is negative, shifting is actually to the right.
+ In this case, if VALUE is a negative fixnum treat it as unsigned,
+ i.e., subtract 2 * most-negative-fixnum from VALUE before shifting it."
+   (when (and (< value 0) (< count 0))
+     (when (< value most-negative-fixnum)
+       (signal 'args-out-of-range (list value count)))
+     (setq value (logand (ash value -1) most-positive-fixnum))
+     (setq count (1+ count)))
+   (ash value count))
+ 
 +(defun xor (pred1 pred2)
 +  "Return the logical exclusive or of predicates PRED1 and PRED2."
 +  (and (or pred1 pred2)
 +       (not (and pred1 pred2))))
 +
  \f
  ;;;; List functions.
  

diff --cc test/lisp/net/tramp-tests.el
Simple merge