Skip to content

Commit

Permalink
Remove a couple things that were deprecated a long time ago (#16354)
Browse files Browse the repository at this point in the history
* spacemacs/set-font: Remove deprecated function

This function has been deprecated since 2015, surely it is fine to
remove by now.

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

It was deprecated in 2017.
  • Loading branch information
bcc32 committed May 11, 2024
1 parent a46f4e7 commit 403e1a9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 28 deletions.
8 changes: 0 additions & 8 deletions core/core-fonts-support.el
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,6 @@ The return value is nil if no font was found, truthy otherwise."
powerline-scale 1)))
(truncate (* scale (frame-char-height)))))

(defun spacemacs/set-font (&rest args)
"Deprecated function, display a warning message."
(spacemacs-buffer/warning (concat "spacemacs/set-font is deprecated. "
"Use the variable `dotspacemacs-default-font' "
"instead (see Font section in "
"~/.emacs.d/doc/DOCUMENTATION.org for more "
"info).")))

(defmacro spacemacs|diminish (mode &optional unicode ascii)
"Diminish MODE name in mode line to UNICODE or ASCII depending on the value
`dotspacemacs-mode-line-unicode-symbols'.
Expand Down
3 changes: 0 additions & 3 deletions layers/+os/osx/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 1 addition & 11 deletions layers/+os/osx/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand All @@ -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'.
Expand Down
6 changes: 0 additions & 6 deletions layers/+os/osx/keybindings.el
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down

0 comments on commit 403e1a9

Please sign in to comment.