mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Fix apparently wrong delete and delq value discards (bug#61730)

Browse source 
* lisp/startup.el (normal-top-level):
Update process-environment in case the DISPLAY variable comes first.
Also stop iterating over initial-environment once the first DISPLAY
is found.
* lisp/allout.el (allout-get-configvar-values):
* lisp/org/org.el (org-display-inline-remove-overlay):
* lisp/progmodes/gdb-mi.el (gdb-get-location):
* lisp/progmodes/idlwave.el
(idlwave-convert-xml-clean-routine-aliases)
(idlwave-convert-xml-clean-sysvar-aliases):
* lisp/textmodes/reftex.el (reftex-ref-style-toggle):
Update the base variable after performing a destructive deletion,
where it was obvious that this was intended.
This commit is contained in:
Mattias Engdegård 2023-05-24 22:36:19 +02:00
parent e3987d7e1a
commit af4791b570
6 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/allout.el
View file

@ -6307,7 +6307,7 @@ not its value."
(if (yes-or-no-p (format-message (if (yes-or-no-p (format-message
"%s entry `%s' is unbound -- remove it? " "%s entry `%s' is unbound -- remove it? "
configvar-name sym)) configvar-name sym))
(delq sym (symbol-value configvar-name))) (set configvar-name (delq sym (symbol-value configvar-name))))
(push (symbol-value sym) got))) (push (symbol-value sym) got)))
(reverse got))) (reverse got)))
;;;_ : Topics: ;;;_ : Topics:

2
lisp/org/org.el
View file

@ -16422,7 +16422,7 @@ buffer boundaries with possible narrowing."
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len) (defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
"Remove inline-display overlay if a corresponding region is modified." "Remove inline-display overlay if a corresponding region is modified."
(when (and ov after) (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 ;; Clear image from cache to avoid image not updating upon
;; changing on disk. See Emacs bug#59902. ;; changing on disk. See Emacs bug#59902.
(when (overlay-get ov 'org-image-overlay) (when (overlay-get ov 'org-image-overlay)

3
lisp/progmodes/gdb-mi.el
View file

@ -3244,7 +3244,8 @@ Place breakpoint icon in its buffer."
(if (re-search-forward gdb-source-file-regexp nil t) (if (re-search-forward gdb-source-file-regexp nil t)
(progn (progn
(setq source-file (gdb-mi--c-string-from-string (match-string 1))) (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)) (push (cons bptno source-file) gdb-location-alist))
(gdb-resync) (gdb-resync)
(unless (assoc bptno gdb-location-alist) (unless (assoc bptno gdb-location-alist)

5
lisp/progmodes/idlwave.el
View file

@ -4653,7 +4653,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
(setcar alias (car x)) (setcar alias (car x))
(push alias idlwave-system-routines))) (push alias idlwave-system-routines)))
(cl-loop for x in remove-list do (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) (defun idlwave-convert-xml-clean-sysvar-aliases (aliases)
;; Duplicate and trim original routine aliases from rinfo list ;; 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)) (setcar alias (car x))
(push alias idlwave-system-variables-alist))) (push alias idlwave-system-variables-alist)))
(cl-loop for x in remove-list do (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) (defun idlwave-xml-create-sysvar-alist (xml-entry)

14
lisp/startup.el
View file

@ -837,12 +837,16 @@ It is the default value of the variable `top-level'."
(let ((display (frame-parameter nil 'display))) (let ((display (frame-parameter nil 'display)))
;; Be careful which DISPLAY to remove from process-environment: follow ;; Be careful which DISPLAY to remove from process-environment: follow
;; the logic of `callproc.c'. ;; the logic of `callproc.c'.
(if (stringp display) (setq display (concat "DISPLAY=" display)) (if (stringp display)
(dolist (varval initial-environment) (setq display (concat "DISPLAY=" display))
(if (string-match "\\`DISPLAY=" varval) (let ((env initial-environment))
(setq display varval)))) (while (and env (or (not (string-match "\\`DISPLAY=" (car env)))
(progn
(setq display (car env))
nil)))
(setq env (cdr env)))))
(when display (when display
(delete display process-environment)))) (setq process-environment (delete display process-environment)))))
(startup--honor-delayed-native-compilations)) (startup--honor-delayed-native-compilations))
;; Precompute the keyboard equivalents in the menu bar items. ;; Precompute the keyboard equivalents in the menu bar items.

6
lisp/textmodes/reftex.el
View file

@ -477,9 +477,9 @@ will deactivate it."
changed t) changed t)
(setq list (delete style list)))) (setq list (delete style list))))
(t (t
(if (member style list) (setq list (if (member style list)
(delete style list) (delete style list)
(setq list (append list (list style)))) (append list (list style))))
(setq reftex-tables-dirty t (setq reftex-tables-dirty t
changed t))) changed t)))
(when changed (when changed