[osx] Remove deprecated variable osx-use-option-as-meta

It was deprecated in 2017.
bcc32 · Apr 4, 2024 · 2ba9019 · 2ba9019
1 parent 03d874f
commit 2ba9019
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/layers/+os/osx/README.org b/layers/+os/osx/README.org
@@ -32,9 +32,6 @@ encourage you to do so :)
 
 * Install
 ** Layer
-Layer has been updated for new config variables. The variable =osx-use-option-as-meta=
-is still available for backwards compatibility and will take precedence if set.
-
 To use this configuration layer, add it to your =~/.spacemacs=. You will need to
 add =osx= to the existing =dotspacemacs-configuration-layers= list in this file.
 The different modifier keys can be set as follows:

diff --git a/layers/+os/osx/config.el b/layers/+os/osx/config.el
@@ -20,14 +20,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-
-(defvar osx-use-option-as-meta 'deprecated
- "DEPRECATED. See README for OSX layer for new variables. If this
- variable is set it will take precedence (for backwards compatibility).
- If non nil the option key is mapped to meta. Set to `nil` if you need the
- option key to type common characters.
- Default: `deprecated'")
-
 (defvar osx-command-as 'hyper
  "Sets the key binding of the `COMMAND' key on macOS.
  Possible values are `super', `meta', `hyper', `alt', and `none'.
@@ -44,9 +36,7 @@
 (defvar osx-option-as 'meta
  "Sets the key binding of the `OPTION' key on macOS.
  Possible values are `super' `meta' `hyper' `alt' `none'.
- Default: `meta'.
- For backwards compatibility the variable `osx-use-option-as-meta'
- takes precedence if set to t.")
+ Default: `meta'.")
 (defvar osx-function-as nil
  "Sets the key binding of the `FUNCTION' key on macOS.
  Possible values are `super' `meta' `hyper' `alt' `nil'.

diff --git a/layers/+os/osx/keybindings.el b/layers/+os/osx/keybindings.el
@@ -45,12 +45,6 @@
  ;; The allowed non-nil values for the config variables.
  (setq allowed-values '(super meta hyper control alt none left))
 
- ;; Backwards compatibility
- (cl-case osx-use-option-as-meta
- ((nil) (setf osx-option-as 'none))
- (deprecated nil)
- (t (setf osx-option-as 'meta)))
-
  ;; Set internal variables according to the given config variables
  (cl-loop for (key-var . internal-var) in modifier-keys do
  (let ((key-value (symbol-value key-var)))