[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android fbc8c2f660f: Merge remote-tracking branch 'origin/master
|
From: |
Po Lu |
|
Subject: |
feature/android fbc8c2f660f: Merge remote-tracking branch 'origin/master' into feature/android |
|
Date: |
Wed, 24 May 2023 20:21:32 -0400 (EDT) |
branch: feature/android
commit fbc8c2f660f38a91c1894d4ca608d5df7e84d1d2
Merge: 78606a83f7a af4791b5706
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/android
---
lisp/allout-widgets.el | 3 ++-
lisp/allout.el | 2 +-
lisp/emacs-lisp/cl-macs.el | 9 ++++++---
lisp/loadup.el | 2 +-
lisp/net/tramp-fuse.el | 3 ++-
lisp/net/tramp-sh.el | 7 +++++--
lisp/org/org.el | 2 +-
lisp/progmodes/eglot.el | 4 +++-
lisp/progmodes/gdb-mi.el | 3 ++-
lisp/progmodes/idlwave.el | 5 +++--
lisp/startup.el | 14 +++++++++-----
lisp/textmodes/reftex.el | 6 +++---
test/src/comp-resources/comp-test-funcs.el | 8 ++++++++
13 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 5e137b21fbb..be9cf06c523 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -613,7 +613,8 @@ outline hot-spot navigation (see `allout-mode')."
#'allout-widgets-post-command-business 'local)
(remove-hook 'pre-command-hook
#'allout-widgets-pre-command-business 'local)
- (assq-delete-all 'allout-widgets-mode-inhibit minor-mode-alist)
+ (setq minor-mode-alist
+ (assq-delete-all 'allout-widgets-mode-inhibit minor-mode-alist))
(set-buffer-modified-p was-modified))))
;;;_ > allout-widgets-mode-off
(defun allout-widgets-mode-off ()
diff --git a/lisp/allout.el b/lisp/allout.el
index be2fd632c69..d3203800168 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -6307,7 +6307,7 @@ not its value."
(if (yes-or-no-p (format-message
"%s entry `%s' is unbound -- remove it? "
configvar-name sym))
- (delq sym (symbol-value configvar-name)))
+ (set configvar-name (delq sym (symbol-value configvar-name))))
(push (symbol-value sym) got)))
(reverse got)))
;;;_ : Topics:
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 6590b1baa1e..0b09cd7d225 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -3093,13 +3093,16 @@ To see the documentation for a defined struct type, use
(cons 'and (cdddr pred-form))
`(,predicate cl-x))))
(when pred-form
- (push `(,defsym ,predicate (cl-x)
+ (push `(eval-and-compile
+ ;; Define the predicate to be effective at compile time
+ ;; as native comp relies on `cl-typep' that relies on
+ ;; predicates to be defined as they are registered in
+ ;; cl-deftype-satisfies.
+ (,defsym ,predicate (cl-x)
(declare (side-effect-free error-free) (pure t))
,(if (eq (car pred-form) 'and)
(append pred-form '(t))
`(and ,pred-form t)))
- forms)
- (push `(eval-and-compile
(define-symbol-prop ',name 'cl-deftype-satisfies ',predicate))
forms))
(let ((pos 0) (descp descs))
diff --git a/lisp/loadup.el b/lisp/loadup.el
index e01a6d1d640..9947c2482c3 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -103,7 +103,7 @@
;; During bootstrapping the byte-compiler is run interpreted
;; when compiling itself, which uses a lot more stack
;; than usual.
- (setq max-lisp-eval-depth 3400)))
+ (setq max-lisp-eval-depth (max max-lisp-eval-depth 3400))))
(if (eq t purify-flag)
;; Hash consing saved around 11% of pure space in my tests.
diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el
index 5c0bb8e8d96..8626610211a 100644
--- a/lisp/net/tramp-fuse.el
+++ b/lisp/net/tramp-fuse.el
@@ -149,7 +149,8 @@
(when (tramp-file-name-user vec)
(concat (tramp-file-name-user-domain vec) "@"))
(tramp-file-name-host-port vec))
- tramp-compat-temporary-file-directory)))
+ (or small-temporary-file-directory
+ tramp-compat-temporary-file-directory))))
(defconst tramp-fuse-mount-timeout
(eval (car (get 'remote-file-name-inhibit-cache 'standard-value)) t)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 0b3ce07d275..25a26d67d6d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4867,8 +4867,11 @@ Goes through the list `tramp-inline-compress-commands'."
(if (eq tramp-use-connection-share 'suppress)
"none"
;; Hashed tokens are introduced in OpenSSH 6.7.
- (if (tramp-ssh-option-exists-p vec "ControlPath=tramp.%C")
- "tramp.%%C" "tramp.%%r@%%h:%%p"))
+ (expand-file-name
+ (if (tramp-ssh-option-exists-p vec "ControlPath=tramp.%C")
+ "tramp.%%C" "tramp.%%r@%%h:%%p")
+ (or small-temporary-file-directory
+ tramp-compat-temporary-file-directory)))
;; ControlPersist option is introduced in OpenSSH 5.6.
(when (and (not (eq tramp-use-connection-share 'suppress))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d3e14fecec3..e42704778bd 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -16422,7 +16422,7 @@ buffer boundaries with possible narrowing."
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
"Remove inline-display overlay if a corresponding region is modified."
(when (and ov after)
- (delete ov org-inline-image-overlays)
+ (setq org-inline-image-overlays (delete ov org-inline-image-overlays))
;; Clear image from cache to avoid image not updating upon
;; changing on disk. See Emacs bug#59902.
(when (overlay-get ov 'org-image-overlay)
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index a65795f1dfc..8df2e52b0e7 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2277,7 +2277,9 @@ still unanswered LSP requests to the server\n")))
(buffer (find-buffer-visiting path)))
(with-current-buffer buffer
(cl-loop
- initially (assoc-delete-all path flymake-list-only-diagnostics)
+ initially
+ (setq flymake-list-only-diagnostics
+ (assoc-delete-all path flymake-list-only-diagnostics))
for diag-spec across diagnostics
collect (eglot--dbind ((Diagnostic) range code message severity
source tags)
diag-spec
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 260b0270831..4428fa72c78 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3244,7 +3244,8 @@ Place breakpoint icon in its buffer."
(if (re-search-forward gdb-source-file-regexp nil t)
(progn
(setq source-file (gdb-mi--c-string-from-string (match-string 1)))
- (delete (cons bptno "File not found") gdb-location-alist)
+ (setq gdb-location-alist
+ (delete (cons bptno "File not found") gdb-location-alist))
(push (cons bptno source-file) gdb-location-alist))
(gdb-resync)
(unless (assoc bptno gdb-location-alist)
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index cafd7b95da7..488e6aa3d2d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4653,7 +4653,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
(setcar alias (car x))
(push alias idlwave-system-routines)))
(cl-loop for x in remove-list do
- (delq x idlwave-system-routines))))
+ (setq idlwave-system-routines (delq x idlwave-system-routines)))))
(defun idlwave-convert-xml-clean-sysvar-aliases (aliases)
;; Duplicate and trim original routine aliases from rinfo list
@@ -4666,7 +4666,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
(setcar alias (car x))
(push alias idlwave-system-variables-alist)))
(cl-loop for x in remove-list do
- (delq x idlwave-system-variables-alist))))
+ (setq idlwave-system-variables-alist
+ (delq x idlwave-system-variables-alist)))))
(defun idlwave-xml-create-sysvar-alist (xml-entry)
diff --git a/lisp/startup.el b/lisp/startup.el
index fb14fbad17f..acfa4eb657b 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -850,12 +850,16 @@ It is the default value of the variable `top-level'."
(let ((display (frame-parameter nil 'display)))
;; Be careful which DISPLAY to remove from process-environment: follow
;; the logic of `callproc.c'.
- (if (stringp display) (setq display (concat "DISPLAY=" display))
- (dolist (varval initial-environment)
- (if (string-match "\\`DISPLAY=" varval)
- (setq display varval))))
+ (if (stringp display)
+ (setq display (concat "DISPLAY=" display))
+ (let ((env initial-environment))
+ (while (and env (or (not (string-match "\\`DISPLAY=" (car env)))
+ (progn
+ (setq display (car env))
+ nil)))
+ (setq env (cdr env)))))
(when display
- (delete display process-environment))))
+ (setq process-environment (delete display process-environment)))))
(startup--honor-delayed-native-compilations))
;; Precompute the keyboard equivalents in the menu bar items.
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 57284db36b1..916e0d89a1d 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -477,9 +477,9 @@ will deactivate it."
changed t)
(setq list (delete style list))))
(t
- (if (member style list)
- (delete style list)
- (setq list (append list (list style))))
+ (setq list (if (member style list)
+ (delete style list)
+ (append list (list style))))
(setq reftex-tables-dirty t
changed t)))
(when changed
diff --git a/test/src/comp-resources/comp-test-funcs.el
b/test/src/comp-resources/comp-test-funcs.el
index 73da7182a54..d8c72c1a920 100644
--- a/test/src/comp-resources/comp-test-funcs.el
+++ b/test/src/comp-resources/comp-test-funcs.el
@@ -23,6 +23,8 @@
;;; Code:
+(require 'cl-lib)
+
(defvar comp-tests-var1 3)
(defun comp-tests-varref-f ()
@@ -530,6 +532,12 @@
(comp-test-62537-1-f))
t)
+(cl-defstruct comp-test-struct)
+
+(defun comp-test-63674-1-f (x)
+ (or
+ (if (comp-test-struct-p pkg) x)
+ t))
;;;;;;;;;;;;;;;;;;;;