Merge from origin/emacs-30

f69f54c454e Improve font-locking and indentation in 'php-ts-mode'
27aacbd172f Fix some 'lua-ts-mode' options (Bug#74235)
a0613372a7b ; Update the xwidgets-on-NS text due to fixing bug#60703
d5928325045 Improve comment indenting in 'lua-ts-mode'
6bc44ccf287 Update 'xref-num-matches-found' when reverting *xref* buffer
8afcfed825a * lisp/files.el (require-with-check): Fix last fix (bug#7...
3496234c8ed lisp/files.el (require-with-check): Fix bug#74091.
90c97d3fac9 Fix handling of permanent-local variables in 'kill-all-lo...
c96e5760907 Precise password cache in Tramp
3954e8d9bbe Fix picture-mode with full-width characters
7dabfe9465c Fix movement to the left in picture-mode

# Conflicts:
#	lisp/net/tramp.el

1 files changed, 7 insertions, 6 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 90c5efdfbf7..2955ee6399b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -111,7 +111,7 @@ static int last_per_buffer_idx;
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
                                     bool after, Lisp_Object arg1,
                                     Lisp_Object arg2, Lisp_Object arg3);
-static void reset_buffer_local_variables (struct buffer *, bool);
+static void reset_buffer_local_variables (struct buffer *, int);
 
 /* Alist of all buffer names vs the buffers.  This used to be
    a Lisp-visible variable, but is no longer, to prevent lossage
@@ -1110,10 +1110,11 @@ reset_buffer (register struct buffer *b)
    Instead, use Fkill_all_local_variables.
 
    If PERMANENT_TOO, reset permanent buffer-local variables.
-   If not, preserve those.  */
+   If not, preserve those.  PERMANENT_TOO = 2 means ignore
+   the permanent-local property of non-builtin variables.  */
 
 static void
-reset_buffer_local_variables (struct buffer *b, bool permanent_too)
+reset_buffer_local_variables (struct buffer *b, int permanent_too)
 {
   int offset, i;
 
@@ -1139,7 +1140,7 @@ reset_buffer_local_variables (struct buffer *b, bool permanent_too)
   bset_invisibility_spec (b, Qt);
 
   /* Reset all (or most) per-buffer variables to their defaults.  */
-  if (permanent_too)
+  if (permanent_too == 1)
     bset_local_var_alist (b, Qnil);
   else
     {
@@ -1168,7 +1169,7 @@ reset_buffer_local_variables (struct buffer *b, bool permanent_too)
               swap_in_global_binding (XSYMBOL (sym));
             }
 
-          if (!NILP (prop))
+          if (!NILP (prop) && !permanent_too)
             {
               /* If permanent-local, keep it.  */
               last = tmp;
@@ -3006,7 +3007,7 @@ the normal hook `change-major-mode-hook'.  */)
 
   /* Actually eliminate all local bindings of this buffer.  */
 
-  reset_buffer_local_variables (current_buffer, !NILP (kill_permanent));
+  reset_buffer_local_variables (current_buffer, !NILP (kill_permanent) ? 2 : 0);
 
   /* Force mode-line redisplay.  Useful here because all major mode
      commands call this function.  */