diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-02-26 10:39:15 +0000 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-02-26 10:39:15 +0000 |
| commit | 3e1ec5d87de2953a8ba0d08602a45b050641ef47 (patch) | |
| tree | 0ab301c74a990e8001d400ef4f9356379b33fdc1 /lisp/emacs-lisp/bytecomp.el | |
| parent | 48b131c6d17383eed4b09634e4dddf226b0cd3cd (diff) | |
| parent | 4a94881345819dd68062bc729b5b7ddeab00041b (diff) | |
| download | emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.tar.gz emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.tar.bz2 emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index b3bd6879b69..72c6fc7bf86 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2031,7 +2031,7 @@ The value is non-nil if there were no errors, nil if errors." (delete-file tempfile))) kill-emacs-hook))) (unless (= temp-modes desired-modes) - (set-file-modes tempfile desired-modes)) + (set-file-modes tempfile desired-modes 'nofollow)) (write-region (point-min) (point-max) tempfile nil 1) ;; This has the intentional side effect that any ;; hard-links to target-file continue to @@ -3535,7 +3535,7 @@ the opcode to be used. If function is a list, the first element is the function and the second element is the bytecode-symbol. The second element may be nil, meaning there is no opcode. COMPILE-HANDLER is the function to use to compile this byte-op, or -may be the abbreviations 0, 1, 2, 3, 0-1, or 1-2. +may be the abbreviations 0, 1, 2, 2-and, 3, 0-1, 1-2, 1-3, or 2-3. If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (let (opcode) (if (symbolp function) @@ -3554,6 +3554,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (0-1 . byte-compile-zero-or-one-arg) (1-2 . byte-compile-one-or-two-args) (2-3 . byte-compile-two-or-three-args) + (1-3 . byte-compile-one-to-three-args) ))) compile-handler (intern (concat "byte-compile-" @@ -3738,6 +3739,13 @@ These implicitly `and' together a bunch of two-arg bytecodes." ((= len 4) (byte-compile-three-args form)) (t (byte-compile-subr-wrong-args form "2-3"))))) +(defun byte-compile-one-to-three-args (form) + (let ((len (length form))) + (cond ((= len 2) (byte-compile-three-args (append form '(nil nil)))) + ((= len 3) (byte-compile-three-args (append form '(nil)))) + ((= len 4) (byte-compile-three-args form)) + (t (byte-compile-subr-wrong-args form "1-3"))))) + (defun byte-compile-noop (_form) (byte-compile-constant nil)) |