Revert "Make the generalized buffer-local-variable obsolete"

This reverts commit bfe222288e02472bff0e1ab5ba7ef26af6a2769a.

This led to the local modes not working.

diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 2a53535405fd60cb843e268691db3b3b994390e0..e5adb0dda735234f17c1e8d3b501227a9b3f07e9 100644 (file)
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -666,13 +666,12 @@ To toggle the mode in a single buffer, use `electric-pair-local-mode'."
 ;;;###autoload
 (define-minor-mode electric-pair-local-mode
   "Toggle `electric-pair-mode' only in this buffer."
-  :lighter nil
+  :variable (buffer-local-value 'electric-pair-mode (current-buffer))
   (cond
    ((eq electric-pair-mode (default-value 'electric-pair-mode))
     (kill-local-variable 'electric-pair-mode))
    ((not (default-value 'electric-pair-mode))
     ;; Locally enabled, but globally disabled.
-    (make-local-variable 'electric-pair-mode)
     (electric-pair-mode 1)               ; Setup the hooks.
     (setq-default electric-pair-mode nil) ; But keep it globally disabled.
     )))

diff --git a/lisp/electric.el b/lisp/electric.el
index ae9b5ee1622921c60f2e750ba4dbff69cae454bc..f2ff837333f8c144ea2ec1e7e643dddda9d25882 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -340,13 +340,12 @@ use `electric-indent-local-mode'."
 ;;;###autoload
 (define-minor-mode electric-indent-local-mode
   "Toggle `electric-indent-mode' only in this buffer."
-  :lighter nil
+  :variable (buffer-local-value 'electric-indent-mode (current-buffer))
   (cond
    ((eq electric-indent-mode (default-value 'electric-indent-mode))
     (kill-local-variable 'electric-indent-mode))
    ((not (default-value 'electric-indent-mode))
     ;; Locally enabled, but globally disabled.
-    (make-local-variable 'electric-indent-mode)
     (electric-indent-mode 1)                ; Setup the hooks.
     (setq-default electric-indent-mode nil) ; But keep it globally disabled.
     )))
@@ -485,13 +484,12 @@ The variable `electric-layout-rules' says when and how to insert newlines."
 ;;;###autoload
 (define-minor-mode electric-layout-local-mode
   "Toggle `electric-layout-mode' only in this buffer."
-  :lighter nil
+  :variable (buffer-local-value 'electric-layout-mode (current-buffer))
   (cond
    ((eq electric-layout-mode (default-value 'electric-layout-mode))
     (kill-local-variable 'electric-layout-mode))
    ((not (default-value 'electric-layout-mode))
     ;; Locally enabled, but globally disabled.
-    (make-local-variable 'electric-indent-mode)
     (electric-layout-mode 1)             ; Setup the hooks.
     (setq-default electric-layout-mode nil) ; But keep it globally disabled.
     )))
@@ -663,13 +661,12 @@ use `electric-quote-local-mode'."
 ;;;###autoload
 (define-minor-mode electric-quote-local-mode
   "Toggle `electric-quote-mode' only in this buffer."
-  :lighter nil
+  :variable (buffer-local-value 'electric-quote-mode (current-buffer))
   (cond
    ((eq electric-quote-mode (default-value 'electric-quote-mode))
     (kill-local-variable 'electric-quote-mode))
    ((not (default-value 'electric-quote-mode))
     ;; Locally enabled, but globally disabled.
-    (make-local-variable 'electric-indent-mode)
     (electric-quote-mode 1)                ; Setup the hooks.
     (setq-default electric-quote-mode nil) ; But keep it globally disabled.
     )))

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ebc9aa75e56196506f73e54f9df529874bda2bce..5dde2d2bfbb9b163fe91335cbbd03be53c42fbad 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1355,7 +1355,6 @@ FORMAT and ARGS are as in `byte-compile-warn'."
   (let ((byte-compile-form-stack (cons arg byte-compile-form-stack)))
     (apply #'byte-compile-warn format args)))
 
-;;;###autoload
 (defun byte-compile-warn-obsolete (symbol type)
   "Warn that SYMBOL (a variable, function or generalized variable) is obsolete.
 TYPE is a string that say which one of these three types it is."

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index db902d9db8c3e7d591fb5928aa693a9e02a7ce83..0c374ec5e374d63d7ce8971f095e5f6784d27ba0 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -141,18 +141,6 @@ all the parts of PLACE that can be evaluated and then runs E.
   (declare (indent 2) (debug (sexp form def-body)))
   `(gv-get ,place (lambda ,vars ,@body)))
 
-(defun make-obsolete-generalized-variable (obsolete-name current-name when)
-  "Make byte-compiler warn that generalized variable OBSOLETE-NAME is obsolete.
-The warning will say that CURRENT-NAME should be used instead.
-
-If CURRENT-NAME is a string, that is the `use instead' message.
-
-WHEN should be a string indicating when the variable was first
-made obsolete, for example a date or a release number."
-  (put obsolete-name 'byte-obsolete-generalized-variable
-       (purecopy (list current-name when)))
-  obsolete-name)
-
 ;; Different ways to declare a generalized variable.
 ;;;###autoload
 (defmacro gv-define-expander (name handler)
@@ -407,7 +395,6 @@ The return value is the last VAL in the list.
 (gv-define-setter buffer-local-value (val var buf)
   (macroexp-let2 nil v val
     `(with-current-buffer ,buf (set (make-local-variable ,var) ,v))))
-(make-obsolete-generalized-variable 'buffer-local-value nil "29.1")
 
 (gv-define-expander alist-get
   (lambda (do key alist &optional default remove testfn)
@@ -632,6 +619,18 @@ REF must have been previously obtained with `gv-ref'."
 
 ;;; Generalized variables.
 
+(defun make-obsolete-generalized-variable (obsolete-name current-name when)
+  "Make byte-compiler warn that generalized variable OBSOLETE-NAME is obsolete.
+The warning will say that CURRENT-NAME should be used instead.
+
+If CURRENT-NAME is a string, that is the `use instead' message.
+
+WHEN should be a string indicating when the variable was first
+made obsolete, for example a date or a release number."
+  (put obsolete-name 'byte-obsolete-generalized-variable
+       (purecopy (list current-name when)))
+  obsolete-name)
+
 ;; Some Emacs-related place types.
 (gv-define-simple-setter buffer-file-name set-visited-file-name t)
 (make-obsolete-generalized-variable

diff --git a/lisp/paren.el b/lisp/paren.el
index 5a73e3fce69295a5cccaff5d5f889c2d3d58805d..4c268dbf771eff6fcd54aef9b2be29eabcb044c8 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -149,7 +149,7 @@ use `show-paren-local-mode'."
 ;;;###autoload
 (define-minor-mode show-paren-local-mode
   "Toggle `show-paren-mode' only in this buffer."
-  :lighter nil
+  :variable (buffer-local-value 'show-paren-mode (current-buffer))
   (cond
    ((eq show-paren-mode (default-value 'show-paren-mode))
     (unless show-paren-mode
@@ -157,7 +157,6 @@ use `show-paren-local-mode'."
     (kill-local-variable 'show-paren-mode))
    ((not (default-value 'show-paren-mode))
     ;; Locally enabled, but globally disabled.
-    (make-local-variable 'show-paren-mode)
     (show-paren-mode 1)                ; Setup the timer.
     (setq-default show-paren-mode nil) ; But keep it globally disabled.
     )